aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-07-0321-214/+302
|\
| * any questions regarding this checkin will be ignoredfriendica2013-07-033-2/+39
| * remove debug info - mop up and go homefriendica2013-07-031-2/+2
| * multi-profile - bugsfriendica2013-07-031-2/+3
| * multi-profiles workfriendica2013-07-034-17/+31
| * progress on multiple profiles, doing it the old way. I don't think we're goin...friendica2013-07-035-30/+35
| * really, truly fix the age missing in directory bugfriendica2013-07-022-2/+4
| * missing commafriendica2013-07-021-1/+1
| * age was not syncing to the directoryfriendica2013-07-021-1/+4
| * bitwise logic issue comparing with multiple bitsfriendica2013-07-021-1/+1
| * This probably needs some configurable options, but let's only show tags from ...friendica2013-07-021-1/+1
| * only show tag cloud for visible itemsfriendica2013-07-021-3/+3
| * oops - returned too many itemsfriendica2013-07-022-8/+11
| * tag cloud feature (enable the feature, then it will show up on your channel p...friendica2013-07-024-3/+57
| * with luck this will fix issue #61 and issue #62 - boy that was fun (not).friendica2013-07-021-24/+13
| * some work on issue #62 (comments collapsing on liveupdate), but still a work ...friendica2013-07-026-153/+133
* | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-07-02247-3531/+6284
|\|
| * issue #65friendica2013-07-014-3/+83
| * fix some community tagging bugsfriendica2013-06-303-7/+16
| * add age to dirsearch jsonfriendica2013-06-301-0/+1
| * age query in dirsearchfriendica2013-06-301-0/+10
| * add age to directory profile - requires updating on each birthday and that pa...friendica2013-06-308-3/+22
| * partial implementation of issue #64 - local tag storage linked to the tagged ...friendica2013-06-291-0/+1
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-291-1/+2
| |\
| | * Missing includeThomas Willingham2013-06-281-1/+2
| * | doc update, plus possible fix to "complex delivery chains" issue. Basically w...friendica2013-06-2979-1106/+1827
| |/
| * fix cid queryfriendica2013-06-272-2/+2
| * autotag clean-up, mop up, and go homefriendica2013-06-271-4/+5
| * testing autotagfriendica2013-06-271-1/+2
| * Basic ability to create "things"friendica2013-06-274-8/+57
| * if you send a private post to an @-taggable channel (and nobody else), tag th...friendica2013-06-272-1/+13
| * more work on channel syncfriendica2013-06-264-8/+41
| * more nomadic clone syncfriendica2013-06-264-8/+36
| * begin code to sync channel changes across all channel clones.friendica2013-06-254-9/+102
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-231-23/+108
| |\
| | * Verbose Nginx conf. Essentially the one from Friendica with a few alterations.Thomas Willingham2013-06-231-23/+108
| * | make manual image scaling work - even if auto scaling kicks in.friendica2013-06-232-8/+14
| |/
| * another temporary fix to mod/search to only return one of each post.friendica2013-06-232-7/+7
| * linkify the non-embeddable videofriendica2013-06-211-2/+2
| * fix non-embeddable videos by returning plain linksfriendica2013-06-211-3/+6
| * fix some anomolies in config functionsfriendica2013-06-213-52/+73
| * upgrade docofriendica2013-06-212-0/+341
| * relocate tagadelic to include/taxonomyfriendica2013-06-2188-1404/+1506
| * community tag issuesfriendica2013-06-201-2/+7
| * bring back the body tag list - though it really belongs in the templates. It'...friendica2013-06-203-4/+26
| * Add site registration policy to site record. This is not yet used or stored, ...friendica2013-06-204-4/+22
| * make tag searches work at least as well as the normal search - which still is...friendica2013-06-201-1/+1
| * undefined activity_compare which broke notifications (should be activity_matc...friendica2013-06-201-3/+3
| * bug in commentable - ambiguous abook entryfriendica2013-06-202-2/+4
| * more issues related to Tony's re-installfriendica2013-06-191-1/+5