| Commit message (Expand) | Author | Age | Files | Lines |
* | multi acl: port /thing | Mario Vavti | 2016-08-05 | 1 | -0/+8 |
* | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 2 | -5/+5 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-05 | 1 | -2/+3 |
|\ |
|
| * | Parse bbcode when page loads | Andrew Manning | 2016-08-04 | 1 | -2/+2 |
| * | Convert select bbcode tags including [observer], [baseurl], [sitename] | Andrew Manning | 2016-08-03 | 1 | -0/+1 |
* | | multi acl: port /wiki | Mario Vavti | 2016-08-04 | 1 | -4/+13 |
* | | multi acl: port /webpages and /mitem | Mario Vavti | 2016-08-04 | 3 | -1/+11 |
* | | multi acl: port /chat | Mario Vavti | 2016-08-04 | 1 | -0/+4 |
* | | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 2 | -6/+9 |
* | | 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 | 8 | -17/+269 |
|\| |
|
| * | 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 (th... | redmatrix | 2016-08-01 | 2 | -7/+15 |
| * | /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, st... | redmatrix | 2016-07-31 | 2 | -3/+7 |
| * | 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 | 12 | -554/+103 |
| |\| |
|
| * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 26 | -225/+567 |
| |\ \ |
|
| * \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -3/+3 |
| |\ \ \ |
|
| * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 4 | -2/+5 |
| |\ \ \ \ |
|
| * | | | | | 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 de... | Andrew Manning | 2016-07-17 | 1 | -2/+21 |
| * | | | | | 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 | 2 | -51/+6 |
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 7 | -5/+197 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | 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 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | Refactored the scan and import functions to reduce redundant code and simplif... | Andrew Manning | 2016-07-14 | 1 | -373/+23 |
| * | | | | | | | | Blocks, pages, and layouts import from zip file. Layouts are not applied to p... | Andrew Manning | 2016-07-13 | 1 | -9/+190 |
| * | | | | | | | | 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 | 13 | -35/+184 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Import blocks from zip file, but needs updates as detailed in https://gitlab.... | Andrew Manning | 2016-07-12 | 1 | -0/+222 |
* | | | | | | | | | | | 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 f... | redmatrix | 2016-07-27 | 1 | -12/+0 |
* | | | | | | | | | | add the hidden flag also | redmatrix | 2016-07-27 | 1 | -1/+2 |
* | | | | | | | | | | rework drag and drop to drag directly into files area, implement the default ... | Mario Vavti | 2016-07-27 | 1 | -75/+0 |
* | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-26 | 1 | -0/+75 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge pull request #463 from git-marijus/dev | hubzilla | 2016-07-27 | 1 | -0/+75 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | allow multiple-file cloud upload | Mario Vavti | 2016-07-26 | 1 | -0/+75 |