Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use config system.server_role and deprecate 'UNO' | redmatrix | 2016-08-07 | 10 | -20/+74 |
| | |||||
* | bring back acl for cloud file uploads | Mario Vavti | 2016-08-06 | 2 | -17/+28 |
| | |||||
* | Revert "Revert "remove some logging"" | Mario Vavti | 2016-08-05 | 1 | -10/+1 |
| | | | | This reverts commit e67f5bc6bbb77d53867d7c03bda8410c59360dbe. | ||||
* | Revert "remove some logging" | Mario Vavti | 2016-08-05 | 1 | -1/+10 |
| | | | | This reverts commit 316b090433b7e415fd3c8ac6230f2df0277cdf8c. | ||||
* | remove some logging | Mario Vavti | 2016-08-05 | 1 | -10/+1 |
| | |||||
* | multi acl: port /settings | Mario Vavti | 2016-08-05 | 2 | -4/+2 |
| | |||||
* | multi acl: port /thing | Mario Vavti | 2016-08-05 | 3 | -7/+5 |
| | |||||
* | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 6 | -15/+13 |
| | |||||
* | multi acl: provide a acl-form-trigger class which comes handy in certain ↵ | Mario Vavti | 2016-08-04 | 3 | -6/+7 |
| | | | | situations | ||||
* | multi acl: port /wiki | Mario Vavti | 2016-08-04 | 1 | -7/+7 |
| | |||||
* | multi acl: port /webpages and /mitem | Mario Vavti | 2016-08-04 | 1 | -2/+2 |
| | |||||
* | multi acl: port /chat | Mario Vavti | 2016-08-04 | 1 | -1/+1 |
| | |||||
* | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 4 | -21/+5 |
| | |||||
* | 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 | 3 | -7/+9 |
| | | |||||
* | | multiple acl: store new data in update_view() | Mario Vavti | 2016-08-03 | 1 | -19/+23 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 11 | -11/+445 |
|\| | |||||
| * | belongs to previous commit | jeroenpraat | 2016-08-03 | 1 | -0/+1 |
| | | |||||
| * | Improved a few schemas - context help fix - dark schemas now have dark text ↵ | jeroenpraat | 2016-08-03 | 4 | -4/+141 |
| | | | | | | | | areas (et al.) | ||||
| * | 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 | 3 | -72/+216 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 12 | -10198/+10982 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | 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 | 4 | -20/+47 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 15 | -558/+102 |
| |\ \ \ \ | |||||
| * | | | | | 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-14 | 3 | -3/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 7 | -13/+16 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 2 | -0/+8 |
| | | | | | | | | |||||
* | | | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 6 | -41/+75 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Updating es-es strings | jeroenpraat | 2016-07-29 | 2 | -5059/+5299 |
| | | | | | | | |||||
* | | | | | | | catch all input fields (in preparation for acl in this place) and display ↵ | Mario Vavti | 2016-07-29 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | missing space | Mario Vavti | 2016-07-28 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | missing semicolon | Mario Vavti | 2016-07-28 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | add more info on what is happening after we are at 100% and minor fixes | Mario Vavti | 2016-07-28 | 3 | -5/+21 |
| | | | | | | | |||||
* | | | | | | | re-implement progress-bar to work with all browsers | Mario Vavti | 2016-07-28 | 2 | -5/+15 |
| | | | | | | | |||||
* | | | | | | | reusing the original form did not work so well via xhr upload - let us ↵ | Mario Vavti | 2016-07-28 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | create a new form for this action. revert progressbar- only works nice in firefox | ||||
* | | | | | | | make progressbar slightly more transparent and give it a default width of ↵ | Mario Vavti | 2016-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3px to indicate which files are to be uploaded | ||||
* | | | | | | | use single quote for js and double quote for html with proper escapes and ↵ | Mario Vavti | 2016-07-28 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement a simple progressbar | ||||
* | | | | | | | translate mime types to icons, update some icons, move file preview (upload ↵ | Mario Vavti | 2016-07-28 | 1 | -5/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | progress) below table header | ||||
* | | | | | | | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-27 | 1 | -0/+1 |
| | | | | | | |