aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-06-0782-691/+1154
|\
| * by default pending connections have no rightsfriendica2013-06-061-2/+2
| * no GMT_TIMESTAMP() in mysql - use UTC_TIMESTAMP() insteadfriendica2013-06-062-2/+2
| * photo album listing widget brokenfriendica2013-06-052-4/+4
| * set default channel to new import if a default channel wasn't already setfriendica2013-06-051-0/+2
| * missing include, plus change to new red api path for basic exportfriendica2013-06-051-2/+2
| * doh - would probably help to decode the data before trying to use it...friendica2013-06-052-1/+2
| * This should get community tagging pretty close to working - deleting a commun...friendica2013-06-042-6/+36
| * tagging posts now sends out a presumably legal activity message - all that's ...friendica2013-06-042-68/+23
| * DB: add timestamps to hubloc table so we can eventually expire dead entries.friendica2013-06-043-4/+18
| * community tagging - it's not much closer to working but a really good develop...friendica2013-06-043-64/+61
| * fix buggered contact photosfriendica2013-06-033-1/+32
| * syntax errorfriendica2013-06-031-1/+1
| * templatise alt_pagerfriendica2013-06-034-15/+15
| * move oohembed service to addonfriendica2013-06-031-5/+10
| * quick and dirty (real dirty) template docofriendica2013-06-033-0/+223
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-034-13/+45
| |\
| | * Make a start at making mail look less dreadful.Thomas Willingham2013-06-022-1/+39
| | * TypoThomas Willingham2013-06-021-1/+1
| | * Fix opensearchThomas Willingham2013-06-021-10/+5
| | * Fix TinyMCEThomas Willingham2013-05-311-1/+0
| | * Put a stop to "I couldn't find the menu" by adding a nabla - until somebody c...Thomas Willingham2013-05-301-1/+1
| * | fix pager, doc updatefriendica2013-06-0360-515/+688
| |/
* | Add a webpages tab, where we can edit published pages.Thomas Willingham2013-05-311-0/+7
* | Lets not require files if we don't need them.Thomas Willingham2013-05-311-2/+3
* | By golly, I do believe it works.Thomas Willingham2013-05-311-16/+16
* | Half-assed use-webpage-instead-of-html.Thomas Willingham2013-05-311-2/+41
* | Set a site channel so an admin can use CMS to create home.html and so on, wit...Thomas Willingham2013-05-312-1/+6
|/
* force delayed_publish time comparisons to UTC.friendica2013-05-291-2/+2
* fix for multiple hublocs and incoming magic authfriendica2013-05-291-2/+2
* add photos and albums enumeration to Red API (will allow us to export either ...friendica2013-05-292-3/+54
* function args reversed on duplicate zid detection.friendica2013-05-292-2/+2
* make sure we get the correct URL. Also redirect back again (essentially perfo...friendica2013-05-282-44/+24
* let's make this failsafefriendica2013-05-281-6/+9
* Merge https://github.com/friendica/red into zpullfriendica2013-05-281-0/+1
|\
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2013-05-291-0/+1
| |\
| * | Typo, or somehow ended up with a missing line another way.Thomas Willingham2013-05-291-0/+1
* | | more modmagic trackingfriendica2013-05-281-0/+1
| |/ |/|
* | Merge https://github.com/friendica/red into zpullfriendica2013-05-283-19/+114
|\|
| * Update docoThomas Willingham2013-05-292-17/+110
| * Add an article to default.php to allow for fixed width themes, without breaki...Thomas Willingham2013-05-291-2/+4
* | add logging to mod/magic when channel not found so we can trace it.friendica2013-05-281-0/+1
|/
* fix location setting stufffriendica2013-05-283-5/+5
* Merge https://github.com/friendica/red into zpullfriendica2013-05-289-12/+214
|\
| * Merge pull request #56 from beardy-unixer/masterfriendica2013-05-289-12/+214
| |\
| | * Oops, remove site specific CSSThomas Willingham2013-05-281-8/+1
| | * Clean up dark themeThomas Willingham2013-05-281-3587/+21
| | * Use misanthrozot as dark scheme, fix some PCSS bugsThomas Willingham2013-05-283-5/+8
| | * Make pages better.Thomas Willingham2013-05-283-8/+3742
| | * mod_page.cssThomas Willingham2013-05-281-0/+28