Commit graph

10991 commits

Author SHA1 Message Date
friendica
0c8866acde snakebite continued 2014-08-19 21:31:33 -07:00
friendica
c7fe071a1f some work on network discovery 2014-08-19 19:38:42 -07:00
friendica
55d4ceb7e0 also reset comment policy on alternate delivery chains 2014-08-19 17:51:45 -07:00
friendica
8b5627e777 make sure privacy scope is completely reset on second delivery chain - revert if there are forum issues, this is subtle and complicated 2014-08-19 17:47:32 -07:00
friendica
6feaa2689d follow => connect 2014-08-19 16:26:46 -07:00
friendica
82389f8c1b really really fix lockview (cross fingers) ;-) 2014-08-19 16:04:38 -07:00
RedMatrix
01a9c56ef9 Merge pull request #569 from git-marijus/master
really fix lock info
2014-08-20 08:52:21 +10:00
Jeroen
341892a7af fix nl 2014-08-19 21:48:49 +00:00
Jeroen
9f400229a7 Update nl 2014-08-19 20:22:15 +00:00
marijus
a10f39b994 really fix lock info 2014-08-19 22:01:33 +02:00
friendica
dc212c80e2 diaspora - crazy amount of work remaining 2014-08-19 02:00:34 -07:00
friendica
b3d450626e provide an overt indication that a post/comment was edited. 2014-08-18 22:44:03 -07:00
friendica
206492e15d Merge https://github.com/friendica/red into pending_merge 2014-08-18 20:04:19 -07:00
friendica
b522ab13cb nav channel selection 2014-08-18 20:03:48 -07:00
RedMatrix
4ab14387df Merge pull request #568 from git-marijus/master
make lockview provide the right info
2014-08-19 06:54:31 +10:00
marijus
953c8ac686 make lockview provide the right info 2014-08-18 21:25:02 +02:00
friendica
d9ff121930 beginning of permission role settings 2014-08-17 22:53:00 -07:00
friendica
3dbc3e263d add ability to follow somebody not already in your connections from "post actions" dropdown. bug: doesn't bring you back to this page. 2014-08-17 21:34:52 -07:00
friendica
cb027232ff diaspora - begin heavy lifting. This is a 738 tonne brick with a herd of elephants standing on it. I'm working on the first tonne or two. 2014-08-17 20:37:52 -07:00
friendica
4a76925787 some more work on realms 2014-08-17 19:06:56 -07:00
friendica
de1198ccfe Merge https://github.com/friendica/red into pending_merge 2014-08-17 17:49:25 -07:00
friendica
82eb265a20 add collections widget to connections page - and some more work on realms 2014-08-17 17:48:41 -07:00
Paolo T
1ddbd44fb0 Merge pull request #567 from tuscanhobbit/master
IT: strings updated
2014-08-17 19:35:16 +02:00
tuscanhobbit
3b979dd2a9 IT: strings updated 2014-08-17 19:32:44 +02:00
Thomas Willingham
8d3dc7541d Doco - attempt to explain pull requests in git for non developers. 2014-08-17 14:57:39 +01:00
RedMatrix
bb3768d172 Merge pull request #565 from RedMatrixCanada/Branch
French Transalations - UPDATED
2014-08-17 18:49:10 +10:00
RedMatrix
33d43a2a64 Merge pull request #566 from tonnerkiller/master
Posting by API and Wordpress plugin
2014-08-17 18:48:43 +10:00
RedMatrixCanada
8c366154c3 French Transalations - UPDATED 2014-08-16 20:52:59 -04:00
friendica
bf3dc80233 Merge https://github.com/friendica/red into pending_merge 2014-08-16 16:11:53 -07:00
friendica
20bdcb037f provide backend storage and declaration of directory realm 2014-08-16 16:10:35 -07:00
RedMatrix
e4620179ac Merge pull request #564 from cvogeley/master
Add account deletion to the UI
2014-08-17 08:33:13 +10:00
Thomas Willingham
e3c8d36e06 Install doc - mcrypt is required, not optional. Even if it's intended
to be optional, it isn't.  WSoD abound without it.
2014-08-16 20:48:23 +01:00
Christian Vogeley
54fe09f466 Add account deletion to the UI 2014-08-16 16:28:07 +02:00
tonnerkiller
bac1ed2214 Added "if(!function_exists('xpost_to_html2bbcode'))"
This function name is also used by post to friendica plugin
Both functions seem to be identical. If you have both plugins installed
you get an error because of the identical function name
This will avoid the attempt to load the function a second time in case
it was already loaded by the post to friendica plugin
2014-08-16 15:48:44 +02:00
tonnerkiller
03678716fe api_posting.bb is a new doco file that explains posting to the redmatrix from an external program by exampple of command line tool curl
main.bb is an updated version of the doco main site with a link to api_posting.bb
2014-08-16 13:13:57 +02:00
friendica
ba0bf596b5 Merge https://github.com/friendica/red into pending_merge 2014-08-15 14:46:59 -07:00
friendica
481263dc25 bring back some friendica crypto stuff including all the key mangling and translation functions. Also add ability to completely supress email notifications for actitivies with private contents. We'll still pass private mail notifications because often the email notification is the only way infrequently used channels get alerted to these. 2014-08-15 14:42:14 -07:00
RedMatrix
73c209f325 Merge pull request #563 from zzottel/master
don't block "public" messages with authenticated scope
2014-08-16 07:07:36 +10:00
zottel
d57fe0765c don't block "public" messages with authenticated scope 2014-08-15 21:36:24 +02:00
friendica
4286389654 doc update 2014-08-15 06:06:39 -07:00
friendica
41aa9e13cf doc update 2014-08-15 06:05:52 -07:00
friendica
257332f434 Merge https://github.com/friendica/red into pending_merge 2014-08-15 06:05:22 -07:00
RedMatrix
d6da6f5001 Merge pull request #562 from cvogeley/master
Account deletion
2014-08-15 23:03:04 +10:00
Christian Vogeley
f36253b7a8 Account deletion
fix multi user deletion, add confirmation message
2014-08-15 14:56:17 +02:00
jeroenpraat
b88e1e9862 .btn.xs > 0.75rem (let's keep that as the min. scalable font size) 2014-08-15 14:00:51 +02:00
jeroenpraat
c96b18359f .btn-xs 0.65 > 0.7rem 2014-08-15 13:17:38 +02:00
friendica
1978500e8f pkcs1 to pkcs8 key conversion - this is a lot easier than parsing ASN.1 DER formats and rebuilding the darn things like we used to do. Check for illegal hex encoded album names in mod/photo so we don't throw php errors. Don't know where they come from but we get a lot of them. 2014-08-14 23:05:19 -07:00
friendica
21adbad4c1 in HTML email notifications, angle brackets in posts were unescaped - including those in code blocks. 2014-08-14 20:19:28 -07:00
friendica
b9dffa9107 escape tags when using markdown. Strange things happen if you put HTML entities in the text. 2014-08-14 18:00:48 -07:00
friendica
414d86d3a9 api - foreach warnings 2014-08-14 17:55:14 -07:00