aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| | | * Updated Spanish translation (hmessages.po/php and register_verify_member.tpl).Manuel Jiménez Friaza2018-03-013-1358/+1606
| | | |
| | * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-026-11/+54
| | |\ \
| | * | | update DB update 1205 to mitigateMario Vavti2018-03-021-0/+11
| | | | | | | | | | | | | | | | | | | | ERROR 1069 (42000): Too many keys specified; max 64 keys allowed
| | * | | bump versionMario Vavti2018-03-021-1/+1
| | | | |
| | * | | db update to drop index resource_type. we have uid_resource_type now.Mario Vavti2018-03-022-1/+25
| | | | |
| * | | | string change "Channel added" -> "Connection added"zotlabs2018-03-021-1/+1
| | | | |
| * | | | process follow from article menu in the background, do not reload page - ↵zotlabs2018-03-022-3/+9
| | | | | | | | | | | | | | | | | | | | hubzilla issue #987
| * | | | sort settings/featuredzotlabs2018-03-022-3/+22
| | | | |
| * | | | add icon to any addon settings blocks which don't already have onezotlabs2018-03-021-0/+4
| | |/ / | |/| |
| * | | background work for caldav integration continued, modify mod_follow to allow ↵zotlabs2018-03-023-7/+48
| | | | | | | | | | | | | | | | it to be called from ajax without redirecting.
| * | | zot revision => 6.0a, not yet needed or referencedzotlabs2018-03-011-1/+1
| | | |
| * | | add federation property to webfingerzotlabs2018-03-011-1/+2
| | | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-0114-236/+943
| |\| |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-03-016-60/+696
| | |\|
| | | * Merge pull request #984 from dawnbreak/devgit-marijus2018-03-014-30/+484
| | | |\ | | | | | | | | | | Update composer autoload cache.
| | | | * Update composer autoload cache.Klaus Weidenbach2018-03-014-30/+484
| | | | |
| | | * | Merge pull request #983 from dawnbreak/QA_testinggit-marijus2018-03-012-30/+212
| | | |\ \ | | | | |/ | | | |/| :white_check_mark: Unit Test for HTTPSig.
| | | | * :white_check_mark: Unit Test for HTTPSig.Klaus Weidenbach2018-02-282-30/+212
| | | | |
| | * | | fix issues with accordions in settings and comment out jquery.textinputs.jsMario Vavti2018-03-016-20/+20
| | |/ /
| | * | update stringsMario Vavti2018-03-011-155/+226
| | | |
| | * | versionMario Vavti2018-03-011-1/+1
| | | |
| * | | sigh - missed two stringszotlabs2018-03-011-2/+2
| |/ /
| * | profile edit: empty dob is set to the date of the first profile save unless ↵zotlabs2018-02-281-1/+1
| | | | | | | | | | | | you clear it first
| * | several email validation issueszotlabs2018-02-283-11/+12
| | |
| * | Create one and only one 'registration successful, check your email' popup.zotlabs2018-02-281-4/+2
| | |
| * | hide newmember widget if a new account was used to create a clone of an old ↵zotlabs2018-02-281-0/+6
| | | | | | | | | | | | channel
| * | provide new member widget which sits beneath the notifications for the first ↵zotlabs2018-02-2855-1/+147
| | | | | | | | | | | | 60 days after an account creation.
| * | important bugfix: if logged in locally and mod_display returns nothing owned ↵zotlabs2018-02-281-2/+3
| |/ | | | | | | by your uid, retry with known public uids rather than issue 'permission denied'. Affects the ability to view search results for otherwise public posts 'in context'.
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-2813-202/+305
|\|
| * erge remote-tracking branch 'mike/master' into devMario Vavti2018-02-284-28/+58
| |\
| | * rename Addon/Feature settings to addon settings [string change]zotlabs2018-02-272-2/+2
| | |
| | * provide usage hint on addon settings page to save each panel before opening ↵zotlabs2018-02-272-0/+2
| | | | | | | | | | | | another. [String change, not for 3.2]
| | * move privacy groups to the newly created Access Control and Permissions tab. ↵zotlabs2018-02-271-8/+9
| | | | | | | | | | | | Not for 3.2 as it requires string changes from the prior checkin.
| | * move oauth_client management and guest access tokens to features rather than ↵zotlabs2018-02-272-18/+45
| | | | | | | | | | | | auto-enabling at various feature levels. This involves string changes and should *not* go into 3.2RC.
| * | typoMario Vavti2018-02-281-1/+1
| | |
| * | missed one index in the last updateMario Vavti2018-02-283-1/+26
| | |
| * | missed some string for translation - update stringsMario Vavti2018-02-282-163/+175
| | |
| * | bump versionMario Vavti2018-02-271-1/+1
| |/
| * fix syntax errorMario Vavti2018-02-271-1/+1
| |
| * fix public stream app permission check to match the recent fixes to the Modulezotlabs2018-02-261-2/+7
| |
| * change undo_post_tagging() to emit quoted tags rather than using underscore ↵zotlabs2018-02-261-2/+9
| | | | | | | | replacement if they contain spaces.
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-26810-140777/+4356
| |\
| * | update directory fallback serverszotlabs2018-02-261-2/+0
| | |