Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-16 | 2 | -11/+6 |
|\ | |||||
| * | remove some more distinct in queries and observe any regressions. this is ↵ | Mario Vavti | 2018-04-16 | 2 | -7/+2 |
| | | | | | | | | related to issue #1079 and commit d47ea20aa8bb8219f7a0760e81ba3db542392390 | ||||
| * | fix regression where in the starred tab only top level posts were visible | Mario Vavti | 2018-04-15 | 1 | -4/+4 |
| | | |||||
* | | don't save a permcat with empty name | zotlabs | 2018-04-16 | 1 | -0/+5 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-11 | 2 | -2/+16 |
|\ | |||||
| * | allow to toggle visibility of likes/dislikes in notifications | Mario Vavti | 2018-04-11 | 2 | -2/+16 |
| | | |||||
* | | channel delegation: push current identity and pop it on logout from the ↵ | zotlabs | 2018-04-11 | 2 | -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 admin | zotlabs | 2018-04-10 | 1 | -0/+3 |
| | |||||
* | Show "Unseen public activity" channel setting when site only public streams ↵ | Julian Schweinsberg | 2018-04-09 | 1 | -2/+3 |
| | | | | are activated | ||||
* | more intelligent handling of level 0 - and remove an extraneous logging function | zotlabs | 2018-04-08 | 1 | -2/+7 |
| | |||||
* | more work merging techlevels and features | zotlabs | 2018-04-08 | 1 | -25/+32 |
| | |||||
* | first cut of feature/techlevel merge | zotlabs | 2018-04-08 | 1 | -4/+24 |
| | |||||
* | extend AC | zotlabs | 2018-04-08 | 2 | -1/+5 |
| | |||||
* | hubzilla issue #1050 pubstream notifications visible when pubstream is not | zotlabs | 2018-04-08 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-08 | 1 | -1/+1 |
|\ | |||||
| * | we shouldn't need distinct here, since ids_to_querystr() will filter ↵ | zotlabs | 2018-04-07 | 1 | -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 submit | Mario Vavti | 2018-04-07 | 1 | -1/+1 |
| | | |||||
* | | rename relation to relationship - issue #1044 | Mario Vavti | 2018-04-07 | 1 | -1/+1 |
| | | |||||
* | | use Title instead of Caption - issue #1037 | Mario Vavti | 2018-04-07 | 1 | -3/+3 |
| | | |||||
* | | Use Add Files/Photos instead of Upload to open the upload dialog | Mario Vavti | 2018-04-07 | 1 | -2/+2 |
|/ | |||||
* | bring back the dnt policy document, not sure when it was lost | zotlabs | 2018-04-05 | 1 | -1/+4 |
| | |||||
* | oauth2 client settings page | zotlabs | 2018-04-05 | 2 | -5/+166 |
| | |||||
* | fix permalinks to children of articles and cards | zotlabs | 2018-04-05 | 4 | -3/+6 |
| | |||||
* | private forum mentions | zotlabs | 2018-04-04 | 1 | -1/+1 |
| | |||||
* | allow the profile recrods to be cloned separately | zotlabs | 2018-04-04 | 1 | -1/+2 |
| | |||||
* | disable the oauth2testvehicle completely until it is safe | zotlabs | 2018-04-03 | 1 | -1/+3 |
| | |||||
* | get rid of dangerous test code | zotlabs | 2018-04-03 | 1 | -68/+0 |
| | |||||
* | OAuth2 integration | zotlabs | 2018-04-03 | 2 | -10/+10 |
| | |||||
* | Merge branch 'master' into oauth2 | zotlabs | 2018-04-03 | 2 | -3/+7 |
|\ | |||||
| * | some more work on hubzilla issue #1019 | zotlabs | 2018-04-02 | 1 | -1/+5 |
| | | |||||
| * | obscurify chats | zotlabs | 2018-04-01 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2 | zotlabs | 2018-03-31 | 3 | -33/+280 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-31 | 10 | -19/+34 |
| |\ | |||||
| * \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-27 | 20 | -97/+252 |
| |\ \ | |||||
| * \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-12 | 3 | -20/+30 |
| |\ \ \ | |||||
| * | | | | Fixed access_token request bug and returned oauth2-server-php library to ↵ | Andrew Manning | 2018-03-10 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | unmodified state. | ||||
| * | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-10 | 4 | -8/+47 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-05 | 3 | -11/+37 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-04 | 9 | -22/+51 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-28 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Successful OAuth2 sequence demonstrated with the test vehicle, including an ↵ | Andrew Manning | 2018-02-26 | 2 | -65/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authenticated API call using an access_token. | ||||
| * | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-25 | 3 | -6/+31 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | An authorization token is received, but I had to modify the Request class in ↵ | Andrew Manning | 2018-02-25 | 3 | -15/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendor/bshaffer/oauth2-server-php/ to accept $_REQUEST instead of $_POST. | ||||
| * | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-24 | 9 | -10/+28 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add channel ID to user_id in clients table. Added TODO comments about ↵ | Andrew Manning | 2018-02-24 | 2 | -12/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic client registration protocol. | ||||
| * | | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-22 | 4 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | The authorization step with client registration and authorization code ↵ | Andrew Manning | 2018-02-22 | 2 | -35/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieval working. Might not conform perfectly to OAuth2 spec, but it is a start. | ||||
| * | | | | | | | | | | | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-20 | 3 | -52/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | OAuth2TestVehicle module can create and delete oauth2 database tables. | Andrew Manning | 2018-02-20 | 2 | -43/+107 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Created test vehicle module oauth2test | Andrew Manning | 2018-02-18 | 1 | -0/+43 |
| | | | | | | | | | | | | |