aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #253 from cvogeley/masterfriendica2013-12-232-1/+2
|\
| * Show expire date in post tooltipChristian Vogeley2013-12-232-1/+2
* | s/zrl/zidThomas Willingham2013-12-231-1/+1
* | Merge https://github.com/friendica/red into zpullfriendica2013-12-235-3276/+3020
|\ \
| * | You'll probably be wanting the actual template too.Thomas Willingham2013-12-231-1/+1
| * | Zidification of author links in webpages.Thomas Willingham2013-12-231-1/+4
| * | Merge pull request #252 from tobiasd/DE20131223tobiasd2013-12-232-3273/+3014
| |\ \
| | * | DE: update to the stringsTobias Diekershoff2013-12-232-3273/+3014
| |/ /
| * | Reduce life of xref cookie per Opinion 04/2012 on Cookie Consent Exemption.Thomas Willingham2013-12-231-1/+1
* | | oopsfriendica2013-12-232-1/+350
|/ /
* | one step closer to merging register and pubsites pagesfriendica2013-12-221-2/+2
* | Provide Terms of Service placeholder page (includes doc/SiteTOS.md)friendica2013-12-223-2/+5
* | still not entirely happy with the text. So I'm playing with it a bit.friendica2013-12-221-1/+1
* | remove a couple of mysql reserved words from being used as table or row names...friendica2013-12-2220-60/+73
* | more (somewhat minor) but important cleanup for mod_photos so visitors with t...friendica2013-12-221-16/+12
* | issue deleting photos (attached item remained undeleted and became visible, t...friendica2013-12-222-3/+3
* | make xref workfriendica2013-12-221-14/+14
* | more proof-readingfriendica2013-12-221-2/+2
* | proof-readfriendica2013-12-221-1/+1
* | let's confront this "social network" elephant in the room head on rather than...friendica2013-12-221-0/+3
* | add ability to set created date/time from the apifriendica2013-12-222-4/+4
* | clean up sys_channel creation so it will workfriendica2013-12-221-12/+24
* | 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