aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge upstreamChristian Vogeley2013-10-2088-2791/+4285
|\
| * Clean up dupes in hook listThomas Willingham2013-10-191-21/+0
| * remove "via wall-To-Wall" text as it's soooo Facebook and is out of place in ...friendica2013-10-193-2/+3
| * basic gotcha's enumerated when porting Friendica addonsfriendica2013-10-181-0/+16
| * put translate README into help docsfriendica2013-10-182-1/+3
| * add hooklist to plugin pagefriendica2013-10-181-1/+1
| * doc - complete hook list, still need detailed functional descriptions with pa...friendica2013-10-183-2/+158
| * Put a status editor on the display page if you're logged in. This fixes issue...friendica2013-10-187-152/+442
| * doc updatesfriendica2013-10-1842-127/+264
| * and did it againfriendica2013-10-161-1/+1
| * wrong function namefriendica2013-10-161-1/+1
| * advanced plugins as a stepping stone to building modulesfriendica2013-10-161-1/+35
| * Merge https://github.com/friendica/red into zpullfriendica2013-10-162-7/+6
| |\
| | * Errant logging.Thomas Willingham2013-10-171-2/+0
| | * Check only for php in schema globs.Thomas Willingham2013-10-161-1/+1
| | * Don't break themes by using functions we don't need.Thomas Willingham2013-10-162-6/+7
| * | minor editsfriendica2013-10-161-4/+13
| * | first cut at plugin author's guidefriendica2013-10-161-0/+201
| |/
| * wrong app namefriendica2013-10-163-4/+4
| * add code-style guidelines. These aren't laws or rules, they are guidelines.friendica2013-10-151-0/+24
| * oauth wasn't logging in properly, also fixed api status_show to return last p...friendica2013-10-153-5/+13
| * directory sync optimisations to save redundant processingfriendica2013-10-153-2/+21
| * update even if no changefriendica2013-10-141-0/+8
| * why do these have invalid id's?friendica2013-10-142-2/+2
| * extra loggingfriendica2013-10-142-2/+5
| * sync tweaksfriendica2013-10-141-1/+1
| * don't update old entries with no addressfriendica2013-10-141-1/+1
| * sql wrong number of argsfriendica2013-10-141-0/+1
| * sql typo in directory syncfriendica2013-10-141-1/+1
| * We really don't need the category delete links on each category in each post ...friendica2013-10-141-1/+1
| * linkify post categoriesfriendica2013-10-143-3/+10
| * Merge pull request #180 from git-marijus/masterfriendica2013-10-142-9/+3
| |\
| | * i guess we should use .active class for all selected links.marijus2013-10-142-9/+3
| * | Issue #181Thomas Willingham2013-10-141-2/+2
| |/
| * template and icons for categories and "file as"friendica2013-10-145-47/+67
| * fix endless scrollfriendica2013-10-131-1/+1
| * attachment icons revisitedfriendica2013-10-133-28/+71
| * turn off endless scroll if we have no more content to load - currently for mo...friendica2013-10-133-1/+6
| * directory sort links on sidebarfriendica2013-10-133-0/+19
| * provide config for preferred directory serverfriendica2013-10-131-0/+3
| * preserve the source owner when creating a delivery fork so that we can uplink...friendica2013-10-135-8/+41
| * Merge https://github.com/friendica/red into zpullfriendica2013-10-133-7/+12
| |\
| | * Merge pull request #179 from git-marijus/masterfriendica2013-10-132-3/+8
| | |\
| | | * reorder items in private-mail - the delete button is on the right side everyw...marijus2013-10-132-3/+8
| | |/
| | * Merge pull request #178 from cvogeley/masterfriendica2013-10-121-3/+3
| | |\
| * | | remove the disabled flag on individual permissions and improve the text to sh...friendica2013-10-134-3/+11
| |/ /
| * | Merge https://github.com/friendica/red into zpullfriendica2013-10-123-2402/+2872
| |\ \
| | * \ Merge pull request #177 from tuscanhobbit/masterfriendica2013-10-122-2401/+2871
| | |\ \
| | | * | updated italian translationtuscanhobbit2013-10-122-183/+294
| | | * | Update italian translationp.tacconi2013-10-112-2375/+2734