aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-125-24/+31
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-124-20/+30
| |\
| | * Setup - .htconfig.php write access is now required for automated ↵zotlabs2018-03-111-8/+12
| | | | | | | | | | | | installation. [String change - leave in dev for the next release]
| | * remove debuggingzotlabs2018-03-101-2/+0
| | |
| | * trim expects error ... in admin/sitezotlabs2018-03-103-13/+20
| | |
| * | update mysql schemaMario Vavti2018-03-111-3/+0
| | |
| * | do not use trim on arrayMario Vavti2018-03-101-1/+1
| | |
* | | Fixed access_token request bug and returned oauth2-server-php library to ↵Andrew Manning2018-03-102-8/+9
| | | | | | | | | | | | unmodified state.
* | | Merge branch 'dev' into oauth2Andrew Manning2018-03-1024-211/+493
|\| |
| * | update changelogMario Vavti2018-03-091-1/+1
| | |
| * | Merge pull request #994 from Reylak/devgit-marijus2018-03-091-15/+30
| |\ \ | | | | | | | | RedBasic theme dark schema update
| | * | Uniformize title input with other input fieldsMathieu "Matbac" Bacou2018-03-081-0/+4
| | | | | | | | | | | | | | | | Add rounded corners to mimic categories input field and main text area.
| | * | 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
| | | | | | | | | | | | | | | | Fix needed after commit c444e40c016c0faaec604335093b19661b3585b7
| * | | remove redundant commaMario Vavti2018-03-091-1/+1
| | | |
| * | | 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 ↵zotlabs2018-03-082-2/+2
| | | | | | | | | | | | is known to cause issues on dark themes
| * | use dbunescbin() for cover photosMario2018-03-081-1/+1
| | |
| * | fix syntax error in postgres updateMario2018-03-081-3/+3
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-086-3/+74
| |\|
| | * remove extraneous loggingzotlabs2018-03-071-3/+1
| | |
| | * hashtag autocompletezotlabs2018-03-072-1/+44
| | |
| | * federated polls: GNU-Social requires us to preserve the original order of ↵zotlabs2018-03-074-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 involvedMario Vavti2018-03-076-162/+181
| | |
| * | more bootstrap accordion fixesMario Vavti2018-03-072-10/+10
| | |
| * | we do not support separate mobile themes anymoreMario Vavti2018-03-072-8/+8
| |/
| * federated polls: add poll_author which will be necessary for Diaspora federationzotlabs2018-03-064-1/+31
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-062-0/+144
| |\
| | * update changelogMario Vavti2018-03-061-0/+126
| | |
| | * Merge pull request #991 from anaqreon/devgit-marijus2018-03-061-0/+18
| | |\ | | | | | | | | Improve rendering of Readme files in plugin settings
| | | * Improve rendering of Readme files in plugin settingsAndrew Manning2018-03-051-0/+18
| | |/
| * / don't add pending connections to the default privacy group until acceptedzotlabs2018-03-061-7/+10
| |/
* | Merge branch 'dev' into oauth2Andrew Manning2018-03-0512-1486/+1863
|\|
| * 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
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-056-18/+54
| |\
| | * fix some issues with friend suggestions on standalone sites with no ↵zotlabs2018-03-044-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 ↵zotlabs2018-03-042-9/+31
| | | | | | | | | | | | emptying the textarea
| | * restrict mail messages to max_import_sizezotlabs2018-03-041-0/+7
| | |
| * | Merge pull request #989 from phellmes/devgit-marijus2018-03-052-1466/+1804
| |\ \ | | |/ | |/| Update DE translation strings (for 3.2RC)
| | * Update DE translation stringsphellmes2018-03-052-1466/+1804
| |/
* | Merge branch 'dev' into oauth2Andrew Manning2018-03-0493-1686/+3030
|\|
| * add dummy f= arg to suggestion urls, use directory version of suggest for ↵zotlabs2018-03-033-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 ↵zotlabs2018-03-032-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 pollszotlabs2018-03-031-0/+30
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-026-1414/+1786
| |\
| | * Merge pull request #985 from mjfriaza/devgit-marijus2018-03-023-1412/+1748
| | |\ | | | | | | | | Updated Spanish translation (hmessages.po/php and register_verify_member.tpl).
| | | * New strings for Spanish translation.Manuel Jiménez Friaza2018-03-022-169/+257
| | | |