aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* 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-303-48/+22
|\|
| * more css fixesMario Vavti2017-03-302-1/+5
| * css fixesMario Vavti2017-03-302-47/+17
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-294-7/+15
|\|
| * css fixesMario Vavti2017-03-291-2/+11
| * 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-292-4/+4
| * remove the unimplemented upload limit site settingszotlabs2017-03-291-3/+0
| * namespace errorMario Vavti2017-03-291-1/+0
* | scaling issue with fa-th and fa-bars icons when using boostrap-red.css:37 #na...zotlabs2017-03-281-1/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-2811-41/+61
|\|
| * minor bs4 fixesMario Vavti2017-03-284-12/+12
| * some fixes for latest bs-devMario Vavti2017-03-284-2/+12
| * fixes for latest bootstrapMario Vavti2017-03-284-24/+30
| * update to latest bs-devMario Vavti2017-03-284-7/+7
| * links in wall-item-title must have white colour if the background is bg-primaryMario Vavti2017-03-281-0/+4
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-279-78/+40
|\|
| * adjust comment boxMario Vavti2017-03-271-2/+3
| * fix app renderingMario Vavti2017-03-274-8/+6
| * unify css classesMario Vavti2017-03-273-44/+16
| * css fixesMario Vavti2017-03-273-31/+22
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-268-204/+33
|\|
| * fix app-icon color and use bs class for w100Mario Vavti2017-03-263-6/+3
| * fix nav menu caretMario Vavti2017-03-262-5/+8
| * fix and cleanup custom theme settingsMario Vavti2017-03-266-180/+20
| * minor css cleanupMario Vavti2017-03-261-19/+8
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-25130-2100/+1529
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-03-252-3/+3
| |\
| | * fix active stateMario Vavti2017-03-242-3/+3
| * | fix full template navMario Vavti2017-03-251-1/+1
| |/
| * remove obsolete todoMario Vavti2017-03-241-2/+0
| * remove redundant cssMario Vavti2017-03-241-13/+0
| * fix some active and hover colorsMario Vavti2017-03-241-2/+15
| * missing badge-default classMario Vavti2017-03-242-3/+3
| * must be 1.35remMario Vavti2017-03-241-1/+1
| * restrict height of images in #banner to 1.5 remMario Vavti2017-03-241-0/+5
| * 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
| * fix spinner positionMario Vavti2017-03-231-5/+0
| * bs4 fixes for eventsMario Vavti2017-03-234-26/+33
| * bump versionsMario Vavti2017-03-231-2/+2
| * fix embed image modalsMario Vavti2017-03-224-29/+29
| * css fixesMario Vavti2017-03-223-54/+64
| * add generic-icons-nav classMario Vavti2017-03-211-1/+1