| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'upstream/master' | habeascodice | 2014-10-09 | 22 | -3380/+3802 |
| |\ | |||||
| | * | 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 | ||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-07 | 5 | -18/+29 |
| |\| | | | |||||
| | * | | | 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) | ||||
| * | | | | x | habeascodice | 2014-10-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge remote branch 'upstream/master' | habeascodice | 2014-10-07 | 66 | -7600/+648 |
| |\| | | | |||||
| | * | | | 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 |
| | |\ \ | |||||
| | | * \ | 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. | ||||
| | | | | * | | Moved RedBrowser class from reddav.php to it's own file. | Klaus Weidenbach | 2014-10-06 | 4 | -371/+384 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First step on cleaning up ReadDAV classes and restructuring it bit in preparation for adding some more DAV features, photo access, CalDAV, etc. and hopefully also some PHPunits. Add a PHP5.3 namespace for RedDAV classes. Any objections against this or the vendor namespace? Add some more documentation for RedBrowser. | ||||
| | | * | | | | Rainbow_man with alpha channel turns out very ugly in the directory for some ↵ | Jeroen | 2014-10-07 | 12 | -0/+0 |
| | | |/ / / | | | | | | | | | | | | | | | | hosts. Reset to rainbow_man with alpha, with alpha to rainbow_man_trans. Did the same for red_koala to be sure. You now have a red_koala_trans too. | ||||
| | * / / / | Make a best guess at how to pull the attribution from the recursive reshare ↵ | friendica | 2014-10-06 | 1 | -0/+4 |
| | |/ / / | | | | | | | | | | | | | from hell. | ||||
| | * | | | found one bug trying to fetch the recursive reshare from hell. I still think ↵ | friendica | 2014-10-06 | 2 | -13/+13 |
| | | | | | | | | | | | | | | | | | there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing. | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |