aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-06-073-18/+19
|\
| * class mixupgit-marijus2017-06-041-1/+1
| * rewrite wiki pages widget - no need for ajax on pageload, show the pages to n...git-marijus2017-06-032-17/+18
| * hubzilla issue #795zotlabs2017-05-271-1/+1
| * apporder style improvement and add to nav menu, also add language awareness t...zotlabs2017-05-232-2/+4
| * some issues with the app order template logiczotlabs2017-05-231-5/+6
| * apporder module and all the associated backend stuff to make it work; probabl...zotlabs2017-05-232-1/+13
* | move disapora xrd stuff to pluginzotlabs2017-05-302-7/+1
* | more deprecate server_rolezotlabs2017-05-292-6/+1
* | start deprecation of server_rolezotlabs2017-05-292-9/+3
* | 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-222-12/+12
|\|
| * some styling for system notificationsMario Vavti2017-05-182-12/+12
* | 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-103-3/+3
|\|
| * missing clearfixMario Vavti2017-05-103-3/+3
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-052-6/+30
|\|
| * collapse sysapps if viewing a remote channelMario Vavti2017-05-051-5/+29
| * css fixMario Vavti2017-05-051-1/+1
* | profile_sidebar hook ignored the updated html contentzotlabs2017-05-021-69/+0
* | Revert "move theme specific files to theme dir"zotlabs2017-05-02277-0/+12312
* | move theme specific files to theme dirzotlabs2017-05-01277-12312/+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-173-7/+7
|\|
| * missing clearfixMario Vavti2017-04-161-1/+1
| * :arrow_up: Update SimplePie library.Klaus Weidenbach2017-04-151-5/+5
| * missing includesMario Vavti2017-04-131-1/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-071-14/+6
|\|
| * 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
* | fix from downstreamzotlabs2017-04-071-1/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-3110-35/+29
|\|
| * various form css fixesMario Vavti2017-03-318-29/+26
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-312-7/+2
| |\
| | * Merge pull request #710 from dawnbreak/importcsrfgit-marijus2017-03-312-7/+2
| | |\
| * | | css fixesMario Vavti2017-03-311-6/+2
| |/ /
| * | add max height to #navbar-collapse-2Mario Vavti2017-03-311-0/+1