aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* improve the directory popup a bitfriendica2013-12-234-14/+48
|
* first thing to make it less annoying is to only popup if you click. Will ↵friendica2013-12-231-1/+1
| | | | improve on it later - but this gives us something we can test to improve the popup contents.
* first cut at a directory popup. It's a bit annoying at the moment, so we'll ↵friendica2013-12-239-9/+196
| | | | have to make it less so. Also had second thoughts about the project homepage changes made yesterday. Just because a bunch of Reddit trolls can't get social networking out of their brain long enough to explore other technologies or even read the project page doesn't mean we should pander to them and explain how or why we either are or aren't a social network.
* Merge https://github.com/friendica/red into zpullfriendica2013-12-233-2/+3
|\
| * Merge pull request #253 from cvogeley/masterfriendica2013-12-232-1/+2
| |\ | | | | | | Show expire date in post tooltip
| | * Show expire date in post tooltipChristian Vogeley2013-12-232-1/+2
| | |
| * | s/zrl/zidThomas Willingham2013-12-231-1/+1
| | |
* | | add account_level, is_foreigner and is_member functions; convert all e2ee ↵friendica2013-12-239-16/+80
|/ / | | | | | | user input and prompts to hex to avoid javascipt's lame handling of quotes. !!This breaks all prior encrypted posts.!!
* | 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 strings
| | * | 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
| | | | | | | | | | | | | | | Otherwise, we need to annoy everyone with cookie warnings if they access a hub in the EU.
* | | 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 ↵friendica2013-12-2220-60/+73
| | | | | | | | names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code.
* | more (somewhat minor) but important cleanup for mod_photos so visitors with ↵friendica2013-12-221-16/+12
| | | | | | | | the correct permissions to add photos can also remove them
* | issue deleting photos (attached item remained undeleted and became visible, ↵friendica2013-12-222-3/+3
| | | | | | | | though the photo was gone)
* | 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 ↵friendica2013-12-221-0/+3
| | | | | | | | than try to sweep it under the rug.
* | 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
| |\| | | | | | | New modal dialog for item expiry
| | * 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
| | | |\ | | | |/ | | |/| | | | | | | | | Conflicts: view/php/theme_init.php
| | | * New modal dialog for item expiryChristian Vogeley2013-12-229-4/+7340
| | | |
| * | | Merge pull request #250 from beardy-unixer/masterfriendica2013-12-226-37/+161
| |\ \ \ | | |/ / | |/| | Various bits
| | * | 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: mod/page.php
| | * | | 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 ↵friendica2013-12-222-82/+82
|/ / / / | | | | | | | | | | | | process - because the js didn't get relocated to the new connedit module
* | | | last remaining files to be Comanchified with the exception of mod_admin. ↵friendica2013-12-224-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | Though I should probably take a third look to see if anything else uses widgets. In fact - it appears that the flattrwidget does.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 03:18:44 +0000