Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-12 | 5 | -24/+31 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-12 | 4 | -20/+30 |
| |\ | |||||
| | * | Setup - .htconfig.php write access is now required for automated ↵ | zotlabs | 2018-03-11 | 1 | -8/+12 |
| | | | | | | | | | | | | installation. [String change - leave in dev for the next release] | ||||
| | * | remove debugging | zotlabs | 2018-03-10 | 1 | -2/+0 |
| | | | |||||
| | * | trim expects error ... in admin/site | zotlabs | 2018-03-10 | 3 | -13/+20 |
| | | | |||||
| * | | update mysql schema | Mario Vavti | 2018-03-11 | 1 | -3/+0 |
| | | | |||||
| * | | do not use trim on array | Mario Vavti | 2018-03-10 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed access_token request bug and returned oauth2-server-php library to ↵ | Andrew Manning | 2018-03-10 | 2 | -8/+9 |
| | | | | | | | | | | | | unmodified state. | ||||
* | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-10 | 24 | -211/+493 |
|\| | | |||||
| * | | update changelog | Mario Vavti | 2018-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | ||||
| * | | | remove redundant comma | Mario Vavti | 2018-03-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 | ||||
| * | | use dbunescbin() for cover photos | Mario | 2018-03-08 | 1 | -1/+1 |
| | | | |||||
| * | | fix syntax error in postgres update | Mario | 2018-03-08 | 1 | -3/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-08 | 6 | -3/+74 |
| |\| | |||||
| | * | remove extraneous logging | zotlabs | 2018-03-07 | 1 | -3/+1 |
| | | | |||||
| | * | hashtag autocomplete | zotlabs | 2018-03-07 | 2 | -1/+44 |
| | | | |||||
| | * | federated polls: GNU-Social requires us to preserve the original order of ↵ | zotlabs | 2018-03-07 | 4 | -2/+32 |
| | | | | | | | | | | | | the poll answers for use in making a vote, unlike diaspora (which selects by guid) and activitypub (which selects by non-localisable text). | ||||
| * | | we need the javascript in the template since strings are involved | Mario Vavti | 2018-03-07 | 6 | -162/+181 |
| | | | |||||
| * | | 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 | 2 | -8/+8 |
| |/ | |||||
| * | federated polls: add poll_author which will be necessary for Diaspora federation | zotlabs | 2018-03-06 | 4 | -1/+31 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-06 | 2 | -0/+144 |
| |\ | |||||
| | * | update changelog | Mario Vavti | 2018-03-06 | 1 | -0/+126 |
| | | | |||||
| | * | Merge pull request #991 from anaqreon/dev | git-marijus | 2018-03-06 | 1 | -0/+18 |
| | |\ | | | | | | | | | Improve rendering of Readme files in plugin settings | ||||
| | | * | Improve rendering of Readme files in plugin settings | Andrew Manning | 2018-03-05 | 1 | -0/+18 |
| | |/ | |||||
| * / | don't add pending connections to the default privacy group until accepted | zotlabs | 2018-03-06 | 1 | -7/+10 |
| |/ | |||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-05 | 12 | -1486/+1863 |
|\| | |||||
| * | 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 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-05 | 6 | -18/+54 |
| |\ | |||||
| | * | fix some issues with friend suggestions on standalone sites with no ↵ | zotlabs | 2018-03-04 | 4 | -9/+16 |
| | | | | | | | | | | | | 'suggestme' volunteers. This wrongly pulled up a site directory suggesting everybody on the site. While a better outcome than finding nobody, this does not fit with our ethical design goals. If there are no friends of friends, we will only suggest those who volunteer to be on the default suggestion list. Also do not attempt to load poco data from dead sites. | ||||
| | * | bugfix: unable to reset profile fields to defaults in admin/profs by ↵ | zotlabs | 2018-03-04 | 2 | -9/+31 |
| | | | | | | | | | | | | emptying the textarea | ||||
| | * | restrict mail messages to max_import_size | zotlabs | 2018-03-04 | 1 | -0/+7 |
| | | | |||||
| * | | Merge pull request #989 from phellmes/dev | git-marijus | 2018-03-05 | 2 | -1466/+1804 |
| |\ \ | | |/ | |/| | Update DE translation strings (for 3.2RC) | ||||
| | * | Update DE translation strings | phellmes | 2018-03-05 | 2 | -1466/+1804 |
| |/ | |||||
* | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-04 | 93 | -1686/+3030 |
|\| | |||||
| * | add dummy f= arg to suggestion urls, use directory version of suggest for ↵ | zotlabs | 2018-03-03 | 3 | -5/+5 |
| | | | | | | | | 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 | 2 | -0/+12 |
| | | | | | | | | profile creation and remains on that page until you go elsewhere and new members may need help to find their way out | ||||
| * | more work on federated polls | zotlabs | 2018-03-03 | 1 | -0/+30 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-02 | 6 | -1414/+1786 |
| |\ | |||||
| | * | 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 |
| | | | |