Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | multi acl: port /chat | Mario Vavti | 2016-08-04 | 1 | -1/+1 |
| | |||||
* | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 2 | -5/+4 |
| | |||||
* | multi acl: port photos | Mario Vavti | 2016-08-04 | 2 | -7/+4 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-04 | 1 | -11/+13 |
|\ | |||||
| * | issue #474 | redmatrix | 2016-08-03 | 1 | -11/+13 |
| | | |||||
* | | multi acl: port events | Mario Vavti | 2016-08-03 | 2 | -4/+7 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 4 | -7/+202 |
|\| | |||||
| * | allow individual permissions on atokens | redmatrix | 2016-07-31 | 2 | -7/+39 |
| | | |||||
| * | Remove scanned element column for existing element information which we are ↵ | Andrew Manning | 2016-07-31 | 1 | -3/+9 |
| | | | | | | | | not yet populating. | ||||
| * | Improved UI. Removed logger statements. | Andrew Manning | 2016-07-31 | 2 | -28/+36 |
| | | |||||
| * | Import element selection page added to allow selective importing. | Andrew Manning | 2016-07-30 | 1 | -72/+116 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 3 | -18/+100 |
| |\ | |||||
| * | | Starting to make the import selection page after element scan. | Andrew Manning | 2016-07-20 | 2 | -0/+78 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-17 | 2 | -19/+28 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 3 | -5/+49 |
| |\ \ \ | |||||
| * | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -13/+6 |
| | | | | | |||||
| * | | | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 1 | -3/+14 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 5 | -10/+10 |
| |\ \ \ \ | |||||
| * | | | | | Import blocks from zip file, but needs updates as detailed in ↵ | Andrew Manning | 2016-07-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/zot/hubsites/merge_requests/2 | ||||
| * | | | | | Clearer import control interface | Andrew Manning | 2016-07-10 | 1 | -6/+22 |
| | | | | | | |||||
| * | | | | | First draft of website import tools | Andrew Manning | 2016-07-10 | 1 | -0/+7 |
| | | | | | | |||||
* | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 5 | -15/+15 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | catch all input fields (in preparation for acl in this place) and display ↵ | Mario Vavti | 2016-07-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | the files to upload in the right order | ||||
* | | | | | Fixed bug where multiple post attachements by drag-and-drop were not being ↵ | Andrew Manning | 2016-07-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | added to the post content. | ||||
* | | | | | reusing the original form did not work so well via xhr upload - let us ↵ | Mario Vavti | 2016-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | create a new form for this action. revert progressbar- only works nice in firefox | ||||
* | | | | | rework drag and drop to drag directly into files area, implement the default ↵ | Mario Vavti | 2016-07-27 | 2 | -9/+3 |
| | | | | | | | | | | | | | | | | | | | | upload button to work with the same mechanism as drag and drop, revert 560af7a5b8e30001ea6bf9a6d2ea36e94ae904d0 since it did not work so well with the new cloud upload mechanism | ||||
* | | | | | allow multiple-file cloud upload | Mario Vavti | 2016-07-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | revert multiple test | Mario Vavti | 2016-07-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | css fixes | Mario Vavti | 2016-07-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | revert cloud acl selector (branched so as to continue development) | redmatrix | 2016-07-25 | 1 | -18/+6 |
| | | | | | |||||
* | | | | | add acl selection to files upload via /cloud (still missing from directory ↵ | redmatrix | 2016-07-24 | 1 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | creation) | ||||
* | | | | | call wall_attach rather than wall_upload for drag/drop; which means you can ↵ | redmatrix | 2016-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | drag/drop any file and not just photos. | ||||
* | | | | | Drag and drop one image file at a time into the post editor will upload it. | Andrew Manning | 2016-07-24 | 1 | -1/+81 |
| | | | | | |||||
* | | | | | Multiple file upload by drag and drop with progress indicators and auto page ↵ | Andrew Manning | 2016-07-24 | 1 | -193/+20 |
| | | | | | | | | | | | | | | | | | | | | reload | ||||
* | | | | | Include credentials for session cookie in xhr | Andrew Manning | 2016-07-23 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | AJAX single upload might be working, but permissions problems seem to cause ↵ | Andrew Manning | 2016-07-23 | 1 | -11/+77 |
| | | | | | | | | | | | | | | | | | | | | failure. | ||||
* | | | | | Drag and drop file information display in cloud files upload form. No actual ↵ | Andrew Manning | 2016-07-22 | 1 | -0/+112 |
| | | | | | | | | | | | | | | | | | | | | upload implemented yet. | ||||
* | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-20 | 8 | -15/+68 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | hide fullscreen button in embedphotos modal album view | Mario Vavti | 2016-07-17 | 1 | -0/+2 |
| | | | | |||||
| * | | | booboo | redmatrix | 2016-07-17 | 1 | -2/+2 |
| | | | | |||||
| * | | | some work on guest access token ui | Mario Vavti | 2016-07-17 | 1 | -19/+26 |
| | |/ | |/| | |||||
| * | | provide examples for using access tokens in urls | redmatrix | 2016-07-15 | 1 | -0/+4 |
| | | | |||||
| * | | round up height | Mario Vavti | 2016-07-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-15 | 1 | -2/+3 |
| |\ \ | |||||
| | * | | more cleanup of atoken UI | redmatrix | 2016-07-15 | 1 | -0/+1 |
| | | | | |||||
| | * | | cleanup and debug of atoken feature | redmatrix | 2016-07-15 | 1 | -2/+2 |
| | | | | |||||
| * | | | upgrade to jquery-3.1 and minor fixes | Mario Vavti | 2016-07-15 | 2 | -5/+16 |
| |/ / | |||||
| * / | Here's the basic UI for the Zot Access Tokens, requires some minor cleanup | redmatrix | 2016-07-14 | 1 | -0/+28 |
| |/ | |||||
| * | do not use visibility for fullscreen button and move fullscreen button to ↵ | Mario Vavti | 2016-07-11 | 5 | -10/+10 |
| | | | | | | | | the right | ||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-09 | 2 | -1/+80 |
|\| |