aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into zpullfriendica2013-08-050-0/+0
|\
| * Issue #88Thomas Willingham2013-08-051-1/+1
* | enotify: localize things we know how to translatefriendica2013-08-054-9/+15
|/
* directory server sitelist module (needed for public site list and building fr...friendica2013-08-042-0/+52
* js_upload is wretched, but at least fix the HTML in the template so it will w...friendica2013-08-041-1/+1
* progress on unfriendingfriendica2013-08-042-21/+34
* Merge https://github.com/friendica/red into zpullfriendica2013-08-041-5/+1
|\
| * Template boo-booThomas Willingham2013-08-041-5/+1
* | basic *account* removal, but the channel removal which it calls still needs (...friendica2013-08-044-24/+52
|/
* don't show connections with removed xchans - as there isn't much to seefriendica2013-08-042-31/+30
* $yoursite/~foo has taken you to foo's channel page for ages. If you're logged...friendica2013-08-042-4/+11
* connect link in directoryfriendica2013-08-033-4/+27
* doc updatesfriendica2013-08-039-13/+13
* Merge https://github.com/friendica/red into zpullfriendica2013-08-033-349/+160
|\
| * Merge pull request #87 from cvogeley/masterfriendica2013-08-033-349/+160
| |\
| | * change back mod to 644Christian Vogeley2013-08-032-0/+0
| | * Revert "Revert "merge""Christian Vogeley2013-08-03119-1512/+1510
| | * Revert "merge"Christian Vogeley2013-08-03119-1510/+1512
| | * mergeChristian Vogeley2013-08-03119-1512/+1510
| | |\
| | * | Check existance of bbcode tags before executing regexes, to avoid unnecessary...Christian Vogeley2013-07-281-109/+160
| | * | .Christian Vogeley2013-07-272-0/+143
| | * | don't know why they were marked as changedChristian Vogeley2013-07-272-143/+0
| | * | don't why they were marked as changedChristian Vogeley2013-07-272-240/+0
* | | | rev updatefriendica2013-08-031-1/+1
|/ / /
* | / Make Zot a bit more prominent in the READMEfriendica2013-08-021-0/+1
| |/ |/|
* | basic email invitations - and doc updatefriendica2013-08-0226-378/+393
* | potentially fixes the "federation" bug w/r/t/ tagged forumsfriendica2013-08-011-2/+2
* | minor - change nav_set_selected() to only highlight intros if on that particu...friendica2013-08-011-1/+1
* | pass item by reference so title can be alteredfriendica2013-08-012-13/+21
* | ensure that no unencrypted content leaks through item_store which is private ...friendica2013-08-014-12/+28
* | add "xchan_instance_url" for communicating with services that lack nomadic id...friendica2013-08-013-2/+11
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-016-17/+61
|\ \
| * \ Merge pull request #86 from beardy-unixer/masterfriendica2013-08-013-15/+57
| |\ \
| | * | Remove loggingThomas Willingham2013-08-011-1/+0
| | * | "Can edit my webpages" permissionsThomas Willingham2013-08-013-15/+58
| * | | Merge pull request #85 from git-marijus/masterfriendica2013-08-013-2/+4
| |\ \ \ | | |/ / | |/| |
| | * | make "selected" class work on all navigation menu itemsmarijus2013-08-013-2/+4
| |/ /
* / / yhis should fix the privacy leak - as well as non-private replies to private ...friendica2013-08-014-3/+7
|/ /
* | privacy leakagefriendica2013-07-311-1/+1
* | fix some privacy leakage in logsfriendica2013-07-313-25/+29
* | better mail obscuringfriendica2013-07-317-61/+96
* | missing includefriendica2013-07-301-0/+1
* | attachment permissions not rightfriendica2013-07-302-40/+46
* | unencrypt private posts for editingfriendica2013-07-302-1/+10
* | zot feed - getting cut off too earlyfriendica2013-07-291-6/+9
* | ensure conversation is includedfriendica2013-07-291-0/+1
* | fix some weirdness on the zot feedfriendica2013-07-293-13/+24
* | fix bug #84, make imported messages from your clones show up on your wallfriendica2013-07-296-3/+30
* | tgroup_check wasn't allowing comments through.friendica2013-07-291-2/+9
* | load_pconfig had some issues when given a familyfriendica2013-07-292-27/+13