Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-08 | 2 | -0/+53 |
|\ | |||||
| * | remove extraneous logging | zotlabs | 2018-03-07 | 1 | -3/+1 |
| | | |||||
| * | hashtag autocomplete | zotlabs | 2018-03-07 | 1 | -0/+29 |
| | | |||||
| * | federated polls: GNU-Social requires us to preserve the original order of ↵ | zotlabs | 2018-03-07 | 1 | -0/+26 |
| | | | | | | | | 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 | 2 | -0/+12 |
| | | |||||
* | | we do not support separate mobile themes anymore | Mario Vavti | 2018-03-07 | 1 | -7/+7 |
|/ | |||||
* | federated polls: add poll_author which will be necessary for Diaspora federation | zotlabs | 2018-03-06 | 1 | -0/+26 |
| | |||||
* | fix some issues with friend suggestions on standalone sites with no ↵ | zotlabs | 2018-03-04 | 2 | -2/+7 |
| | | | | '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 | 1 | -9/+30 |
| | | | | emptying the textarea | ||||
* | add dummy f= arg to suggestion urls, use directory version of suggest for ↵ | zotlabs | 2018-03-03 | 2 | -4/+4 |
| | | | | 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/+5 |
| | | | | 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 | 2 | -0/+35 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-02 | 3 | -7/+18 |
| |\ | |||||
| * | | 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 | ||||
| * | | db update to drop index resource_type. we have uid_resource_type now. | Mario Vavti | 2018-03-02 | 1 | -0/+24 |
| | | | |||||
* | | | string change "Channel added" -> "Connection added" | zotlabs | 2018-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | sort settings/featured | zotlabs | 2018-03-02 | 1 | -3/+16 |
| |/ |/| | |||||
* | | background work for caldav integration continued, modify mod_follow to allow ↵ | zotlabs | 2018-03-02 | 1 | -4/+14 |
| | | | | | | | | it to be called from ajax without redirecting. | ||||
* | | 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 | 1 | -30/+87 |
|\| | |||||
| * | Merge pull request #983 from dawnbreak/QA_testing | git-marijus | 2018-03-01 | 1 | -30/+87 |
| |\ | | | | | | | :white_check_mark: Unit Test for HTTPSig. | ||||
| | * | :white_check_mark: Unit Test for HTTPSig. | Klaus Weidenbach | 2018-02-28 | 1 | -30/+87 |
| | | | |||||
* | | | sigh - missed two strings | zotlabs | 2018-03-01 | 1 | -2/+2 |
|/ / | |||||
* | | several email validation issues | zotlabs | 2018-02-28 | 1 | -5/+6 |
| | | |||||
* | | 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 | 2 | -1/+78 |
| | | | | | | | | 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'. | ||||
* | erge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-28 | 2 | -4/+5 |
|\ | |||||
| * | 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 | 1 | -0/+1 |
| | | | | | | | | another. [String change, not for 3.2] | ||||
| * | move oauth_client management and guest access tokens to features rather than ↵ | zotlabs | 2018-02-27 | 1 | -2/+2 |
| | | | | | | | | 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 | 1 | -0/+24 |
| | | |||||
* | | missed some string for translation - update strings | Mario Vavti | 2018-02-28 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-26 | 5 | -9/+51 |
|\ | |||||
| * | fix icon position and make string translatable | Mario Vavti | 2018-02-26 | 1 | -3/+6 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-26 | 1 | -1/+10 |
| |\ | |||||
| * | | another DB upgrade to address some long running maintenance queries | Mario Vavti | 2018-02-26 | 1 | -0/+27 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-25 | 1 | -3/+16 |
| |\ \ | |||||
| * | | | do not overwrite abook flags if we are not owner | Mario Vavti | 2018-02-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | mark connections where we do not have post_comments permissions with an no ↵ | Mario Vavti | 2018-02-24 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | entry sign. | ||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-24 | 8 | -10/+25 |
| |\ \ \ | |||||
| * | | | | fix issues with DB update 1204 | Mario Vavti | 2018-02-23 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | require directory servers to be using some modern form of encryption; which ↵ | zotlabs | 2018-02-26 | 1 | -1/+2 |
| |_|_|/ |/| | | | | | | | | | | | means we only currently have 2. | ||||
* | | | | provide opt-out link and text with notification emails | zotlabs | 2018-02-25 | 1 | -1/+10 |
| |_|/ |/| | | |||||
* | | | make the profile photo image picker work correctly with multiple profiles. | zotlabs | 2018-02-24 | 1 | -3/+16 |
| |/ |/| | |||||
* | | open_pubstream logic was messy and wrong | zotlabs | 2018-02-23 | 1 | -1/+7 |
| | | |||||
* | | style the 'use existing' button a wee bit | zotlabs | 2018-02-23 | 2 | -2/+2 |
| | | |||||
* | | use embed photos javascript widget to select existing photos for profile and ↵ | zotlabs | 2018-02-23 | 4 | -7/+15 |
| | | | | | | | | cover photos |