aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #583 from git-marijus/master"friendica2014-09-109-785/+19
| | | | | | | autoload broken - even after clearing cache and retrying. This reverts commit 13e7a8f123b283a096af302b0366255355ba8439, reversing changes made to 4712b78e520ca10b34e3e9b99c2752b10d811b42.
* Revert "Revert "update nl - attempt 2""friendica2014-09-102-3/+3
| | | | This reverts commit 8e179aa73495f93151943293df32cde9f2c3848f.
* Revert "update nl - attempt 2"friendica2014-09-102-3/+3
| | | | This reverts commit 4712b78e520ca10b34e3e9b99c2752b10d811b42.
* Merge pull request #583 from git-marijus/masterRedMatrix2014-09-119-19/+785
|\ | | | | photo justification
| * without this check we kill the directory autoloadmarijus2014-09-101-15/+17
| |
| * photo justificationmarijus2014-09-109-19/+783
| |
* | update nl - attempt 2Jeroen2014-09-102-3/+3
| |
* | update nlJeroen2014-09-103-373/+389
|/
* channel or accountjeroenpraat2014-09-101-1/+1
|
* should be updatedjeroenpraat2014-09-101-7/+17
|
* don't include plus-sign in the stored term for imported mentionsfriendica2014-09-102-2/+4
|
* this should be the final piece of the puzzlefriendica2014-09-091-0/+14
|
* cross-network mention issuesfriendica2014-09-091-2/+5
|
* Did I ever mention how much I HATE hacking crypto? If you've got a protocol ↵friendica2014-09-091-1/+12
| | | | doc that says how you sign something, you damm well better sign it that way.
* go through the entire discovery sequence for mentions to make sure we have ↵friendica2014-09-091-1/+9
| | | | the correct URL
* diaspora connections being marked orphan on directory serversfriendica2014-09-091-1/+1
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-092-28/+1
|\
| * Doco - URL update, kill dupeThomas Willingham2014-09-102-28/+1
| |
* | some fixes for auto-perms across networksfriendica2014-09-091-9/+9
|/
* reduce log level of inbound d* posts until we get through some of the more ↵friendica2014-09-092-2/+2
| | | | serious federation issues
* and provide a strong hint by showing the errant account_flagsfriendica2014-09-091-5/+5
|
* in case somebody has problems and does an update to try and fix it, put ↵friendica2014-09-091-0/+13
| | | | something in the logs to show what's happening.
* argument order reversed in downgrade_accountsfriendica2014-09-091-2/+2
|
* encode rss message-id's - warning this will double store all existing rss ↵friendica2014-09-091-9/+8
| | | | feed items and probably make a mess of things
* put back old pointerfriendica2014-09-091-1/+1
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-091-1/+3
|\
| * Merge pull request #582 from beardy-unixer/masterThomas Willingham2014-09-091-1/+3
| |\ | | | | | | Doco
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-09140-1755/+2353
| | |\ | | |/ | |/|
| | * Doco - note in Nginx file to kill a recurring support request.Thomas Willingham2014-09-091-1/+3
| | |
* | | fix empty reshared contentfriendica2014-09-091-2/+2
|/ /
* | 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 ↵friendica2014-09-091-2/+5
| | | | | | | | current frame
* | d* friending vsprintf errorfriendica2014-09-093-3/+5
| |
* | heavy lifting on diaspora likes. Still needs much more work - especially as ↵friendica2014-09-081-67/+56
| | | | | | | | we're ignoring signatures at this time
* | 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 ↵friendica2014-09-0822-46/+47
| | | | | | | | easily mis-typed sequence '0000-00-00 00:00:00'
* | attempt to format diaspora reshares correctly. This might be an iterative ↵friendica2014-09-081-24/+21
| | | | | | | | process.
* | 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 ↵friendica2014-09-074-9/+14
| | | | | | | | that endless scroll and show blocky-block things, set the default items-per-page to 60. Why? It fits column-widths of 2,3,4,5,6,10,12,15, and 20 without leaving remaindered items dangling at the end. No other setting less than 100 has this much versatility.
* | 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 ↵friendica2014-09-072-2/+2
|/ / | | | | | | the vcard. They don't put the nickname into the vcard at all. One wonders why even have a nickname field since the fullname is already presented in the next line. This hasn't caused us a problem with Friendica because I'm guessing nobody actually uses this line, though the number of class tags on it makes it seem somewhat important.
* | support the recent (2 years ago) changes to diaspora photo embedsfriendica2014-09-061-0/+6
| |