aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| * source code re-org, move taxonomy to separate includefriendica2013-06-194-267/+110
| * infrastructure for future stufffriendica2013-06-195-19/+34
| * fall back on object author/actor if no ownerfriendica2013-06-181-6/+6
| * Support arbitrary likes - "David likes Bob's bicycle" or "Nancy likes Margare...friendica2013-06-182-0/+14
| * provide support for "bob likes Lisa's channel" activitiesfriendica2013-06-181-17/+32
| * map comment_policy on local post submissionfriendica2013-06-181-0/+1
| * undo comment policy override - there are a handful of stored posts from the 1...friendica2013-06-183-14/+17
| * fix profile update propagationfriendica2013-06-182-9/+13
| * fix mod-display when not logged in.friendica2013-06-184-4/+10
| * much more efficient config functions. This will save potentially hundreds of ...friendica2013-06-172-98/+61
| * another try on zidified notifications - this time it actually seems to workfriendica2013-06-172-1/+5
| * one of those days...friendica2013-06-171-2/+2
| * zidify bodies of notification emailsfriendica2013-06-173-8/+24
| * found it - but I'll do some more testing before undoing the bypassfriendica2013-06-161-1/+1
| * undefined functionfriendica2013-06-161-1/+1
| * typosfriendica2013-06-161-2/+2
| * override comment policy until it's workingfriendica2013-06-161-0/+4
| * implement 'can_comment_on_post()' which doesn't require a separate DB lookup ...friendica2013-06-163-3/+43
| * We will need a per item comment policy to be able to determine in advance if ...friendica2013-06-164-5/+24
| * reset email templates to Englishfriendica2013-06-16100-836/+1971
| * implement taggable in auto-complete popupsfriendica2013-06-162-4/+7
* | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-06-1659-883/+1003
|\|
| * directory search by hubfriendica2013-06-161-1/+3
| * hopefully this won't screw up everything - if it does, revert. Otherwise this...friendica2013-06-162-23/+31
| * flag taggable connections in acl selectorfriendica2013-06-165-17/+18
| * don't federate webpages ;-)friendica2013-06-151-0/+6
| * fix "new connection has less permissions than public"friendica2013-06-151-4/+12
| * hijack the #getzot tagfriendica2013-06-151-9/+17
| * silence a pointless warningfriendica2013-06-152-2/+2
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-141-0/+85
| |\
| | * Merge pull request #57 from git-marijus/patch-1Thomas Willingham2013-06-141-30/+33
| | |\
| | | * beautify codegit-marijus2013-06-141-30/+33
| | |/
| | * Lighttpd sample configThomas Willingham2013-06-141-0/+82
| * | push refresh messages, performance work on conversations and configs, doc upd...friendica2013-06-1437-327/+398
| |/