aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* js_upload is wretched, but at least fix the HTML in the template so it will ↵friendica2013-08-041-1/+1
| | | | work again.
* 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
|/ | | | (lots of) work. Oh and the intro table is no longer used and won't be - so it's gone.
* 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 ↵friendica2013-08-042-4/+11
| | | | logged in locally, $yoursite/~ will now take you to *your* channel page. If you aren't logged in, it won't.
* 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
| |\ | | | | | | includes/bbcode.php:check if bbcode tag exists before executing regexes
| | * change back mod to 644Christian Vogeley2013-08-032-0/+0
| | |
| | * Revert "Revert "merge""Christian Vogeley2013-08-03119-1512/+1510
| | | | | | | | | | | | This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764.
| | * Revert "merge"Christian Vogeley2013-08-03119-1510/+1512
| | | | | | | | | | | | | | | This reverts commit c0cd147a3a9a86b270ea32026089ced16fb2f50c, reversing changes made to d2d1e54bfe928fe4cdfdcfc7e9acf658cda76898.
| | * mergeChristian Vogeley2013-08-03119-1512/+1510
| | |\
| | * | Check existance of bbcode tags before executing regexes, to avoid ↵Christian Vogeley2013-07-281-109/+160
| | | | | | | | | | | | | | | | unnecessary execution
| | * | .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 ↵friendica2013-08-011-1/+1
| | | | | | | | particular connections page and not for any connections page.
* | 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
| | | | | | | | | | | | - we typically do this in mod/item, but some functions bypass mod/item to create private posts
* | add "xchan_instance_url" for communicating with services that lack nomadic ↵friendica2013-08-013-2/+11
| | | | | | | | identity. This will be set to the url of the Red site that they are connected with. Only the nomadic identity clone at that site can communicate directly with them. Other instances will need to relay through that site - and if it goes down, that connection is stuffed.
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-016-17/+61
|\ \
| * \ Merge pull request #86 from beardy-unixer/masterfriendica2013-08-013-15/+57
| |\ \ | | | | | | | | "Can edit my webpages" permissions
| | * | 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 items
| | * | 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
|/ / | | | | | | posts
* | 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
| |
* | browser location issue but this may not fix itfriendica2013-07-292-2/+2
| |
* | encrypt private messages on disk - there are still a couple of places where ↵friendica2013-07-284-8/+69
| | | | | | | | the text is leaked in the logs during processing.
* | cleaning up issues reported in logsfriendica2013-07-282-7/+2
| |
* | improve the red smileyfriendica2013-07-282-2/+2
| |