Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-11 | 3 | -4/+19 | |
|\ | ||||||
| * | allow to toggle visibility of likes/dislikes in notifications | Mario Vavti | 2018-04-11 | 3 | -4/+19 | |
| | | ||||||
* | | 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 | 2 | -3/+7 | |
| | ||||||
* | add commented_days parameter to item_expire(), default 7. Both expire_days ↵ | zotlabs | 2018-04-09 | 1 | -6/+3 | |
| | | | | and commented_days have to be exceeded to expire. | |||||
* | Create catcloud widget and provide a type option which can include 'cards' ↵ | zotlabs | 2018-04-09 | 1 | -0/+46 | |
| | | | | or 'articles' | |||||
* | Show "Unseen public activity" channel setting when site only public streams ↵ | Julian Schweinsberg | 2018-04-09 | 1 | -2/+3 | |
| | | | | are activated | |||||
* | Modified notifications widget to add the public stream when the current user ↵ | Julian Schweinsberg | 2018-04-09 | 1 | -1/+1 | |
| | | | | is allowed to see it only | |||||
* | Merge pull request #1051 from anaqreon/auto-save | git-marijus | 2018-04-09 | 1 | -1/+4 | |
|\ | | | | | Auto-save comment and post text | |||||
| * | Added feature setting for auto-save, defaulting to enabled. | Andrew Manning | 2018-04-08 | 1 | -1/+4 | |
| | | ||||||
| * | removed Autosavetext.php file since it is not used with localStorage | Andrew Manning | 2018-04-08 | 1 | -37/+0 | |
| | | ||||||
| * | Merge branch 'dev' into auto-save | Andrew Manning | 2018-04-08 | 1 | -1/+1 | |
| |\ | ||||||
| * | | Auto-save post and comment entry using localStorage in browser. | Andrew Manning | 2018-04-08 | 1 | -4/+0 | |
| | | | ||||||
| * | | Merge branch 'dev' into auto-save | Andrew Manning | 2018-04-07 | 12 | -20/+196 | |
| |\ \ | ||||||
| * | | | Post body and title are auto-saved | Andrew Manning | 2018-04-04 | 2 | -0/+41 | |
| | | | | ||||||
* | | | | 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 | 2 | -3/+3 | |
|/ / | ||||||
* | | 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 | 3 | -6/+175 | |
| | | ||||||
* | | 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 | 3 | -10/+88 | |
| | ||||||
* | Merge branch 'master' into oauth2 | zotlabs | 2018-04-03 | 3 | -4/+8 | |
|\ | ||||||
| * | some more work on hubzilla issue #1019 | zotlabs | 2018-04-02 | 1 | -1/+5 | |
| | | ||||||
| * | obscurify chats | zotlabs | 2018-04-01 | 2 | -3/+3 | |
| | | ||||||
* | | Merge branch 'oauth2' of https://github.com/anaqreon/hubzilla into oauth2 | zotlabs | 2018-03-31 | 4 | -33/+290 | |
|\ \ | |/ |/| | ||||||
| * | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-31 | 11 | -30/+35 | |
| |\ | ||||||
| * \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-27 | 25 | -107/+307 | |
| |\ \ | ||||||
| * \ \ | 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 | 7 | -11/+102 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-05 | 3 | -11/+37 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-03-04 | 13 | -52/+256 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-28 | 5 | -8/+34 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' into oauth2 | Andrew Manning | 2018-02-26 | 3 | -4/+43 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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. |