| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #587 from git-marijus/master | RedMatrix | 2014-09-11 | 12 | -26/+803 |
| |\ | | | | | try once more :) | ||||
| | * | another day another concept - hope this works better | marijus | 2014-09-11 | 5 | -29/+40 |
| | | | |||||
| | * | Revert "Revert "Merge pull request #583 from git-marijus/master"" | marijus | 2014-09-11 | 9 | -19/+785 |
| |/ | | | | This reverts commit 08638f3ec88e86def618ff89bdedb9ae9696d218. | ||||
| * | Merge pull request #584 from tuscanhobbit/master | Paolo T | 2014-09-11 | 0 | -0/+0 |
| |\ | | | | | Merge pull request #2 from friendica/master | ||||
| | * | Merge pull request #2 from friendica/master | Paolo T | 2014-09-02 | 221 | -10101/+12522 |
| | |\ | | | | | | | Merge from main project | ||||
| * | | | make sure we add the file | friendica | 2014-09-10 | 1 | -0/+3 |
| | | | | |||||
| * | | | endless scroll on connections page | friendica | 2014-09-10 | 3 | -19/+43 |
| | | | | |||||
| * | | | disabling ability for diaspora to plustag redmatrix forums. See the notes. | friendica | 2014-09-10 | 1 | -1/+5 |
| | | | | |||||
| * | | | possible solution to diaspora walltowall mistaken attribution | friendica | 2014-09-10 | 2 | -9/+22 |
| | | | | |||||
| * | | | more compatibility notes | friendica | 2014-09-10 | 1 | -0/+2 |
| | | | | |||||
| * | | | encrypt diaspora_meta since it may contain private message contents | friendica | 2014-09-10 | 3 | -19/+47 |
| | | | | |||||
| * | | | make verify_email the default for new installs (at least English installs), ↵ | friendica | 2014-09-10 | 3 | -1/+9 |
| | | | | | | | | | | | | | and provide a setting on the admin page for it. | ||||
| * | | | fix the like signatures to the "new ordering" - inbound and outbound | friendica | 2014-09-10 | 1 | -20/+12 |
| | | | | |||||
| * | | | 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 |
| | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |