Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove references to tinymce which were causing console errors | redmatrix | 2016-08-21 | 2 | -85/+4 |
| | |||||
* | move jotnets to jot and some cleanup (mostly whitespace) | Mario Vavti | 2016-08-21 | 2 | -73/+97 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-16 | 1 | -0/+3 |
|\ | |||||
| * | move schema settings into the display settings main so we can set ↵ | redmatrix | 2016-08-15 | 1 | -0/+3 |
| | | | | | | | | theme:schema theme selectors in settings | ||||
* | | rename limited -> custom | Mario Vavti | 2016-08-16 | 1 | -1/+1 |
|/ | |||||
* | Use double quotes for strings passed via templates to javascript. Some ↵ | redmatrix | 2016-08-15 | 1 | -5/+5 |
| | | | | translated strings have unescaped single quotes. | ||||
* | provide group options serverside and minor cleanup | Mario Vavti | 2016-08-15 | 1 | -0/+1 |
| | |||||
* | Merge pull request #482 from anaqreon/nocomment | hubzilla | 2016-08-14 | 2 | -0/+22 |
|\ | | | | | Added an optional post editor button to toggle comments | ||||
| * | Change text for submenu on small screens to be static toggle statement | Andrew Manning | 2016-08-14 | 1 | -1/+1 |
| | | |||||
| * | Replace hardcoded button title in javascript to translatable text | Andrew Manning | 2016-08-14 | 1 | -2/+2 |
| | | |||||
| * | Added a disable comments setting to the "Additional features" settings with ↵ | Andrew Manning | 2016-08-14 | 2 | -0/+22 |
| | | | | | | | | a corresponding post editor toggle button | ||||
* | | fix javascript error if not logged in | Mario Vavti | 2016-08-14 | 1 | -2/+2 |
|/ | |||||
* | btn/dropdown rendering issue | Mario Vavti | 2016-08-14 | 1 | -24/+30 |
| | |||||
* | fix #480, enable bbcode autocomplete for photo comments and remove some ↵ | Mario Vavti | 2016-08-13 | 2 | -1/+1 |
| | | | | redundant javascript | ||||
* | initialise jot editor if it is used as a file drop target and isn't yet opened. | redmatrix | 2016-08-10 | 1 | -1/+6 |
| | |||||
* | implement acl for folder creation | Mario Vavti | 2016-08-10 | 1 | -7/+19 |
| | |||||
* | open editor or comment window when linkdropping to a closed window. We ↵ | redmatrix | 2016-08-10 | 1 | -4/+18 |
| | | | | probably also need this for filedropping. | ||||
* | allow dropping links on comments as well as posts | redmatrix | 2016-08-09 | 2 | -2/+4 |
| | |||||
* | You can drag links to the editor (which will be parsed and inserted); as ↵ | redmatrix | 2016-08-09 | 2 | -2/+2 |
| | | | | well as files (which will be uploaded) | ||||
* | diaspora vcard updates | redmatrix | 2016-08-07 | 1 | -5/+11 |
| | |||||
* | bring back acl for cloud file uploads | Mario Vavti | 2016-08-06 | 1 | -15/+26 |
| | |||||
* | multi acl: port /settings | Mario Vavti | 2016-08-05 | 1 | -2/+2 |
| | |||||
* | multi acl: port /thing | Mario Vavti | 2016-08-05 | 2 | -6/+4 |
| | |||||
* | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 4 | -4/+4 |
| | |||||
* | multi acl: provide a acl-form-trigger class which comes handy in certain ↵ | Mario Vavti | 2016-08-04 | 2 | -2/+2 |
| | | | | 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 | 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 |