Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | jsonp support (thankxs fabrixxm) | friendica | 2014-10-16 | 3 | -3/+6 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-15 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-10-16 | 2 | -3/+3 |
| |\ | |||||
| * | | Let's not play security expert. Use Mozillas recommended server | Thomas Willingham | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | config, even if it's ridiculously verbose. Reasoning - they make the browser, so if they've got it wrong, you're buggered anyway. | ||||
* | | | remove log statement | friendica | 2014-10-15 | 1 | -2/+0 |
| | | | |||||
* | | | missing event permissions | friendica | 2014-10-15 | 4 | -4/+7 |
| |/ |/| | |||||
* | | Don't recognise hashtags starting with #, e.g. ### | friendica | 2014-10-15 | 2 | -3/+3 |
|/ | |||||
* | SSL is broken you say? Well bah gum. | Thomas Willingham | 2014-10-16 | 1 | -1/+1 |
| | | | | Someone probably needs to update Lighttpd and Apache too. | ||||
* | $comments > $commentbox | marijus | 2014-10-15 | 1 | -1/+1 |
| | |||||
* | some work on single photo view comments | marijus | 2014-10-15 | 3 | -19/+29 |
| | |||||
* | one more item_id > id | marijus | 2014-10-15 | 1 | -1/+1 |
| | |||||
* | it seems we do not have an key called item_id here so must be id only | marijus | 2014-10-15 | 1 | -1/+1 |
| | |||||
* | chanman is now 'locs' and a couple of post handlers have been defined. | friendica | 2014-10-14 | 2 | -31/+90 |
| | |||||
* | back to wrestling with the !@#$ diaspora recursive reshare from hell | friendica | 2014-10-14 | 1 | -3/+8 |
| | |||||
* | missing quote | friendica | 2014-10-14 | 1 | -1/+1 |
| | |||||
* | this is the reason Diaspora forum tagging was broken | friendica | 2014-10-14 | 4 | -6/+14 |
| | |||||
* | if a hubloc primary change results in an xchan primary change, create a ↵ | friendica | 2014-10-13 | 1 | -1/+5 |
| | | | | directory update packet. | ||||
* | figuring out how to bootstrap the change_primary procedure when all you have ↵ | friendica | 2014-10-13 | 2 | -0/+6 |
| | | | | is inconsistent data which you think you trust. | ||||
* | fix import sql error | friendica | 2014-10-13 | 1 | -1/+1 |
| | |||||
* | don't use cached data | friendica | 2014-10-13 | 1 | -0/+2 |
| | |||||
* | there's the problem | friendica | 2014-10-13 | 1 | -2/+2 |
| | |||||
* | more diagnostic when changing primary | friendica | 2014-10-13 | 1 | -4/+17 |
| | |||||
* | this bug has been there for a *long* time. First time I've ever seen it ↵ | friendica | 2014-10-13 | 1 | -1/+1 |
| | | | | triggered. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-13 | 7 | -200/+251 |
|\ | |||||
| * | Merge pull request #638 from dawnbreak/RedDAV | RedMatrix | 2014-10-14 | 7 | -200/+251 |
| |\ | | | | | | | When you delete something in /cloud stay in the right folder. | ||||
| | * | When you delete something in /cloud stay in the right folder. | Klaus Weidenbach | 2014-10-14 | 7 | -200/+251 |
| |/ | | | | | | | | | | | | | When you deleted a file in /cloud you was always jumped back to /cloud/[channel], now you will stay in the parent folder. Some more doxygen documentation. Removed duplicate data from logging output and reduced logging in RedDAV in general. | ||||
* | | sql | friendica | 2014-10-13 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-13 | 4 | -13/+8 |
|\| | |||||
| * | Merge pull request #637 from tuscanhobbit/dev | RedMatrix | 2014-10-14 | 1 | -0/+3 |
| |\ | | | | | | | one more hidden config option | ||||
| | * | one more hidden config | tuscanhobbit | 2014-10-13 | 1 | -0/+3 |
| | | | |||||
| | * | Merge from master | tuscanhobbit | 2014-10-13 | 17 | -987/+1048 |
| | |\ | |||||
| | | * | Merge from origin | tuscanhobbit | 2014-10-13 | 0 | -0/+0 |
| | |/| | |/| | | |||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-13 | 2 | -3/+3 |
| |\ \ \ | |||||
| * | | | | really fix connedit > collection > checkbox | marijus | 2014-10-13 | 3 | -13/+5 |
| | | | | | |||||
| | | * | | Merge pull request #6 from tuscanhobbit/master | Paolo T | 2014-10-12 | 323 | -14648/+15815 |
| | | |\| | | | | | | | | | | | Fast forward local hub | ||||
| | | | * | Merge pull request #4 from friendica/master | Paolo T | 2014-10-12 | 323 | -14649/+15818 |
| | | | |\ | | | | | | | | | | | | | Fast forward local hub | ||||
* | | | | | | new function hubloc_change_primary() | friendica | 2014-10-13 | 2 | -3/+60 |
| |/ / / / |/| | | | | |||||
* | | | | | tinymce still seems to be referenced. Can't quite get rid of it. | friendica | 2014-10-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-13 | 1 | -0/+2 |
|\| | | | | |||||
| * | | | | fix connedit > collection > checkbox position also for webkit - this will ↵ | marijus | 2014-10-13 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | need a better solution though | ||||
* | | | | | bring back PM upload functionality and why oh why are we still loading tinymce? | friendica | 2014-10-13 | 3 | -4/+4 |
|/ / / / | |||||
* | | | | context check | friendica | 2014-10-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | diaspora_send_status() - recalculate markdown translation to pickup any ↵ | friendica | 2014-10-12 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | later message changes after original submission like wall-to-wall attributions for instance. Normally this would've come from our cached version which was stored prior to tag_deliver being run and therefore isn't yet aware that wall-to-wall status may have changed after delivery. | ||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-12 | 6 | -928/+985 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #636 from dawnbreak/RedDAV | RedMatrix | 2014-10-13 | 6 | -928/+985 |
| |\ \ \ \ | | | | | | | | | | | | | Moved classes from reddav.php into own files. | ||||
| | * | | | | A fix, but I have no case to verify. | Klaus | 2014-10-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | I could not find out under which conditions this is relevant and therefore have no test case, but it must be of instance RedDAV\RedFile. | ||||
| | * | | | | Moved classes from reddav.php into own files. | Klaus Weidenbach | 2014-10-12 | 6 | -926/+983 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Finished moving classes out from include/reddav.php into own files. Also continued with namespace for RedDAV. Improved some docs and added some todos and fixmes. | ||||
* | / | | | bit of cleanup of hidden_configs. This is a start - we've got hundreds more. | friendica | 2014-10-12 | 1 | -37/+30 |
|/ / / / | |||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-12 | 2 | -7/+15 |
|\ \ \ \ | |||||
| * | | | | fix connedit > collection > checkbox position | marijus | 2014-10-12 | 2 | -7/+15 |
| | | | | |