| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | 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 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 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 | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -0/+4 | |
| |\| | | | | | ||||||
| | * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 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 | |||||
| * | | | | | | | Starting to make the import selection page after element scan. | Andrew Manning | 2016-07-20 | 1 | -80/+98 | |
| | | | | | | | | ||||||
| * | | | | | | | Importing webpage elements from manually entered cloud file path work. All ↵ | Andrew Manning | 2016-07-17 | 1 | -2/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detected elements are automatically imported. | |||||
| * | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | | hide fullscreen button in embedphotos modal album view | Mario Vavti | 2016-07-17 | 1 | -1/+1 | |
| | |/ / / / / | ||||||
| * | | | | | | Added functions to check cloud files path and return path with hashed names | Andrew Manning | 2016-07-17 | 1 | -51/+5 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 4 | -4/+176 | |
| |\| | | | | | ||||||
| | * | | | | | 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 | |
| | | | | | | | ||||||
| | * | | | | | cleanup and debug of atoken feature | redmatrix | 2016-07-15 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | enforce non-empty name and token/password on access tokens until better ↵ | redmatrix | 2016-07-15 | 1 | -9/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | checks are instituted. | |||||
| | * | | | | | Here's the basic UI for the Zot Access Tokens, requires some minor cleanup | redmatrix | 2016-07-14 | 1 | -1/+77 | |
| | | | | | | | ||||||
| | * | | | | | make the xchan_hash for the access token location independent | redmatrix | 2016-07-14 | 1 | -4/+6 | |
| | | | | | | | ||||||
| | * | | | | | add zat to acl | redmatrix | 2016-07-14 | 1 | -1/+26 | |
| | | |_|_|/ | |/| | | | ||||||
| * | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -13/+43 | |
| | | | | | | ||||||
| * | | | | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 1 | -2/+36 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-14 | 1 | -25/+59 | |
| |\| | | | | ||||||
| | * | | | | document mod_acl a bit better and try to remove some redundancies and ↵ | redmatrix | 2016-07-13 | 1 | -25/+59 | |
| | | | | | | | | | | | | | | | | | | | | | consolidate the various options | |||||
| * | | | | | Refactored the scan and import functions to reduce redundant code and ↵ | Andrew Manning | 2016-07-14 | 1 | -373/+23 | |
| | | | | | | | | | | | | | | | | | | | | | simplify logic. Import of pages, layouts, and blocks works. | |||||
| * | | | | | Blocks, pages, and layouts import from zip file. Layouts are not applied to ↵ | Andrew Manning | 2016-07-13 | 1 | -9/+190 | |
| | | | | | | | | | | | | | | | | | | | | | pages until imported twice though. | |||||
| * | | | | | Updated import_blocks for database calls | Andrew Manning | 2016-07-13 | 1 | -5/+3 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-13 | 1 | -1/+1 | |
| |\| | | | | ||||||
| | * | | | | missing namespace prefix \ | redmatrix | 2016-07-12 | 1 | -1/+1 | |
| | | |_|/ | |/| | | ||||||
| * | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 11 | -34/+12 | |
| |\| | | | ||||||
| | * | | | move permissiondescription class to zotlabs/lib | redmatrix | 2016-07-11 | 9 | -22/+10 | |
| | | |/ | |/| | ||||||
| | * | | use the profile_uid here. | redmatrix | 2016-07-11 | 1 | -7/+2 | |
| | | | | ||||||
| | * | | remove check for mcrypt | Mario Vavti | 2016-07-10 | 1 | -5/+0 | |
| | | | | ||||||
| * | | | Import blocks from zip file, but needs updates as detailed in ↵ | Andrew Manning | 2016-07-12 | 1 | -0/+222 | |
| |/ / | | | | | | | https://gitlab.com/zot/hubsites/merge_requests/2 | |||||
| * | | gak one more typo | redmatrix | 2016-07-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | typo | redmatrix | 2016-07-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | duplicate supression SQL query was horribly inefficient and could cause ↵ | redmatrix | 2016-07-07 | 1 | -11/+13 | |
| | | | | | | | | | issues in resource deprived environments. | |||||
| * | | Merge pull request #450 from git-marijus/dev | hubzilla | 2016-07-08 | 2 | -14/+0 | |
| |\ \ | | | | | | | fix /cloud after recent changes | |||||
| | * | | more fixes for /cloud and /dav | Mario Vavti | 2016-07-07 | 2 | -13/+0 | |
| | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |