Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 2 | -3/+3 |
|/ | |||||
* | fix connedit > collection > checkbox position | marijus | 2014-10-12 | 2 | -7/+15 |
| | |||||
* | Show tag in siteinfo. Not useful for us, quite useful for admins. | Thomas Willingham | 2014-10-11 | 1 | -0/+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 | 1 | -0/+1 |
|/ | |||||
* | 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 | 15 | -15/+23 |
| | | | | | | | .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 | 111 | -8184/+6868 |
|\ | |||||
| * | more updates to German strings plus email templates | zottel | 2014-10-10 | 8 | -1321/+1385 |
| | | |||||
| * | remove unused email template files | zottel | 2014-10-10 | 102 | -1885/+0 |
| | | |||||
| * | update to German strings | zottel | 2014-10-10 | 2 | -6172/+6675 |
| | | |||||
| * | allow (our own) ajax urls to pass through bbcode intact. | friendica | 2014-10-09 | 1 | -4/+6 |
| | | |||||
* | | 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 . | ||||
* | 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 | 18 | -26/+40 |
| | | | | 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. | ||||
* | remove some cruft - revert if you find any regressions | marijus | 2014-10-09 | 1 | -112/+0 |
| | |||||
* | fix css for [code] | marijus | 2014-10-09 | 3 | -8/+12 |
| | |||||
* | more css fixes | marijus | 2014-10-09 | 2 | -0/+5 |
| | |||||
* | css fixes | marijus | 2014-10-09 | 2 | -15/+14 |
| | |||||
* | Merge pull request #622 from solstag/master | RedMatrix | 2014-10-09 | 2 | -3276/+3679 |
|\ | | | | | update pt-br translation | ||||
| * | update pt-br translation | Alexandre Hannud Abdo | 2014-10-07 | 2 | -3276/+3679 |
| | | |||||
* | | Small fix so search field and search buttons fit well. | Jeroen | 2014-10-08 | 1 | -1/+5 |
| | | |||||
* | | css fix | marijus | 2014-10-08 | 1 | -1/+1 |
| | | |||||
* | | make nav-pills a bit smaller in height | marijus | 2014-10-08 | 2 | -3/+7 |
| | | |||||
* | | template for searchbox and some more work on saved searches | marijus | 2014-10-08 | 5 | -48/+25 |
| | | |||||
* | | nav pills for apps aside | marijus | 2014-10-08 | 1 | -1/+1 |
| | | |||||
* | | make author link bold again | marijus | 2014-10-08 | 1 | -1/+1 |
| | | |||||
* | | css fixes | marijus | 2014-10-08 | 3 | -20/+5 |
| | | |||||
* | | stylish_select wants to attach itself to the root html element. Since it ↵ | friendica | 2014-10-07 | 1 | -1/+1 |
| | | | | | | | | still has some serious issues, don't let it attach itself to anything. | ||||
* | | add "stacked pills" to saved search term list (the delete icon is still a ↵ | friendica | 2014-10-07 | 2 | -4/+4 |
| | | | | | | | | bit funky) | ||||
* | | Schema option for bgcolour and underline yes/no on hover for the left aside. | Jeroen | 2014-10-07 | 6 | -0/+16 |
| | | |||||
* | | Schema option for making links bold again. ↵ | Jeroen | 2014-10-07 | 6 | -0/+12 |
| | | | | | | | | https://redmatrix.nl/display/d09d1cd2dbc45866beb9c0d384c9dcefe799d1251e3394d12ddb2e34d2c26228@red.mariovavti.com | ||||
* | | porting more widgets to bs nav-pills | marijus | 2014-10-07 | 8 | -86/+54 |
|/ | |||||
* | remove this - some widgets still need to be converted to bs-pills though | marijus | 2014-10-07 | 1 | -1/+0 |
| | |||||
* | take away some boldness, some css fixes and some photo work | marijus | 2014-10-07 | 6 | -40/+38 |
| | |||||
* | datetimepicker data-format now data-date-format | Alexandre Hannud Abdo | 2014-10-07 | 2 | -3/+3 |
| | |||||
* | shareable design elements | friendica | 2014-10-06 | 2 | -1/+9 |
| | |||||
* | new version of moment.js to match datetimepicker | Alexandre Hannud Abdo | 2014-10-06 | 1 | -1/+1 |
| | |||||
* | remove the privacy macros in settings and connedit now that we have privacy ↵ | friendica | 2014-10-03 | 2 | -30/+0 |
| | | | | roles attached to the channel. One can still use the advanced permission dialogues, but they shouldn't have a reason to if they created the channel with a suitable channel type - plus it's just a bunch of extra permissions settings to confuse people. | ||||
* | more work on shared design elements | friendica | 2014-10-03 | 1 | -1/+7 |
| | |||||
* | more work on photos | marijus | 2014-10-02 | 3 | -6/+26 |
| |