Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-28 | 1 | -1/+0 |
| | |||||
* | Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into ↵ | redmatrix | 2016-07-28 | 18 | -218/+644 |
| | | | | | | | 1.10RC_merge" This reverts commit 35f17acb388f68745068d6a60e12c7b777b92282, reversing changes made to 58cf5f310d89026fb526e201c301075725044e48. | ||||
* | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-28 | 18 | -644/+218 |
|\ | |||||
| * | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-27 | 1 | -1/+0 |
| | | |||||
| * | fix italian strings (messed up by rtl variable); and finish removing openid ↵ | redmatrix | 2016-07-27 | 1 | -12/+0 |
| | | | | | | | | from core | ||||
| * | add the hidden flag also | redmatrix | 2016-07-27 | 1 | -1/+2 |
| | | |||||
| * | don't include deleted or orphaned xchans in ratings search | redmatrix | 2016-07-26 | 1 | -1/+2 |
| | | |||||
| * | move openid to addon | redmatrix | 2016-07-25 | 2 | -517/+0 |
| | | |||||
| * | make drag/drop work with acl, which bypassed the form | redmatrix | 2016-07-24 | 1 | -0/+2 |
| | | |||||
| * | add acl selection to files upload via /cloud (still missing from directory ↵ | redmatrix | 2016-07-24 | 1 | -0/+38 |
| | | | | | | | | creation) | ||||
| * | string update and some minor comment edits | redmatrix | 2016-07-24 | 1 | -2/+2 |
| | | |||||
| * | more work on #453 | redmatrix | 2016-07-21 | 1 | -16/+15 |
| | | |||||
| * | issue #453 and a bug noted from the logfiles related to the schema change ↵ | redmatrix | 2016-07-20 | 1 | -1/+3 |
| | | | | | | | | last month | ||||
| * | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 6 | -85/+14 |
| |\ | |||||
| | * | sort out some of the authentication mess - with luck this may fix the DAV ↵ | redmatrix | 2016-07-20 | 6 | -85/+14 |
| | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for. | ||||
| * | | Merge branch 'dev' into perms | redmatrix | 2016-07-20 | 1 | -1/+2 |
| |\| | |||||
| * | | fix the forum detection in include/zot | redmatrix | 2016-07-19 | 1 | -2/+2 |
| | | | |||||
| * | | permission fixes | redmatrix | 2016-07-19 | 2 | -5/+7 |
| | | | |||||
| * | | translate more old perms calls | redmatrix | 2016-07-19 | 2 | -3/+3 |
| | | | |||||
| * | | more perms work (a lot more) | redmatrix | 2016-07-18 | 2 | -30/+38 |
| | | | |||||
| * | | more perms work | redmatrix | 2016-07-18 | 1 | -0/+9 |
| | | | |||||
| * | | Merge branch 'dev' into perms | redmatrix | 2016-07-17 | 7 | -4/+180 |
| |\ \ | |||||
| * | | | more perms work | redmatrix | 2016-07-13 | 2 | -8/+14 |
| | | | | |||||
| * | | | deprecate/remove json_decode_plus | redmatrix | 2016-07-13 | 2 | -4/+4 |
| | | | | |||||
| * | | | lots more permission work | redmatrix | 2016-07-13 | 3 | -21/+42 |
| | | | | |||||
| * | | | Merge branch 'dev' into perms | redmatrix | 2016-07-13 | 2 | -26/+60 |
| |\ \ \ | |||||
| * | | | | more work on perms | redmatrix | 2016-07-12 | 3 | -18/+10 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-12 | 9 | -22/+10 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into perms | redmatrix | 2016-07-11 | 5 | -36/+15 |
| |\ \ \ \ \ | |||||
| * | | | | | | more perms work - notably the stuff in public_perms | redmatrix | 2016-07-11 | 1 | -7/+13 |
| | | | | | | | |||||
| * | | | | | | more permissions work | redmatrix | 2016-07-09 | 2 | -3/+19 |
| | | | | | | | |||||
| * | | | | | | more work on perms | redmatrix | 2016-07-09 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | more heavy lifting on xtensible perms | redmatrix | 2016-07-04 | 2 | -5/+8 |
| | | | | | | | |||||
| * | | | | | | more heavy lifting on extensible perms | redmatrix | 2016-07-04 | 1 | -3/+8 |
| | | | | | | | |||||
| * | | | | | | perms work - settings page | redmatrix | 2016-07-03 | 1 | -20/+13 |
| | | | | | | | |||||
* | | | | | | | sql typo | redmatrix | 2016-07-28 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Revert "issue #466, sql typo" | redmatrix | 2016-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4ce8f965aab8cfb09fc9f102f771cf67a7ee84fa. | ||||
* | | | | | | | issue #466, sql typo | redmatrix | 2016-07-28 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | issue #453 and a bug noted from the logfiles related to the schema change ↵ | redmatrix | 2016-07-20 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | last month | ||||
* | | | | | | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ↵ | Mario Vavti | 2016-07-20 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | id. This fixes the issue that autocomplete for mail returns null for data.xid | ||||
* / | | | | | sort out some of the authentication mess - with luck this may fix the DAV ↵ | redmatrix | 2016-07-20 | 6 | -85/+14 |
|/ / / / / | | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for. | ||||
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-17 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | hide fullscreen button in embedphotos modal album view | Mario Vavti | 2016-07-17 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | include attach.php at the module level since 2d4b75428a87038 wasn't ↵ | redmatrix | 2016-07-17 | 2 | -0/+4 |
|/ / / / / | | | | | | | | | | | | | | | | backported to dev and we're about to branch an RC | ||||
* | | | | | add service class restrictions to access_tokens | redmatrix | 2016-07-15 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | provide examples for using access tokens in urls | redmatrix | 2016-07-15 | 1 | -2/+7 |
| | | | | | |||||
* | | | | | mod_home: if using an atoken login on the home page redirect to the channel ↵ | redmatrix | 2016-07-15 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | page of the channel that owns the atoken. | ||||
* | | | | | make lockview work with throwaway identities | redmatrix | 2016-07-15 | 1 | -2/+33 |
| | | | | | |||||
* | | | | | more cleanup of atoken UI | redmatrix | 2016-07-15 | 1 | -1/+4 |
| | | | | |