Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| | | | | | ||||||
* | | | | | cleanup of sync_locations and better logging. There was one significant code ↵ | friendica | 2014-10-12 | 1 | -7/+11 | |
|/ / / / | | | | | | | | | | | | | change but it is unrelated to current issues, basically if no primary was set we were setting everything as primary. | |||||
* / / / | content deletion issue | friendica | 2014-10-12 | 2 | -2/+7 | |
|/ / / | ||||||
* | | | Some more previously undocumented configs. | Thomas Willingham | 2014-10-11 | 1 | -0/+49 | |
| | | | ||||||
* | | | Show tag in siteinfo. Not useful for us, quite useful for admins. | Thomas Willingham | 2014-10-11 | 2 | -1/+7 | |
| | | | ||||||
* | | | FFS, another oops | Thomas Willingham | 2014-10-11 | 1 | -2/+0 | |
| | | | ||||||
* | | | Fix webpages. Sycning between too many codebases... | Thomas Willingham | 2014-10-11 | 1 | -1/+3 | |
| | | | ||||||
* | | | Also that doesn't work anymore - prettyPhoto relic | Thomas Willingham | 2014-10-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Give Redbasic the -styled back | Thomas Willingham | 2014-10-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-10-11 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | +1 | Jeroen | 2014-10-11 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Unbreak webpages | Thomas Willingham | 2014-10-11 | 2 | -3/+2 | |
|/ / / | ||||||
* | | | Doco: Hidden configs - you won't believe what happens next! | Thomas Willingham | 2014-10-11 | 1 | -0/+58 | |
| | | | | | | | | | | | | | | | Covered the P's, still need to do the X and just the configs. Work in progress, so not linked from the index yet. | |||||
* | | | fix diaspora reshare tags | friendica | 2014-10-10 | 2 | -1/+3 | |
| | | | ||||||
* | | | ah yes, the redundant relay run was for the benefit of wall-to-wall posts ↵ | friendica | 2014-10-10 | 1 | -2/+1 | |
| | | | | | | | | | | | | issue #633 | |||||
* | | | missing source route after edit | friendica | 2014-10-10 | 2 | -1/+3 | |
| | | | ||||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-10 | 151 | -8229/+6920 | |
|\ \ \ | ||||||
| * | | | and more missing wrappers | marijus | 2014-10-10 | 18 | -20/+28 | |
| | | | | ||||||
| * | | | found more missing wrappers | marijus | 2014-10-10 | 2 | -2/+3 | |
| | | | | ||||||
| * | | | one more oups... | marijus | 2014-10-10 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | oups... that was weired... | marijus | 2014-10-10 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | This is a fix to not interfere the ongoing adding of ↵ | marijus | 2014-10-10 | 18 | -19/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | .generic-content-wrapper with the ongoing styling of redbasic theme. adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet. Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing. | |||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | Jeroen | 2014-10-10 | 258 | -11145/+11812 | |
| |\ \ \ | ||||||
| | * \ \ | Merge pull request #632 from zzottel/master | zzottel | 2014-10-10 | 8 | -1321/+1385 | |
| | |\ \ \ | | | | | | | | | | | | | more updates to German strings plus email templates | |||||
| | | * | | | more updates to German strings plus email templates | zottel | 2014-10-10 | 8 | -1321/+1385 | |
| | |/ / / | ||||||
| | * | | | Merge pull request #631 from zzottel/master | zzottel | 2014-10-10 | 102 | -1885/+0 | |
| | |\ \ \ | | | | | | | | | | | | | remove unused email template files | |||||
| | | * | | | remove unused email template files | zottel | 2014-10-10 | 102 | -1885/+0 | |
| | |/ / / | ||||||
| | * | | | Merge pull request #630 from zzottel/master | zzottel | 2014-10-10 | 2 | -6172/+6675 | |
| | |\ \ \ | | | | | | | | | | | | | update to German strings | |||||
| | | * | | | update to German strings | zottel | 2014-10-10 | 2 | -6172/+6675 | |
| | |/ / / | ||||||
| * | | | | Good compromise I think. Remove display setting . Set the default (light) ↵ | Jeroen | 2014-10-10 | 4 | -10/+5 | |
| | | | | | | | | | | | | | | | | | | | | schema to = , so that other schemas can still use . | |||||
* | | | | | remove remnants of old signing structure - now using diaspora_meta | friendica | 2014-10-10 | 1 | -7/+0 | |
| | | | | | ||||||
* | | | | | reset route to parent route on Diaspora comments flowing upstream so they ↵ | friendica | 2014-10-10 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | won't be rejected going downstream | |||||
* | | | | | make sure diaspora comments get the correct route | friendica | 2014-10-10 | 1 | -0/+4 | |
| |/ / / |/| | | | ||||||
* | | | | improvement in source route checking when handling complex *upstream* ↵ | friendica | 2014-10-10 | 3 | -1056/+1095 | |
| | | | | | | | | | | | | | | | | delivery chains, which were not adequately accounted for in the earlier checkin. | |||||
* | | | | doc updates | friendica | 2014-10-10 | 140 | -1903/+3809 | |
| | | | | ||||||
* | | | | allow (our own) ajax urls to pass through bbcode intact. | friendica | 2014-10-09 | 4 | -7/+11 | |
| | | | | ||||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-09 | 28 | -30/+67 | |
|\| | | | ||||||
| * | | | Added the display setting for generic (other) content wrapper. Also did set ↵ | Jeroen | 2014-10-09 | 8 | -6/+22 | |
| | | | | | | | | | | | | | | | | the default a bit lighter. See if that's ok. | |||||
| * | | | Added and changed on some places div class generic-content-wrapper. And ↵ | Jeroen | 2014-10-09 | 21 | -29/+50 | |
| | | | | | | | | | | | | | | | | added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it. |