aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into zpullfriendica2013-12-2215-41/+7505
|\
| * Merge pull request #249 from cvogeley/masterfriendica2013-12-229-4/+7344
| |\
| | * Use the red matrix iconsChristian Vogeley2013-12-221-2/+9
| | * Merge correctionChristian Vogeley2013-12-222-4/+0
| | * Correction 2Christian Vogeley2013-12-222-1494/+0
| | * CorrectionChristian Vogeley2013-12-223-166/+0
| | * MergeChristian Vogeley2013-12-221-0/+1
| | * Merge branch 'bootstrap'Christian Vogeley2013-12-2214-4/+9000
| | |\
| | | * Merge remote-tracking branch 'upstream/master' into bootstrapChristian Vogeley2013-12-22872-18853/+26805
| | | |\ | | | |/ | | |/|
| | | * New modal dialog for item expiryChristian Vogeley2013-12-229-4/+7340
| * | | Merge pull request #250 from beardy-unixer/masterfriendica2013-12-226-37/+161
| |\ \ \ | | |/ / | |/| |
| | * | StyleThomas Willingham2013-12-221-7/+7
| | * | Must have broken that in a merge - put it backThomas Willingham2013-12-221-0/+17
| | * | Ooops, also update the DBThomas Willingham2013-12-221-0/+8
| | * | AchievementsThomas Willingham2013-12-221-0/+84
| | * | xrefThomas Willingham2013-12-221-0/+20
| | * | Some sys chan stuffThomas Willingham2013-12-223-42/+37
| | * | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-12-22196-2976/+2884
| | |\ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-12-18827-17329/+33904
| | |\ \
| | * | | Copy paste from one terminal to another changed tab to whitespace.Thomas Willingham2013-11-151-7/+7
| | * | | Still use page_display.tpl for pages.Thomas Willingham2013-11-151-2/+11
* | | | | js functions behind quick permission links were lost in comanchification proc...friendica2013-12-222-82/+82
|/ / / /
* | | | 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
|/ / / /