aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* hubzilla issue #795zotlabs2017-05-261-1/+1
* apporder style improvement and add to nav menu, also add language awareness t...zotlabs2017-05-222-2/+4
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-223-12/+18
|\
| * some styling for system notificationsMario Vavti2017-05-182-12/+12
| * css first aid for mod setupMario Vavti2017-05-171-0/+6
* | some issues with the app order template logiczotlabs2017-05-211-5/+6
* | apporder module and all the associated backend stuff to make it work; probabl...zotlabs2017-05-212-1/+13
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-161-6/+1
|\|
| * consolidate and simplify the generation of activitystreams persons, add a cou...zotlabs2017-05-111-6/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-105-11074/+10557
|\|
| * missing clearfixMario Vavti2017-05-103-3/+3
| * Update DE translation stringsphellmes2017-05-092-11071/+10554
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-093-545/+565
|\|
| * make all label boldMario Vavti2017-05-091-1/+1
| * Merge pull request #762 from mjfriaza/devgit-marijus2017-05-092-544/+564
| |\
| | * Updated the Spanish translationManuel Jiménez Friaza2017-05-082-544/+564
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-055-7/+54
|\| |
| * | collapse sysapps if viewing a remote channelMario Vavti2017-05-052-6/+31
| * | css hack to make remote channel menu header look in line with the rest if in ...Mario Vavti2017-05-051-0/+6
| * | css fixMario Vavti2017-05-051-1/+1
| * | German translations for demohubAndrew Manning2017-05-031-0/+16
* | | more cleanupzotlabs2017-05-021-0/+3
* | | profile_sidebar hook ignored the updated html contentzotlabs2017-05-021-69/+0
* | | Revert "move theme specific files to theme dir"zotlabs2017-05-02277-0/+0
* | | move theme specific files to theme dirzotlabs2017-05-01277-0/+0
* | | add cdav fileszotlabs2017-05-014-0/+998
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-261-0/+1
|\| |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-04-261-0/+1
| |\ \
| | * | When template "none" is used in a webpage layout, then the contents of the pa...Andrew Manning2017-04-231-0/+1
| * | | provide a broken feed for services which require a broken feedzotlabs2017-04-261-5/+2
| |/ /
* | | provide a broken feed for services which require a broken feedzotlabs2017-04-251-5/+2
* | | give the item_obscured flag a new lease on life by using it to designate thir...zotlabs2017-04-181-0/+3
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-187-7/+7
|\| |
| * | more lock caretsMario Vavti2017-04-184-4/+4
| * | the caret beside the lock seems a little overkillMario Vavti2017-04-183-3/+3
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-177-11230/+10653
|\| |
| * | missing clearfixMario Vavti2017-04-161-1/+1
| * | css fixesMario Vavti2017-04-161-4/+4
| * | :arrow_up: Update SimplePie library.Klaus Weidenbach2017-04-151-5/+5
| * | missing includesMario Vavti2017-04-131-1/+1
| * | bs font set might work better for win and macMario Vavti2017-04-131-1/+0
| * | Merge pull request #714 from mjfriaza/devgit-marijus2017-04-112-11218/+10642
| |\|
| | * Updated the Spanish translationManuel Jiménez Friaza2017-04-102-11218/+10642
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-073-11094/+10565
|\| |
| * | Merge pull request #712 from zotlabs/fr_updategit-marijus2017-04-072-11080/+10559
| |\ \
| | * | fr strings update (Monret)zotlabs2017-04-032-11080/+10559
| | * | Revert "fr strings update (Monret)"zotlabs2017-04-032-10559/+11080
| | * | fr strings update (Monret)zotlabs2017-04-032-11080/+10559
| * | | the string was there but the template var was wrongMario Vavti2017-04-071-1/+1
| * | | css fixes and missing stringMario Vavti2017-04-071-14/+6