| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 38 | -12337/+12863 | |
| | | |\| | ||||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 52 | -796/+1516 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -3/+3 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 9 | -15/+52 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Starting to make the import selection page after element scan. | Andrew Manning | 2016-07-20 | 3 | -80/+176 | |
| | | * | | | | | Importing webpage elements from manually entered cloud file path work. All de... | Andrew Manning | 2016-07-17 | 3 | -7/+26 | |
| | | * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-17 | 5 | -21/+48 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | Added functions to check cloud files path and return path with hashed names | Andrew Manning | 2016-07-17 | 4 | -56/+91 | |
| | | * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 34 | -2397/+2326 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 3 | -30/+52 | |
| | | * | | | | | | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 3 | -6/+55 | |
| | | * | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-14 | 7 | -32/+80 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Refactored the scan and import functions to reduce redundant code and simplif... | Andrew Manning | 2016-07-14 | 2 | -373/+223 | |
| | | * | | | | | | | | Blocks, pages, and layouts import from zip file. Layouts are not applied to p... | Andrew Manning | 2016-07-13 | 1 | -9/+190 | |
| | | * | | | | | | | | 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 https://gitlab.... | Andrew Manning | 2016-07-12 | 2 | -2/+224 | |
| | | * | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-07-31 | 19 | -7589/+7848 | |
| |\| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-30 | 10 | -5092/+5417 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | Updating es-es strings | jeroenpraat | 2016-07-29 | 2 | -5059/+5299 | |
| | | * | | | | | | | | | | catch all input fields (in preparation for acl in this place) and display the... | Mario Vavti | 2016-07-29 | 2 | -4/+9 | |
| | | * | | | | | | | | | | 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 being ad... | Andrew Manning | 2016-07-28 | 1 | -3/+3 | |
| | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | 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 create... | Mario Vavti | 2016-07-28 | 2 | -9/+13 | |
| | | * | | | | | | | | | | make progressbar slightly more transparent and give it a default width of 3px... | Mario Vavti | 2016-07-28 | 1 | -1/+1 | |
| | | * | | | | | | | | | | use single quote for js and double quote for html with proper escapes and imp... | Mario Vavti | 2016-07-28 | 1 | -6/+7 | |
| | | * | | | | | | | | | | translate mime types to icons, update some icons, move file preview (upload p... | Mario Vavti | 2016-07-28 | 3 | -21/+70 | |
| | * | | | | | | | | | | | issue #466, sql typo | redmatrix | 2016-07-28 | 3 | -3/+3 | |
| | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | 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 f... | redmatrix | 2016-07-27 | 3 | -2324/+2313 | |
| | * | | | | | | | | | | Merge pull request #464 from anaqreon/hover-visuals | hubzilla | 2016-07-28 | 2 | -6/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | 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 | |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-07-27 | 12 | -6530/+6853 | |
| |\| | | | | | | | | | | ||||||
| | * | | | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | 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 | |
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |