Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-09 | 1 | -112/+0 |
|\ | |||||
| * | remove some cruft - revert if you find any regressions | marijus | 2014-10-09 | 1 | -112/+0 |
| | | |||||
* | | return of the missing diaspora wall-to-wall attribution | friendica | 2014-10-09 | 2 | -12/+12 |
|/ | |||||
* | fix css for [code] | marijus | 2014-10-09 | 3 | -8/+12 |
| | |||||
* | fix userinfo icon size | marijus | 2014-10-09 | 1 | -1/+1 |
| | |||||
* | more css fixes | marijus | 2014-10-09 | 2 | -0/+5 |
| | |||||
* | css fixes | marijus | 2014-10-09 | 2 | -15/+14 |
| | |||||
* | try to track down intermittent wall-to-wall attribution on Diaspora exported ↵ | friendica | 2014-10-09 | 2 | -1/+5 |
| | | | | posts | ||||
* | oembed issues | friendica | 2014-10-08 | 2 | -9/+9 |
| | |||||
* | change parent constructor per discussion | friendica | 2014-10-08 | 1 | -1/+1 |
| | |||||
* | dav issue | friendica | 2014-10-08 | 2 | -2/+1 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-08 | 5 | -3279/+3688 |
|\ | |||||
| * | 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 |
| | | | |||||
| * | | Merge pull request #627 from tuscanhobbit/dev | RedMatrix | 2014-10-09 | 1 | -1/+3 |
| |\ \ | | | | | | | | | The simplest way to hide hubs in statistics | ||||
| | * | | it's probably better to return an int type in json | tuscanhobbit | 2014-10-08 | 1 | -1/+2 |
| | | | | |||||
| | * | | The simplest way to hide hubs in statistics | tuscanhobbit | 2014-10-08 | 1 | -1/+2 |
| |/ / | |||||
| * | | Small fix so search field and search buttons fit well. | Jeroen | 2014-10-08 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-08 | 2 | -1/+10 |
| |\ \ | |||||
| * | | | css fix | marijus | 2014-10-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | disable email notifications when bulk importing content. | friendica | 2014-10-08 | 2 | -0/+37 |
| | | | | |||||
* | | | | don't double-encode hashtags | friendica | 2014-10-08 | 1 | -4/+4 |
| |/ / |/| | | |||||
* | | | soundcloud using a slightly different oembed mechanism - react accordingly | friendica | 2014-10-08 | 2 | -1/+10 |
|/ / | |||||
* | | Merge pull request #626 from habeascodice/master | RedMatrix | 2014-10-08 | 1 | -1/+1 |
|\ \ | | | | | | | regex missing terminator char | ||||
| * | | regex missing terminator char | habeascodice | 2014-09-29 | 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 | 6 | -67/+42 |
| | | | |||||
* | | | nav pills for apps aside | marijus | 2014-10-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge pull request #625 from letterbomber/master | RedMatrix | 2014-10-08 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | put back local file check so body is fetched from z_ functions | ||||
| | * | | | put back local file check so body is fetched from z_ functions | nostupidzone | 2014-10-07 | 1 | -1/+1 |
| |/ / / | |||||
* / / / | make author link bold again | marijus | 2014-10-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | css fixes | marijus | 2014-10-08 | 3 | -20/+5 |
| | | | |||||
* | | | add imagick version check when guessing mimetype. It probably isn't ↵ | friendica | 2014-10-07 | 1 | -10/+21 |
| | | | | | | | | | | | | important here, but let's make sure we have the right driver installed if we do something else with photos afterward. | ||||
* | | | 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. | ||||
* | | | log the recursive reshare from hell at logger_debug until we get through ↵ | friendica | 2014-10-07 | 1 | -3/+3 |
| | | | | | | | | | | | | this mess. | ||||
* | | | 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 |
| | | | |||||
* | | | check the imagick version before using it. | friendica | 2014-10-07 | 2 | -5/+17 |
| | | | |||||
* | | | Schema option for making links bold again. ↵ | Jeroen | 2014-10-07 | 6 | -0/+12 |
| | | | | | | | | | | | | https://redmatrix.nl/display/d09d1cd2dbc45866beb9c0d384c9dcefe799d1251e3394d12ddb2e34d2c26228@red.mariovavti.com | ||||
* | | | Merge pull request #623 from letterbomber/master | RedMatrix | 2014-10-08 | 1 | -6/+10 |
|\ \ \ | | | | | | | | | add ability to skip broken imagemagick on shared hosting | ||||
| * | | | add ability to skip broken imagemagick on shared hosting | nostupidzone | 2014-10-07 | 1 | -6/+10 |
|/ / / | |||||
* | / | porting more widgets to bs nav-pills | marijus | 2014-10-07 | 9 | -86/+56 |
| |/ |/| | |||||
* | | 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 |
| | | |||||
* | | Merge pull request #621 from solstag/master | RedMatrix | 2014-10-07 | 2 | -3/+3 |
|\ \ | | | | | | | datetimepicker data-format now data-date-format | ||||
| * | | datetimepicker data-format now data-date-format | Alexandre Hannud Abdo | 2014-10-07 | 2 | -3/+3 |
|/ / | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-06 | 16 | -371/+384 |
|\ \ |