aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrfzotlabs2017-03-302-7/+2
|\ \ \ | | |/ | |/|
| * | :lock: Add CSRF protection for import and import_items.Klaus Weidenbach2017-03-302-7/+2
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-292-4/+4
|\|
| * allow setting the system email name/address/replyzotlabs2017-03-291-0/+5
| * begin the process of using the relevant attach directory/path for photo album...zotlabs2017-03-291-3/+3
| * more markdown purificationzotlabs2017-03-291-2/+1
| * even more fine tuning of the markdown purifier - especially when used with th...zotlabs2017-03-291-1/+1
| * various input filter fixeszotlabs2017-03-291-1/+2
| * dim class was un-themedzotlabs2017-03-291-3/+3
| * remove the unimplemented upload limit site settingszotlabs2017-03-291-3/+0
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-284-30/+30
|\|
| * minor bs4 fixesMario Vavti2017-03-283-11/+11
| * fixes for latest bootstrapMario Vavti2017-03-281-19/+19
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-274-36/+26
|\|
| * fix app renderingMario Vavti2017-03-273-5/+4
| * unify css classesMario Vavti2017-03-271-8/+10
| * css fixesMario Vavti2017-03-271-25/+14
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-263-5/+5
|\|
| * fix app-icon color and use bs class for w100Mario Vavti2017-03-262-2/+2
| * fix nav menu caretMario Vavti2017-03-261-1/+1
| * fix and cleanup custom theme settingsMario Vavti2017-03-261-2/+2
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-25106-1165/+1171
|\|
| * fix active stateMario Vavti2017-03-242-3/+3
| * missing badge-default classMario Vavti2017-03-242-3/+3
| * do not return false here. it can lead to unresponsive links under certain sit...Mario Vavti2017-03-241-1/+1
| * fix viewconnectionsMario Vavti2017-03-231-12/+10
| * bs4 fixes for eventsMario Vavti2017-03-234-26/+33