aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into bootstrapChristian Vogeley2013-12-22872-18853/+26805
|\
| * last remaining files to be Comanchified with the exception of mod_admin. Thou...friendica2013-12-224-8/+6
| * appears that I missed a few files for Comanchification. so here's mitem.friendica2013-12-224-6/+14
| * split private messages into two modules - "message" is just for message lists...friendica2013-12-2115-427/+133
| * comanchify mod_directory. Two modules remaining. Actually three because messa...friendica2013-12-205-13/+44
| * comanchify mod_search - we've got three modules left to Comanchify: admin, di...friendica2013-12-204-1199/+1060
| * doc updatesfriendica2013-12-20122-909/+1288
| * comanchify connedit, groupfriendica2013-12-196-28/+42
| * sourced items which are then edited at the source weren't setting up the seco...friendica2013-12-191-1/+8
| * default photo issue, and connections page showing deleted accounts. Also show...friendica2013-12-195-6/+12
| * add bbcode referencefriendica2013-12-192-0/+69
| * give doc/help alternate mimetype supportfriendica2013-12-191-3/+24
| * comanchificate mod_photosfriendica2013-12-194-27/+29
| * make default profile photo configurable - should be functional but needs admi...friendica2013-12-1912-120/+31
| * add 'src' parameter to api photo listfriendica2013-12-191-1/+4
| * if somebody tagged you in a private post, the tag email notification containe...friendica2013-12-191-3/+2
| * more comanchefriendica2013-12-193-18/+10
| * more comanchefriendica2013-12-193-7/+8
| * more comanche migrationfriendica2013-12-1914-128/+59
| * provide git revision in siteinfo if possible and if not instructed otherwisefriendica2013-12-182-5/+17
| * remove the .wgl (widget list) file processing for ordering widgets on a page....friendica2013-12-181-37/+1
| * Merge https://github.com/friendica/red into zpullfriendica2013-12-185-1492/+1295
| |\
| | * Merge pull request #246 from git-marijus/masterfriendica2013-12-183-19/+13
| | |\
| | | * show drop-icon on wall-item hover onlymarijus2013-12-182-6/+10
| | | * we make this with css nowmarijus2013-12-181-11/+1
| | | * fix a typomarijus2013-12-182-2/+2
| | |/
| | * Merge pull request #245 from tuscanhobbit/masterPaolo T2013-12-182-1473/+1282
| | |\
| | | * corrections to italian translationp.tacconi2013-12-182-1473/+1282
| * | | Add App::poi to store the "person of interest" for a given page. This is so w...friendica2013-12-184-32/+31
| |/ /
| * | split off mod_connections into mod_connections & mod_connedit - lots of links...friendica2013-12-189-545/+160
| * | split mod/connections for comanchificationfriendica2013-12-171-0/+708
| * | more comanche stufffriendica2013-12-174-6/+2
| * | Merge https://github.com/friendica/red into zpullfriendica2013-12-171-4/+7
| |\ \
| | * \ Merge pull request #244 from zzottel/masterfriendica2013-12-171-4/+7
| | |\ \
| | | * | JS-less displayzottel2013-12-171-4/+7
| | |/ /
| * / / authtest: do a better job of success/failure indicationfriendica2013-12-173-3/+8
| |/ /
| * | There's always more to do...friendica2013-12-161-0/+2
| * | Merge https://github.com/friendica/red into zpullfriendica2013-12-162-91/+35
| |\ \
| | * \ Merge pull request #243 from git-marijus/masterfriendica2013-12-162-91/+35
| | |\ \
| | | * | move some stuff back to mod_connections.cssmarijus2013-12-162-34/+31
| | | * | remove some cruft and a typomarijus2013-12-161-57/+4
| | | * | Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-1629-169/+1125
| | | |\ \
| | | * \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-144-5/+29
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-13114-2297/+2429
| | | |\ \ \ \
| * | | | | | | Tricky little bug. Allowed somebody to bypass comment permissions. Hopefully ...friendica2013-12-161-3/+4
| |/ / / / / /
| * | | | / / bring back the collection edit sidebar widget on the connection edit page unt...friendica2013-12-161-1/+1
| | |_|_|/ / | |/| | | |
| * | | | | install redbasic during setup so that at least one theme is registered. Other...friendica2013-12-162-1/+3
| * | | | | some re-work of mod_sourcesfriendica2013-12-154-4/+25
| * | | | | use 'a' ACL search instead of 'm' ACL search for mod_sourcesfriendica2013-12-151-0/+2
| * | | | | bloody hell - it isn't defined either.friendica2013-12-151-2/+2