aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-09140-1755/+2353
|\
| * doco correctionfriendica2014-09-091-11/+5
| * syntax error in dba driver, document z_post_urlfriendica2014-09-092-0/+30
| * if we have php54 don't log the whole damn stack on a db error, just the curre...friendica2014-09-091-2/+5
| * d* friending vsprintf errorfriendica2014-09-093-3/+5
| * heavy lifting on diaspora likes. Still needs much more work - especially as w...friendica2014-09-081-67/+56
| * prevent red#matrix smilie replacements from tripping over each other.friendica2014-09-081-2/+3
| * diaspora_like - sql errorfriendica2014-09-081-22/+15
| * one more timefriendica2014-09-081-2/+3
| * missed onefriendica2014-09-081-2/+5
| * This is long overdue - use a symblic constant NULL_DATE instead of the easily...friendica2014-09-0822-46/+47
| * attempt to format diaspora reshares correctly. This might be an iterative pro...friendica2014-09-081-24/+21
| * wrap photo albums (albums and top level) in a div id=photo-album-contentsfriendica2014-09-082-2/+5
| * import_profile_photo array warningsfriendica2014-09-082-3/+3
| * add categories to eventsfriendica2014-09-074-4/+89
| * set the default items-per-page for the entire app to 60friendica2014-09-071-1/+1
| * for webpages, hide the mimetype selector unless in advanced mode. For pages t...friendica2014-09-074-9/+14
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-073-5/+14
| |\
| | * Added abook-changed background colour to dark schemaJeroen2014-09-073-5/+14
| * | Diaspora actually puts the account full name into the "nickname" field of the...friendica2014-09-072-2/+2
| |/
| * support the recent (2 years ago) changes to diaspora photo embedsfriendica2014-09-061-0/+6
| * hook photos scroll to page downfriendica2014-09-061-1/+1
| * extra_query_args() restricted to $_GET only. $_REQUEST was adding cookies and...friendica2014-09-061-4/+5
| * and more ajax workfriendica2014-09-062-3/+3
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-063-2/+7
| |\
| | * Fix directory for NOT endless scroll. Dunno what's wrong with endlessThomas Willingham2014-09-061-2/+3
| | * Merge pull request #579 from encyclomundi/masterThomas Willingham2014-09-062-0/+4
| | |\
| | | * adding a bug report appCharles2014-09-052-0/+4
| | |/
| * / ajax workfriendica2014-09-068-16/+113
| |/
| * illegal string offset warningsfriendica2014-09-051-1/+1
| * more work on the event edit formfriendica2014-09-052-4/+18
| * doc updatesfriendica2014-09-0577-1045/+1331
| * improved logging if you're using php54 or laterfriendica2014-09-041-2/+8
| * issue #451 - clear gid and cid from network tab if discover is selectedfriendica2014-09-041-7/+7
| * put a date and time picker on eventsfriendica2014-09-042-6/+116
| * bb2diaspora_itembody - empty body, that explains a lotfriendica2014-09-041-0/+2
| * this improves the photos even morefriendica2014-09-041-3/+3
| * fix the client side of pocofriendica2014-09-041-11/+20
| * fix poco networkfriendica2014-09-041-1/+4
| * import_author_rss not succeeding, missing urlfriendica2014-09-041-4/+5
| * unset item_nocomment when starting a new delivery chainfriendica2014-09-041-1/+8
| * oops forgot about the privacy exclusionfriendica2014-09-041-4/+5
| * constrain photos to a fixed block regardless of aspect ratiofriendica2014-09-041-1/+23
| * allow feeds to be sourcedfriendica2014-09-041-1/+1
| * realm detection logic reversedfriendica2014-09-041-1/+1
| * allow stuff with Diaspora authors to federate in zot conversations even if th...friendica2014-09-044-2/+25
| * update docs as D* members should now be able to participate in redmatrix foru...friendica2014-09-031-2/+2
| * remove feed items from ACL selector - there's nothing we can do with them and...friendica2014-09-031-0/+5
| * sort out some of the bb2d madnessfriendica2014-09-032-70/+27
| * this is turning into a wretched mess. It's going to get worse before it gets ...friendica2014-09-032-200/+99