Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-12 | 1 | -1/+1 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-12 | 1 | -1/+1 |
| |\ | |||||
| | * | trim expects error ... in admin/site | zotlabs | 2018-03-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-10 | 12 | -191/+245 |
|\| | | |||||
| * | | Merge pull request #994 from Reylak/dev | git-marijus | 2018-03-09 | 1 | -15/+30 |
| |\ \ | | | | | | | | | RedBasic theme dark schema update | ||||
| | * | | Uniformize title input with other input fields | Mathieu "Matbac" Bacou | 2018-03-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Add rounded corners to mimic categories input field and main text area. | ||||
| | * | | Remove useless background spec for category field | Mathieu "Matbac" Bacou | 2018-03-08 | 1 | -1/+0 |
| | | | | |||||
| | * | | Fix background of tags field | Mathieu "Matbac" Bacou | 2018-03-08 | 1 | -15/+23 |
| | | | | |||||
| | * | | Fix code background in wiki pages | Mathieu "Thrar" Bacou | 2018-03-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Fix needed after commit c444e40c016c0faaec604335093b19661b3585b7 | ||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-09 | 2 | -2/+2 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | notifications-btn-1 does not actually require the text-white class and this ↵ | zotlabs | 2018-03-08 | 2 | -2/+2 |
| | | | | | | | | | | | | is known to cause issues on dark themes | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-08 | 1 | -1/+15 |
| |\| | |||||
| | * | hashtag autocomplete | zotlabs | 2018-03-07 | 1 | -1/+15 |
| | | | |||||
| * | | we need the javascript in the template since strings are involved | Mario Vavti | 2018-03-07 | 4 | -162/+169 |
| | | | |||||
| * | | more bootstrap accordion fixes | Mario Vavti | 2018-03-07 | 2 | -10/+10 |
| | | | |||||
| * | | we do not support separate mobile themes anymore | Mario Vavti | 2018-03-07 | 1 | -1/+1 |
| |/ | |||||
| * | Improve rendering of Readme files in plugin settings | Andrew Manning | 2018-03-05 | 1 | -0/+18 |
| | | |||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-05 | 6 | -1468/+1809 |
|\| | |||||
| * | add pdl file for mod moderate | Mario Vavti | 2018-03-05 | 1 | -0/+4 |
| | | |||||
| * | fix javascript error if there are no notifications | Mario Vavti | 2018-03-05 | 1 | -2/+1 |
| | | |||||
| * | update redbasic theme screenshot | Mario Vavti | 2018-03-05 | 2 | -0/+0 |
| | | |||||
| * | Update DE translation strings | phellmes | 2018-03-05 | 2 | -1466/+1804 |
| | | |||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-04 | 66 | -1438/+1860 |
|\| | |||||
| * | add dummy f= arg to suggestion urls, use directory version of suggest for ↵ | zotlabs | 2018-03-03 | 1 | -1/+1 |
| | | | | | | | | newmember link instead of the suggest module as the UI is prettier. | ||||
| * | There was no pdl for mod_thing; add one because it's only a link away from ↵ | zotlabs | 2018-03-03 | 1 | -0/+7 |
| | | | | | | | | profile creation and remains on that page until you go elsewhere and new members may need help to find their way out | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-02 | 3 | -1412/+1748 |
| |\ | |||||
| | * | Merge pull request #985 from mjfriaza/dev | git-marijus | 2018-03-02 | 3 | -1412/+1748 |
| | |\ | | | | | | | | | Updated Spanish translation (hmessages.po/php and register_verify_member.tpl). | ||||
| | | * | New strings for Spanish translation. | Manuel Jiménez Friaza | 2018-03-02 | 2 | -169/+257 |
| | | | | |||||
| | | * | Updated Spanish translation (hmessages.po/php and register_verify_member.tpl). | Manuel Jiménez Friaza | 2018-03-01 | 3 | -1358/+1606 |
| | | | | |||||
| * | | | process follow from article menu in the background, do not reload page - ↵ | zotlabs | 2018-03-02 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | hubzilla issue #987 | ||||
| * | | | add icon to any addon settings blocks which don't already have one | zotlabs | 2018-03-02 | 1 | -0/+4 |
| |/ / | |||||
| * / | fix issues with accordions in settings and comment out jquery.textinputs.js | Mario Vavti | 2018-03-01 | 6 | -20/+20 |
| |/ | |||||
| * | several email validation issues | zotlabs | 2018-02-28 | 1 | -5/+5 |
| | | |||||
| * | provide new member widget which sits beneath the notifications for the first ↵ | zotlabs | 2018-02-28 | 53 | -0/+69 |
| | | | | | | | | 60 days after an account creation. | ||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-28 | 1 | -0/+1 |
|\| | |||||
| * | provide usage hint on addon settings page to save each panel before opening ↵ | zotlabs | 2018-02-27 | 1 | -0/+1 |
| | | | | | | | | another. [String change, not for 3.2] | ||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-26 | 17 | -110/+79 |
|\| | |||||
| * | fix icon position and make string translatable | Mario Vavti | 2018-02-26 | 2 | -6/+15 |
| | | |||||
| * | missing clearfix | Mario Vavti | 2018-02-26 | 1 | -1/+1 |
| | | |||||
| * | fix minor issue with custom acl selector | Mario Vavti | 2018-02-26 | 3 | -2/+4 |
| | | |||||
| * | slightly improve custom acl selector | Mario Vavti | 2018-02-26 | 3 | -13/+6 |
| | | |||||
| * | change fontname in css and fix issue with unicode characters | Mario Vavti | 2018-02-26 | 5 | -14/+6 |
| | | |||||
| * | switch to fork-awesome | Mario Vavti | 2018-02-26 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-26 | 9 | -76/+49 |
| |\ | |||||
| | * | provide opt-out link and text with notification emails | zotlabs | 2018-02-25 | 2 | -0/+4 |
| | | | |||||
| | * | hubzilla issue #979 - alter image selection widget to accept/submit on ↵ | zotlabs | 2018-02-25 | 7 | -76/+45 |
| | | | | | | | | | | | | choose (jot, wiki, cover_photo, profile_photo) | ||||
* | | | Successful OAuth2 sequence demonstrated with the test vehicle, including an ↵ | Andrew Manning | 2018-02-26 | 1 | -4/+12 |
| | | | | | | | | | | | | authenticated API call using an access_token. | ||||
* | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-25 | 9 | -5/+39 |
|\| | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-25 | 2 | -2/+4 |
| |\| | |||||
| | * | make the profile photo image picker work correctly with multiple profiles. | zotlabs | 2018-02-24 | 2 | -2/+4 |
| | | |