Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge pull request #583 from git-marijus/master" | friendica | 2014-09-10 | 9 | -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"" | friendica | 2014-09-10 | 2 | -3/+3 |
| | | | | This reverts commit 8e179aa73495f93151943293df32cde9f2c3848f. | ||||
* | Revert "update nl - attempt 2" | friendica | 2014-09-10 | 2 | -3/+3 |
| | | | | This reverts commit 4712b78e520ca10b34e3e9b99c2752b10d811b42. | ||||
* | Merge pull request #583 from git-marijus/master | RedMatrix | 2014-09-11 | 9 | -19/+785 |
|\ | | | | | photo justification | ||||
| * | without this check we kill the directory autoload | marijus | 2014-09-10 | 1 | -15/+17 |
| | | |||||
| * | photo justification | marijus | 2014-09-10 | 9 | -19/+783 |
| | | |||||
* | | update nl - attempt 2 | Jeroen | 2014-09-10 | 2 | -3/+3 |
| | | |||||
* | | update nl | Jeroen | 2014-09-10 | 3 | -373/+389 |
|/ | |||||
* | channel or account | jeroenpraat | 2014-09-10 | 1 | -1/+1 |
| | |||||
* | should be updated | jeroenpraat | 2014-09-10 | 1 | -7/+17 |
| | |||||
* | don't include plus-sign in the stored term for imported mentions | friendica | 2014-09-10 | 2 | -2/+4 |
| | |||||
* | this should be the final piece of the puzzle | friendica | 2014-09-09 | 1 | -0/+14 |
| | |||||
* | cross-network mention issues | friendica | 2014-09-09 | 1 | -2/+5 |
| | |||||
* | Did I ever mention how much I HATE hacking crypto? If you've got a protocol ↵ | friendica | 2014-09-09 | 1 | -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 ↵ | friendica | 2014-09-09 | 1 | -1/+9 |
| | | | | the correct URL | ||||
* | diaspora connections being marked orphan on directory servers | friendica | 2014-09-09 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-09 | 2 | -28/+1 |
|\ | |||||
| * | Doco - URL update, kill dupe | Thomas Willingham | 2014-09-10 | 2 | -28/+1 |
| | | |||||
* | | some fixes for auto-perms across networks | friendica | 2014-09-09 | 1 | -9/+9 |
|/ | |||||
* | reduce log level of inbound d* posts until we get through some of the more ↵ | friendica | 2014-09-09 | 2 | -2/+2 |
| | | | | serious federation issues | ||||
* | and provide a strong hint by showing the errant account_flags | friendica | 2014-09-09 | 1 | -5/+5 |
| | |||||
* | in case somebody has problems and does an update to try and fix it, put ↵ | friendica | 2014-09-09 | 1 | -0/+13 |
| | | | | something in the logs to show what's happening. | ||||
* | argument order reversed in downgrade_accounts | friendica | 2014-09-09 | 1 | -2/+2 |
| | |||||
* | encode rss message-id's - warning this will double store all existing rss ↵ | friendica | 2014-09-09 | 1 | -9/+8 |
| | | | | feed items and probably make a mess of things | ||||
* | put back old pointer | friendica | 2014-09-09 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-09 | 1 | -1/+3 |
|\ | |||||
| * | Merge pull request #582 from beardy-unixer/master | Thomas Willingham | 2014-09-09 | 1 | -1/+3 |
| |\ | | | | | | | Doco | ||||
| | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-09-09 | 140 | -1755/+2353 |
| | |\ | | |/ | |/| | |||||
| | * | Doco - note in Nginx file to kill a recurring support request. | Thomas Willingham | 2014-09-09 | 1 | -1/+3 |
| | | | |||||
* | | | fix empty reshared content | friendica | 2014-09-09 | 1 | -2/+2 |
|/ / | |||||
* | | doco correction | friendica | 2014-09-09 | 1 | -11/+5 |
| | | |||||
* | | syntax error in dba driver, document z_post_url | friendica | 2014-09-09 | 2 | -0/+30 |
| | | |||||
* | | if we have php54 don't log the whole damn stack on a db error, just the ↵ | friendica | 2014-09-09 | 1 | -2/+5 |
| | | | | | | | | current frame | ||||
* | | d* friending vsprintf error | friendica | 2014-09-09 | 3 | -3/+5 |
| | | |||||
* | | heavy lifting on diaspora likes. Still needs much more work - especially as ↵ | friendica | 2014-09-08 | 1 | -67/+56 |
| | | | | | | | | we're ignoring signatures at this time | ||||
* | | prevent red#matrix smilie replacements from tripping over each other. | friendica | 2014-09-08 | 1 | -2/+3 |
| | | |||||
* | | diaspora_like - sql error | friendica | 2014-09-08 | 1 | -22/+15 |
| | | |||||
* | | one more time | friendica | 2014-09-08 | 1 | -2/+3 |
| | | |||||
* | | missed one | friendica | 2014-09-08 | 1 | -2/+5 |
| | | |||||
* | | This is long overdue - use a symblic constant NULL_DATE instead of the ↵ | friendica | 2014-09-08 | 22 | -46/+47 |
| | | | | | | | | easily mis-typed sequence '0000-00-00 00:00:00' | ||||
* | | attempt to format diaspora reshares correctly. This might be an iterative ↵ | friendica | 2014-09-08 | 1 | -24/+21 |
| | | | | | | | | process. | ||||
* | | wrap photo albums (albums and top level) in a div id=photo-album-contents | friendica | 2014-09-08 | 2 | -2/+5 |
| | | |||||
* | | import_profile_photo array warnings | friendica | 2014-09-08 | 2 | -3/+3 |
| | | |||||
* | | add categories to events | friendica | 2014-09-07 | 4 | -4/+89 |
| | | |||||
* | | set the default items-per-page for the entire app to 60 | friendica | 2014-09-07 | 1 | -1/+1 |
| | | |||||
* | | for webpages, hide the mimetype selector unless in advanced mode. For pages ↵ | friendica | 2014-09-07 | 4 | -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_merge | friendica | 2014-09-07 | 3 | -5/+14 |
|\ \ | |||||
| * | | Added abook-changed background colour to dark schema | Jeroen | 2014-09-07 | 3 | -5/+14 |
| | | | |||||
* | | | Diaspora actually puts the account full name into the "nickname" field of ↵ | friendica | 2014-09-07 | 2 | -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 embeds | friendica | 2014-09-06 | 1 | -0/+6 |
| | |