aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* 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 update (Monret)
| | * fr strings update (Monret)zotlabs2017-04-032-11080/+10559
| | |
| | * Revert "fr strings update (Monret)"zotlabs2017-04-032-10559/+11080
| | | | | | | | | | | | This reverts commit 4e4d406d23e01a6aa0992c94baea0fd676f04d1e.
| | * 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
| | |
* | | fix from downstreamzotlabs2017-04-071-1/+1
| | |
* | | revert grid and bars icon size changezotlabs2017-04-051-1/+1
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-04-054-10/+3
|\| |
| * | we should probably stick to 0.875rem font-size (this is equal to 14px with a ↵Mario Vavti2017-04-052-2/+2
| | | | | | | | | | | | default browser setting of 16px) to give 90% of the members a nice desktop experience. The font-awesome icons are only rendered clean with 14px (and multiples) fontsize. They look somewhat unfocused with 16px font-size. The font-size setting has moved to display setting -> custom theme settings. Set it to 1rem there to use the slightly taller default browser size.
| * | adjust font-sizeMario Vavti2017-04-051-1/+1
| | |
| * | update bd-dev and remove hotfixMario Vavti2017-04-051-7/+0
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-03-3113-59/+57
|\|
| * triple a is more saneMario Vavti2017-03-311-1/+1
| |
| * minor css adjustmentsMario Vavti2017-03-311-1/+5
| |
| * various form css fixesMario Vavti2017-03-3110-42/+38
| |
| * make btn-outline-secondary color slightly darkerMario Vavti2017-03-311-0/+4
| |
| * 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
| | |\ | | | | | | | | :lock: Add CSRF protection for import and import_items.
| * | | css fixesMario Vavti2017-03-313-17/+9
| |/ /
| * | add max height to #navbar-collapse-2Mario Vavti2017-03-312-0/+2
| | |
* | | 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 ↵zotlabs2017-03-291-3/+3
| | | | | | | | albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact
| * more markdown purificationzotlabs2017-03-291-2/+1
| |
| * even more fine tuning of the markdown purifier - especially when used with ↵zotlabs2017-03-291-1/+1
| | | | | | | | the wiki
| * 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 ↵zotlabs2017-03-281-1/+1
| | | | | | | | #navbar-collapse-1 i { font-size 1.0rem; }; FF 52.0.1 on Win7; 0.9rem and 1.1rem both render much better. 1.1 is a bit large so going with 0.9
* | 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
|\|