| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-10 | 5 | -11074/+10557 |
|\ |
|
| * | missing clearfix | Mario Vavti | 2017-05-10 | 3 | -3/+3 |
| * | Update DE translation strings | phellmes | 2017-05-09 | 2 | -11071/+10554 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-09 | 3 | -545/+565 |
|\| |
|
| * | make all label bold | Mario Vavti | 2017-05-09 | 1 | -1/+1 |
| * | Merge pull request #762 from mjfriaza/dev | git-marijus | 2017-05-09 | 2 | -544/+564 |
| |\ |
|
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-05-08 | 2 | -544/+564 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 5 | -7/+54 |
|\| | |
|
| * | | collapse sysapps if viewing a remote channel | Mario Vavti | 2017-05-05 | 2 | -6/+31 |
| * | | css hack to make remote channel menu header look in line with the rest if in ... | Mario Vavti | 2017-05-05 | 1 | -0/+6 |
| * | | css fix | Mario Vavti | 2017-05-05 | 1 | -1/+1 |
| * | | German translations for demohub | Andrew Manning | 2017-05-03 | 1 | -0/+16 |
* | | | more cleanup | zotlabs | 2017-05-02 | 1 | -0/+3 |
* | | | profile_sidebar hook ignored the updated html content | zotlabs | 2017-05-02 | 1 | -69/+0 |
* | | | Revert "move theme specific files to theme dir" | zotlabs | 2017-05-02 | 277 | -0/+0 |
* | | | move theme specific files to theme dir | zotlabs | 2017-05-01 | 277 | -0/+0 |
* | | | add cdav files | zotlabs | 2017-05-01 | 4 | -0/+998 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-26 | 1 | -0/+1 |
|\| | |
|
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-26 | 1 | -0/+1 |
| |\ \ |
|
| | * | | When template "none" is used in a webpage layout, then the contents of the pa... | Andrew Manning | 2017-04-23 | 1 | -0/+1 |
| * | | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-26 | 1 | -5/+2 |
| |/ / |
|
* | | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-25 | 1 | -5/+2 |
* | | | give the item_obscured flag a new lease on life by using it to designate thir... | zotlabs | 2017-04-18 | 1 | -0/+3 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-18 | 7 | -7/+7 |
|\| | |
|
| * | | more lock carets | Mario Vavti | 2017-04-18 | 4 | -4/+4 |
| * | | the caret beside the lock seems a little overkill | Mario Vavti | 2017-04-18 | 3 | -3/+3 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-17 | 7 | -11230/+10653 |
|\| | |
|
| * | | missing clearfix | Mario Vavti | 2017-04-16 | 1 | -1/+1 |
| * | | css fixes | Mario Vavti | 2017-04-16 | 1 | -4/+4 |
| * | | :arrow_up: Update SimplePie library. | Klaus Weidenbach | 2017-04-15 | 1 | -5/+5 |
| * | | missing includes | Mario Vavti | 2017-04-13 | 1 | -1/+1 |
| * | | bs font set might work better for win and mac | Mario Vavti | 2017-04-13 | 1 | -1/+0 |
| * | | Merge pull request #714 from mjfriaza/dev | git-marijus | 2017-04-11 | 2 | -11218/+10642 |
| |\| |
|
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-04-10 | 2 | -11218/+10642 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-07 | 3 | -11094/+10565 |
|\| | |
|
| * | | Merge pull request #712 from zotlabs/fr_update | git-marijus | 2017-04-07 | 2 | -11080/+10559 |
| |\ \ |
|
| | * | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 |
| | * | | Revert "fr strings update (Monret)" | zotlabs | 2017-04-03 | 2 | -10559/+11080 |
| | * | | fr strings update (Monret) | zotlabs | 2017-04-03 | 2 | -11080/+10559 |
| * | | | the string was there but the template var was wrong | Mario Vavti | 2017-04-07 | 1 | -1/+1 |
| * | | | css fixes and missing string | Mario Vavti | 2017-04-07 | 1 | -14/+6 |
* | | | | fix from downstream | zotlabs | 2017-04-07 | 1 | -1/+1 |
* | | | | revert grid and bars icon size change | zotlabs | 2017-04-05 | 1 | -1/+1 |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-05 | 4 | -10/+3 |
|\| | | |
|
| * | | | we should probably stick to 0.875rem font-size (this is equal to 14px with a ... | Mario Vavti | 2017-04-05 | 2 | -2/+2 |
| * | | | adjust font-size | Mario Vavti | 2017-04-05 | 1 | -1/+1 |
| * | | | update bd-dev and remove hotfix | Mario Vavti | 2017-04-05 | 1 | -7/+0 |
| |/ / |
|
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-31 | 13 | -59/+57 |
|\| | |
|
| * | | triple a is more sane | Mario Vavti | 2017-03-31 | 1 | -1/+1 |
| * | | minor css adjustments | Mario Vavti | 2017-03-31 | 1 | -1/+5 |