aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-198-9/+13
|\
| * add alt_pager to mod_moderate, remove legacy $a parameter from all ↵zotlabs2018-04-178-9/+13
| | | | | | | | occurrences of alt_pager
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-182-1/+8
|\|
| * public stream tag enhancementszotlabs2018-04-171-1/+7
| |
| * when changing cover photo, show existingzotlabs2018-04-171-0/+1
| |
* | fix closing parenthesis in wrong spotMario Vavti2018-04-171-2/+2
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-162-11/+6
|\
| * remove some more distinct in queries and observe any regressions. this is ↵Mario Vavti2018-04-162-7/+2
| | | | | | | | related to issue #1079 and commit d47ea20aa8bb8219f7a0760e81ba3db542392390
| * fix regression where in the starred tab only top level posts were visibleMario Vavti2018-04-151-4/+4
| |
* | don't save a permcat with empty namezotlabs2018-04-161-0/+5
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-112-2/+16
|\
| * allow to toggle visibility of likes/dislikes in notificationsMario Vavti2018-04-112-2/+16
| |
* | channel delegation: push current identity and pop it on logout from the ↵zotlabs2018-04-112-1/+8
|/ | | | delegated channel. This fixes the known issue of being forced to log back in after leaving the delegated channel.
* last commented expiration setting in adminzotlabs2018-04-101-0/+3
|
* Show "Unseen public activity" channel setting when site only public streams ↵Julian Schweinsberg2018-04-091-2/+3
| | | | are activated
* more intelligent handling of level 0 - and remove an extraneous logging functionzotlabs2018-04-081-2/+7
|
* more work merging techlevels and featureszotlabs2018-04-081-25/+32
|
* first cut of feature/techlevel mergezotlabs2018-04-081-4/+24
|
* extend ACzotlabs2018-04-082-1/+5
|
* hubzilla issue #1050 pubstream notifications visible when pubstream is notzotlabs2018-04-081-1/+2
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-081-1/+1
|\
| * we shouldn't need distinct here, since ids_to_querystr() will filter ↵zotlabs2018-04-071-1/+1
| | | | | | | | duplicates. It might have an effect on pager totals. Need to monitor for a few days.
* | rename button label in editpost from edit to submitMario Vavti2018-04-071-1/+1
| |
* | rename relation to relationship - issue #1044Mario Vavti2018-04-071-1/+1
| |
* | use Title instead of Caption - issue #1037Mario Vavti2018-04-071-3/+3
| |
* | Use Add Files/Photos instead of Upload to open the upload dialogMario Vavti2018-04-071-2/+2
|/
* bring back the dnt policy document, not sure when it was lostzotlabs2018-04-051-1/+4
|
* oauth2 client settings pagezotlabs2018-04-052-5/+166
|
* fix permalinks to children of articles and cardszotlabs2018-04-054-3/+6
|
* private forum mentionszotlabs2018-04-041-1/+1
|
* allow the profile recrods to be cloned separatelyzotlabs2018-04-041-1/+2
|
* disable the oauth2testvehicle completely until it is safezotlabs2018-04-031-1/+3
|
* get rid of dangerous test codezotlabs2018-04-031-68/+0
|
* OAuth2 integrationzotlabs2018-04-032-10/+10
|
* Merge branch 'master' into oauth2zotlabs2018-04-032-3/+7
|\
| * some more work on hubzilla issue #1019zotlabs2018-04-021-1/+5
| |
| * obscurify chatszotlabs2018-04-011-2/+2
| |
* | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2zotlabs2018-03-313-33/+280
|\ \ | |/ |/|
| * Merge branch 'dev' into oauth2Andrew Manning2018-03-3110-19/+34
| |\
| * \ Merge branch 'dev' into oauth2Andrew Manning2018-03-2720-97/+252
| |\ \
| * \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-123-20/+30
| |\ \ \
| * | | | Fixed access_token request bug and returned oauth2-server-php library to ↵Andrew Manning2018-03-101-7/+8
| | | | | | | | | | | | | | | | | | | | unmodified state.
| * | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-104-8/+47
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-053-11/+37
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-03-049-22/+51
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into oauth2Andrew Manning2018-02-282-2/+4
| |\ \ \ \ \ \ \
| * | | | | | | | Successful OAuth2 sequence demonstrated with the test vehicle, including an ↵Andrew Manning2018-02-262-65/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authenticated API call using an access_token.
| * | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-253-6/+31
| |\ \ \ \ \ \ \ \
| * | | | | | | | | An authorization token is received, but I had to modify the Request class in ↵Andrew Manning2018-02-253-15/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendor/bshaffer/oauth2-server-php/ to accept $_REQUEST instead of $_POST.
| * | | | | | | | | Merge branch 'dev' into oauth2Andrew Manning2018-02-249-10/+28
| |\ \ \ \ \ \ \ \ \