Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
| | | * | Updated Spanish translation (hmessages.po/php and register_verify_member.tpl). | Manuel Jiménez Friaza | 2018-03-01 | 3 | -1358/+1606 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-02 | 6 | -11/+54 |
| | |\ \ | |||||
| | * | | | update DB update 1205 to mitigate | Mario Vavti | 2018-03-02 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | ERROR 1069 (42000): Too many keys specified; max 64 keys allowed | ||||
| | * | | | bump version | Mario Vavti | 2018-03-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | db update to drop index resource_type. we have uid_resource_type now. | Mario Vavti | 2018-03-02 | 2 | -1/+25 |
| | | | | | |||||
| * | | | | string change "Channel added" -> "Connection added" | zotlabs | 2018-03-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | process follow from article menu in the background, do not reload page - ↵ | zotlabs | 2018-03-02 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | hubzilla issue #987 | ||||
| * | | | | sort settings/featured | zotlabs | 2018-03-02 | 2 | -3/+22 |
| | | | | | |||||
| * | | | | add icon to any addon settings blocks which don't already have one | zotlabs | 2018-03-02 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
| * | | | background work for caldav integration continued, modify mod_follow to allow ↵ | zotlabs | 2018-03-02 | 3 | -7/+48 |
| | | | | | | | | | | | | | | | | it to be called from ajax without redirecting. | ||||
| * | | | zot revision => 6.0a, not yet needed or referenced | zotlabs | 2018-03-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | add federation property to webfinger | zotlabs | 2018-03-01 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-01 | 14 | -236/+943 |
| |\| | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-03-01 | 6 | -60/+696 |
| | |\| | |||||
| | | * | Merge pull request #984 from dawnbreak/dev | git-marijus | 2018-03-01 | 4 | -30/+484 |
| | | |\ | | | | | | | | | | | Update composer autoload cache. | ||||
| | | | * | Update composer autoload cache. | Klaus Weidenbach | 2018-03-01 | 4 | -30/+484 |
| | | | | | |||||
| | | * | | Merge pull request #983 from dawnbreak/QA_testing | git-marijus | 2018-03-01 | 2 | -30/+212 |
| | | |\ \ | | | | |/ | | | |/| | :white_check_mark: Unit Test for HTTPSig. | ||||
| | | | * | :white_check_mark: Unit Test for HTTPSig. | Klaus Weidenbach | 2018-02-28 | 2 | -30/+212 |
| | | | | | |||||
| | * | | | fix issues with accordions in settings and comment out jquery.textinputs.js | Mario Vavti | 2018-03-01 | 6 | -20/+20 |
| | |/ / | |||||
| | * | | update strings | Mario Vavti | 2018-03-01 | 1 | -155/+226 |
| | | | | |||||
| | * | | version | Mario Vavti | 2018-03-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | sigh - missed two strings | zotlabs | 2018-03-01 | 1 | -2/+2 |
| |/ / | |||||
| * | | profile edit: empty dob is set to the date of the first profile save unless ↵ | zotlabs | 2018-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | you clear it first | ||||
| * | | several email validation issues | zotlabs | 2018-02-28 | 3 | -11/+12 |
| | | | |||||
| * | | Create one and only one 'registration successful, check your email' popup. | zotlabs | 2018-02-28 | 1 | -4/+2 |
| | | | |||||
| * | | hide newmember widget if a new account was used to create a clone of an old ↵ | zotlabs | 2018-02-28 | 1 | -0/+6 |
| | | | | | | | | | | | | channel | ||||
| * | | provide new member widget which sits beneath the notifications for the first ↵ | zotlabs | 2018-02-28 | 55 | -1/+147 |
| | | | | | | | | | | | | 60 days after an account creation. | ||||
| * | | important bugfix: if logged in locally and mod_display returns nothing owned ↵ | zotlabs | 2018-02-28 | 1 | -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 oauth2 | Andrew Manning | 2018-02-28 | 13 | -202/+305 |
|\| | |||||
| * | erge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-28 | 4 | -28/+58 |
| |\ | |||||
| | * | rename Addon/Feature settings to addon settings [string change] | zotlabs | 2018-02-27 | 2 | -2/+2 |
| | | | |||||
| | * | provide usage hint on addon settings page to save each panel before opening ↵ | zotlabs | 2018-02-27 | 2 | -0/+2 |
| | | | | | | | | | | | | another. [String change, not for 3.2] | ||||
| | * | move privacy groups to the newly created Access Control and Permissions tab. ↵ | zotlabs | 2018-02-27 | 1 | -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 ↵ | zotlabs | 2018-02-27 | 2 | -18/+45 |
| | | | | | | | | | | | | auto-enabling at various feature levels. This involves string changes and should *not* go into 3.2RC. | ||||
| * | | typo | Mario Vavti | 2018-02-28 | 1 | -1/+1 |
| | | | |||||
| * | | missed one index in the last update | Mario Vavti | 2018-02-28 | 3 | -1/+26 |
| | | | |||||
| * | | missed some string for translation - update strings | Mario Vavti | 2018-02-28 | 2 | -163/+175 |
| | | | |||||
| * | | bump version | Mario Vavti | 2018-02-27 | 1 | -1/+1 |
| |/ | |||||
| * | fix syntax error | Mario Vavti | 2018-02-27 | 1 | -1/+1 |
| | | |||||
| * | fix public stream app permission check to match the recent fixes to the Module | zotlabs | 2018-02-26 | 1 | -2/+7 |
| | | |||||
| * | change undo_post_tagging() to emit quoted tags rather than using underscore ↵ | zotlabs | 2018-02-26 | 1 | -2/+9 |
| | | | | | | | | replacement if they contain spaces. | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-26 | 810 | -140777/+4356 |
| |\ | |||||
| * | | update directory fallback servers | zotlabs | 2018-02-26 | 1 | -2/+0 |
| | | |