Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | multi acl: port photos | Mario Vavti | 2016-08-04 | 1 | -1/+9 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-04 | 1 | -1/+1 |
|\ | |||||
| * | issue #473 - unable to delete privacy groups | redmatrix | 2016-08-03 | 1 | -1/+1 |
| | | |||||
* | | multi acl: port events | Mario Vavti | 2016-08-03 | 1 | -1/+11 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 6 | -14/+261 |
|\| | |||||
| * | missing comma in atoken update sql | redmatrix | 2016-08-02 | 1 | -1/+1 |
| | | |||||
| * | this should sort out likes showing up as wall-to-wall posts on diaspora | redmatrix | 2016-08-01 | 1 | -0/+2 |
| | | |||||
| * | This checkin should make all permission modes work correctly with atokens ↵ | redmatrix | 2016-08-01 | 1 | -4/+8 |
| | | | | | | | | (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections. | ||||
| * | /storeurl/cloudurl/ | redmatrix | 2016-08-01 | 1 | -1/+1 |
| | | |||||
| * | allow individual permissions on atokens | redmatrix | 2016-07-31 | 1 | -5/+59 |
| | | |||||
| * | add a few more path macros to portable menu elements (channelurl, pageurl, ↵ | redmatrix | 2016-07-31 | 2 | -3/+7 |
| | | | | | | | | storeurl and baseurl) | ||||
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-31 | 1 | -1/+1 |
| |\ | |||||
| | * | issue #466, sql typo | redmatrix | 2016-07-28 | 1 | -1/+1 |
| | | | |||||
| * | | Improved UI. Removed logger statements. | Andrew Manning | 2016-07-31 | 1 | -9/+17 |
| | | | |||||
| * | | Import element selection page added to allow selective importing. | Andrew Manning | 2016-07-30 | 1 | -22/+91 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 6 | -547/+58 |
| |\| | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 18 | -183/+177 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -0/+4 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| |\ \ \ \ \ | |||||
| * | | | | | | 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 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 11 | -34/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 | ||||
* | | | | | | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 3 | -2/+9 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | 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 |
|\| | | | | | | | | |||||
| * | | | | | | | | 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 | ||||
* | | | | | | | | fix the forum detection in include/zot | redmatrix | 2016-07-19 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | permission fixes | redmatrix | 2016-07-19 | 2 | -5/+7 |
| | | | | | | | |