Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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 | Alexandre Hannud Abdo | 2014-10-07 | 2 | -3276/+3679 | |
| | * | | | | | | | Merge pull request #627 from tuscanhobbit/dev | RedMatrix | 2014-10-09 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | 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 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| * | | | | | | | 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 | 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 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-07 | 5 | -18/+29 | |
|\| | | | | | | ||||||
| * | | | | | | add imagick version check when guessing mimetype. It probably isn't important... | friendica | 2014-10-07 | 1 | -10/+21 | |
| * | | | | | | stylish_select wants to attach itself to the root html element. Since it stil... | friendica | 2014-10-07 | 1 | -1/+1 | |
| * | | | | | | log the recursive reshare from hell at logger_debug until we get through this... | friendica | 2014-10-07 | 1 | -3/+3 | |
| * | | | | | | add "stacked pills" to saved search term list (the delete icon is still a bit... | friendica | 2014-10-07 | 2 | -4/+4 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'master' of https://github.com/habeascodice/red | habeascodice | 2014-10-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | ||||||
| * | | | | regex missing terminator char | habeascodice | 2014-09-29 | 1 | -1/+1 | |
* | | | | | 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. https://redmatrix.nl/display/d09d1... | Jeroen | 2014-10-07 | 6 | -0/+12 | |
* | | | | | Merge pull request #623 from letterbomber/master | RedMatrix | 2014-10-08 | 1 | -6/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | 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 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of https://github.com/friendica/red | Jeroen | 2014-10-07 | 4 | -371/+384 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #620 from dawnbreak/RedDAV | RedMatrix | 2014-10-07 | 4 | -371/+384 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Moved RedBrowser class from reddav.php to it's own file. | Klaus Weidenbach | 2014-10-06 | 4 | -371/+384 | |
| * | | | | | | Rainbow_man with alpha channel turns out very ugly in the directory for some ... | Jeroen | 2014-10-07 | 12 | -0/+0 | |
| |/ / / / / | ||||||
* / / / / / | Make a best guess at how to pull the attribution from the recursive reshare f... | friendica | 2014-10-06 | 1 | -0/+4 | |
|/ / / / / | ||||||
* | | | | | found one bug trying to fetch the recursive reshare from hell. I still think ... | friendica | 2014-10-06 | 2 | -13/+13 | |
* | | | | | SQL error - private message conversation lookup | friendica | 2014-10-06 | 1 | -1/+1 | |
* | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-06 | 1 | -0/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Merge pull request #619 from dawnbreak/master | Klaus | 2014-10-07 | 1 | -0/+0 | |
| |\| | | | | ||||||
| | * | | | | We have no submodules, so no need for .gitmodules file. | Klaus Weidenbach | 2014-10-06 | 1 | -0/+0 | |
| |/ / / / | ||||||
* / / / / | shareable design elements | friendica | 2014-10-06 | 7 | -12/+89 | |
|/ / / / |