aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
| * | | 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
| | |\ \
| * | | | 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 album...zotlabs2017-03-291-3/+3
| * | more markdown purificationzotlabs2017-03-291-2/+1