aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-121-1/+1
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-121-1/+1
| |\
| | * trim expects error ... in admin/sitezotlabs2018-03-101-1/+1
* | | Merge branch 'dev' into oauth2Andrew Manning2018-03-1012-191/+245
|\| |
| * | Merge pull request #994 from Reylak/devgit-marijus2018-03-091-15/+30
| |\ \
| | * | Uniformize title input with other input fieldsMathieu "Matbac" Bacou2018-03-081-0/+4
| | * | Remove useless background spec for category fieldMathieu "Matbac" Bacou2018-03-081-1/+0
| | * | Fix background of tags fieldMathieu "Matbac" Bacou2018-03-081-15/+23
| | * | Fix code background in wiki pagesMathieu "Thrar" Bacou2018-03-081-0/+4
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-092-2/+2
| |\ \ \ | | |/ / | |/| / | | |/
| | * notifications-btn-1 does not actually require the text-white class and this i...zotlabs2018-03-082-2/+2
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-081-1/+15
| |\|
| | * hashtag autocompletezotlabs2018-03-071-1/+15
| * | we need the javascript in the template since strings are involvedMario Vavti2018-03-074-162/+169
| * | more bootstrap accordion fixesMario Vavti2018-03-072-10/+10
| * | we do not support separate mobile themes anymoreMario Vavti2018-03-071-1/+1
| |/
| * Improve rendering of Readme files in plugin settingsAndrew Manning2018-03-051-0/+18
* | Merge branch 'dev' into oauth2Andrew Manning2018-03-056-1468/+1809
|\|
| * add pdl file for mod moderateMario Vavti2018-03-051-0/+4
| * fix javascript error if there are no notificationsMario Vavti2018-03-051-2/+1
| * update redbasic theme screenshotMario Vavti2018-03-052-0/+0
| * Update DE translation stringsphellmes2018-03-052-1466/+1804
* | Merge branch 'dev' into oauth2Andrew Manning2018-03-0466-1438/+1860
|\|
| * add dummy f= arg to suggestion urls, use directory version of suggest for new...zotlabs2018-03-031-1/+1
| * There was no pdl for mod_thing; add one because it's only a link away from pr...zotlabs2018-03-031-0/+7
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-023-1412/+1748
| |\
| | * Merge pull request #985 from mjfriaza/devgit-marijus2018-03-023-1412/+1748
| | |\
| | | * New strings for Spanish translation.Manuel Jiménez Friaza2018-03-022-169/+257
| | | * Updated Spanish translation (hmessages.po/php and register_verify_member.tpl).Manuel Jiménez Friaza2018-03-013-1358/+1606
| * | | process follow from article menu in the background, do not reload page - hubz...zotlabs2018-03-021-0/+6
| * | | add icon to any addon settings blocks which don't already have onezotlabs2018-03-021-0/+4
| |/ /
| * / fix issues with accordions in settings and comment out jquery.textinputs.jsMario Vavti2018-03-016-20/+20
| |/
| * several email validation issueszotlabs2018-02-281-5/+5
| * provide new member widget which sits beneath the notifications for the first ...zotlabs2018-02-2853-0/+69
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-281-0/+1
|\|
| * provide usage hint on addon settings page to save each panel before opening a...zotlabs2018-02-271-0/+1
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-2617-110/+79
|\|
| * fix icon position and make string translatableMario Vavti2018-02-262-6/+15
| * missing clearfixMario Vavti2018-02-261-1/+1
| * fix minor issue with custom acl selectorMario Vavti2018-02-263-2/+4
| * slightly improve custom acl selectorMario Vavti2018-02-263-13/+6
| * change fontname in css and fix issue with unicode charactersMario Vavti2018-02-265-14/+6
| * switch to fork-awesomeMario Vavti2018-02-261-1/+1
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-269-76/+49
| |\
| | * provide opt-out link and text with notification emailszotlabs2018-02-252-0/+4
| | * hubzilla issue #979 - alter image selection widget to accept/submit on choose...zotlabs2018-02-257-76/+45
* | | Successful OAuth2 sequence demonstrated with the test vehicle, including an a...Andrew Manning2018-02-261-4/+12
* | | Merge branch 'dev' into oauth2Andrew Manning2018-02-259-5/+39
|\| |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-252-2/+4
| |\|
| | * make the profile photo image picker work correctly with multiple profiles.zotlabs2018-02-242-2/+4