| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 4 | -2/+5 |
| |\ | |||||
| | * | doc correction | redmatrix | 2016-07-19 | 1 | -1/+1 |
| | | | |||||
| | * | 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 | 3 | -1/+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 | 2 | -51/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 7 | -5/+197 |
| |\| | |||||
| | * | os_delete_prohibit | redmatrix | 2016-07-16 | 1 | -0/+4 |
| | | | |||||
| | * | add service class restrictions to access_tokens | redmatrix | 2016-07-15 | 1 | -0/+10 |
| | | | |||||
| | * | remove expired access tokens | redmatrix | 2016-07-15 | 1 | -0/+9 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | more ZAT work | redmatrix | 2016-07-14 | 1 | -1/+8 |
| | | | |||||
| * | | 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 | 2 | -27/+63 |
| |\| | |||||
| | * | let abconfig specify a family | redmatrix | 2016-07-13 | 1 | -2/+4 |
| | | | |||||
| | * | 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 | 13 | -35/+184 |
| |\| | |||||
| | * | move permissiondescription class to zotlabs/lib | redmatrix | 2016-07-11 | 10 | -22/+180 |
| | | | |||||
| | * | force non-null sess_data | redmatrix | 2016-07-11 | 1 | -1/+2 |
| | | | |||||
| | * | 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 | 3 | -14/+2 |
| |\ | | | | | fix /cloud after recent changes | ||||
| | * | more fixes for /cloud and /dav | Mario Vavti | 2016-07-07 | 3 | -13/+2 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-06 | 4 | -7/+285 |
| | |\ | |||||
| | * | | fix /cloud after recent changes | Mario Vavti | 2016-07-06 | 1 | -2/+1 |
| | | | | |||||
| * | | | hide the redeliver option one level down since it should rarely be needed by ↵ | redmatrix | 2016-07-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | folks outside of shared hosting. | ||||
| * | | | expire crashing on shared hosting from memory exhaustion. Lower the expire ↵ | redmatrix | 2016-07-06 | 1 | -1/+1 |
| | |/ |/| | | | | | limit. Also the sys channel was being expired with everybody else due to a flag change regression. | ||||
| * | | merge include/reddav.php into Zotlabs/Storage/Directory.php | redmatrix | 2016-07-05 | 1 | -4/+280 |
| | | | |||||
| * | | regression - save bookmarks no longer present in item menu | redmatrix | 2016-07-05 | 1 | -1/+1 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |