aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Import element selection page added to allow selective importing.Andrew Manning2016-07-304-94/+307
| | * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-3038-12337/+12863
| | |\|
| | * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2152-796/+1516
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-3/+3
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-209-15/+52
| | |\ \ \ \
| | * | | | | Starting to make the import selection page after element scan.Andrew Manning2016-07-203-80/+176
| | * | | | | Importing webpage elements from manually entered cloud file path work. All de...Andrew Manning2016-07-173-7/+26
| | * | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-175-21/+48
| | |\ \ \ \ \
| | * | | | | | Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-174-56/+91
| | * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-1634-2397/+2326
| | |\ \ \ \ \ \
| | * | | | | | | Stash changes to merge from devAndrew Manning2016-07-163-30/+52
| | * | | | | | | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-163-6/+55
| | * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-147-32/+80
| | |\ \ \ \ \ \ \
| | * | | | | | | | Refactored the scan and import functions to reduce redundant code and simplif...Andrew Manning2016-07-142-373/+223
| | * | | | | | | | Blocks, pages, and layouts import from zip file. Layouts are not applied to p...Andrew Manning2016-07-131-9/+190
| | * | | | | | | | Updated import_blocks for database callsAndrew Manning2016-07-131-5/+3
| | * | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-133-20/+12
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-1227-56/+54
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import blocks from zip file, but needs updates as detailed in https://gitlab....Andrew Manning2016-07-122-2/+224
| | * | | | | | | | | | Clearer import control interfaceAndrew Manning2016-07-102-8/+28
| | * | | | | | | | | | First draft of website import toolsAndrew Manning2016-07-104-0/+46
* | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-3119-7589/+7848
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-3010-5092/+5417
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Updating es-es stringsjeroenpraat2016-07-292-5059/+5299
| | * | | | | | | | | | catch all input fields (in preparation for acl in this place) and display the...Mario Vavti2016-07-292-4/+9
| | * | | | | | | | | | Merge pull request #467 from anaqreon/multiple-attachhubzilla2016-07-291-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed bug where multiple post attachements by drag-and-drop were not being ad...Andrew Manning2016-07-281-3/+3
| | |/ / / / / / / / / /
| | * | | | | | | | | | missing spaceMario Vavti2016-07-281-1/+1
| | * | | | | | | | | | missing semicolonMario Vavti2016-07-281-1/+1
| | * | | | | | | | | | add more info on what is happening after we are at 100% and minor fixesMario Vavti2016-07-283-5/+21
| | * | | | | | | | | | re-implement progress-bar to work with all browsersMario Vavti2016-07-282-5/+15
| | * | | | | | | | | | reusing the original form did not work so well via xhr upload - let us create...Mario Vavti2016-07-282-9/+13
| | * | | | | | | | | | make progressbar slightly more transparent and give it a default width of 3px...Mario Vavti2016-07-281-1/+1
| | * | | | | | | | | | use single quote for js and double quote for html with proper escapes and imp...Mario Vavti2016-07-281-6/+7
| | * | | | | | | | | | translate mime types to icons, update some icons, move file preview (upload p...Mario Vavti2016-07-283-21/+70
| * | | | | | | | | | | issue #466, sql typoredmatrix2016-07-283-3/+3
| |/ / / / / / / / / /
| * | | | | | | | | | github didn't accept the last push. Touching the files to force a git revisionredmatrix2016-07-273-2/+1
| * | | | | | | | | | fix italian strings (messed up by rtl variable); and finish removing openid f...redmatrix2016-07-273-2324/+2313
| * | | | | | | | | | Merge pull request #464 from anaqreon/hover-visualshubzilla2016-07-282-6/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Enhanced visual feedback for file drag hoverAndrew Manning2016-07-272-6/+5
| |/ / / / / / / / / /
| * | | | | | | | | | add the hidden flag alsoredmatrix2016-07-271-1/+2
| * | | | | | | | | | rework drag and drop to drag directly into files area, implement the default ...Mario Vavti2016-07-276-175/+121
* | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-2712-6530/+6853
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-263-2/+77
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #463 from git-marijus/devhubzilla2016-07-273-2/+77
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | fix drag and dropMario Vavti2016-07-261-1/+1
| | | * | | | | | | | | | allow multiple-file cloud uploadMario Vavti2016-07-262-1/+76
| * | | | | | | | | | | | don't include deleted or orphaned xchans in ratings searchredmatrix2016-07-261-1/+2
| |/ / / / / / / / / / /
| * | | | | | | | | | | restrict url cache to 254 maxlenredmatrix2016-07-261-0/+5
| * | | | | | | | | | | missing sredmatrix2016-07-262-2/+2