aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "merge"Christian Vogeley2013-08-03119-1510/+1512
* mergeChristian Vogeley2013-08-03119-1512/+1510
|\
| * 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
| * 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 t...friendica2013-07-284-8/+69
| * cleaning up issues reported in logsfriendica2013-07-282-7/+2
| * improve the red smileyfriendica2013-07-282-2/+2
| * add gz to access denied files to block rotated logs from public accessfriendica2013-07-2685-1323/+1079
* | 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
|/
* the rest of the heavy lifting on clone sync - now we're down to some log mess...friendica2013-07-252-1/+83
* trying to center the selected channel on the manage page. Dreamhost really bo...friendica2013-07-252-3/+18
* build_sync_packet was looking at stale channel info - load it fresh from the DB.friendica2013-07-251-1/+8
* log the sync packets locally at LOGGER_DATA levelfriendica2013-07-251-0/+2
* include zotfriendica2013-07-252-1/+2
* more work on clone syncfriendica2013-07-254-105/+103
* fix media uploads in api (specifically friendica for android)friendica2013-07-253-38/+12
* gprobe requires hex argumentfriendica2013-07-241-1/+1
* add chandesc field to profiles to provide some arbitrary text in the director...friendica2013-07-243-2/+9
* obscured flags for itemsfriendica2013-07-241-1/+1
* hide detailed site information if you're off the grid.friendica2013-07-241-23/+32
* add more siteinfofriendica2013-07-242-2/+14
* more site statsfriendica2013-07-242-0/+13
* recover padding functions which are still usedfriendica2013-07-241-0/+15