Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | 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 | 3 | -20/+12 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 27 | -56/+54 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Import blocks from zip file, but needs updates as detailed in ↵ | Andrew Manning | 2016-07-12 | 2 | -2/+224 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/zot/hubsites/merge_requests/2 | |||||
| | | * | | | | | | | | | Clearer import control interface | Andrew Manning | 2016-07-10 | 2 | -8/+28 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | First draft of website import tools | Andrew Manning | 2016-07-10 | 4 | -0/+46 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 11 | -43/+96 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | 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 | |||||
* | | | | | | | | | | | Merge pull request #467 from anaqreon/multiple-attach | hubzilla | 2016-07-29 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug where multiple post attachements by drag-and-drop were not … | |||||
| * | | | | | | | | | | | 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 | 3 | -21/+70 | |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | progress) below table header | |||||
* | | | | | | | | | | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-27 | 3 | -2/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | fix italian strings (messed up by rtl variable); and finish removing openid ↵ | redmatrix | 2016-07-27 | 3 | -2324/+2313 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from core | |||||
* | | | | | | | | | | Merge pull request #464 from anaqreon/hover-visuals | hubzilla | 2016-07-28 | 2 | -6/+5 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Enhanced visual feedback for file drag hover | |||||
| * | | | | | | | | | | Enhanced visual feedback for file drag hover | Andrew Manning | 2016-07-27 | 2 | -6/+5 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | 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 | 6 | -175/+121 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-26 | 3 | -2/+77 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #463 from git-marijus/dev | hubzilla | 2016-07-27 | 3 | -2/+77 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | allow multiple-file cloud upload | |||||
| | * | | | | | | | | | | fix drag and drop | Mario Vavti | 2016-07-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | allow multiple-file cloud upload | Mario Vavti | 2016-07-26 | 2 | -1/+76 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | don't include deleted or orphaned xchans in ratings search | redmatrix | 2016-07-26 | 1 | -1/+2 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | restrict url cache to 254 maxlen | redmatrix | 2016-07-26 | 1 | -0/+5 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | missing s | redmatrix | 2016-07-26 | 2 | -2/+2 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | set App::$error on 404 so we don't get two 'Page not found.' page bodies. | redmatrix | 2016-07-26 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-26 | 3 | -6472/+6713 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #462 from wave72/dev | Wave | 2016-07-26 | 2 | -6471/+6711 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Updated Italian strings | |||||
| | * | | | | | | | | | | Updated Italian strings | Wave72 | 2016-07-26 | 2 | -6471/+6711 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge pull request #6 from redmatrix/dev | Wave | 2016-07-22 | 4855 | -289863/+312221 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Dev | |||||
| * | | | | | | | | | | | | URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav ↵ | Mario Vavti | 2016-07-26 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clients | |||||
* | | | | | | | | | | | | | issue #460 - remove reference to $a which was passed by value since it ↵ | redmatrix | 2016-07-26 | 1 | -53/+53 | |
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier. | |||||
* | | | | | | | | | | | | check for new permissions and update channels and connections with defaults ↵ | redmatrix | 2016-07-25 | 1 | -0/+64 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if any are found and if there are defaults for any channel roles which are being used on this site. | |||||
* | | | | | | | | | | | | move openid to addon | redmatrix | 2016-07-25 | 2 | -517/+0 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-25 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | revert multiple test | Mario Vavti | 2016-07-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | css fixes | Mario Vavti | 2016-07-25 | 2 | -1/+2 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | issue #460 | redmatrix | 2016-07-25 | 1 | -1/+3 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | revert cloud acl selector (branched so as to continue development) | redmatrix | 2016-07-25 | 2 | -20/+8 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | make drag/drop work with acl, which bypassed the form | redmatrix | 2016-07-24 | 2 | -2/+4 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | trace log pconfig cache if for some reason it isn't an array | redmatrix | 2016-07-24 | 2 | -1/+9 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | add acl selection to files upload via /cloud (still missing from directory ↵ | redmatrix | 2016-07-24 | 3 | -7/+76 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation) | |||||
* | | | | | | | | | | | | string update and some minor comment edits | redmatrix | 2016-07-24 | 3 | -1491/+1570 | |
| | | | | | | | | | | | |