| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '1.10RC'1.10 | redmatrix | 2016-07-28 | 527 | -45648/+76729 |
| |\ | |||||
| | * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-28 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Merge pull request #465 from phellmes/de20160728 | hubzilla | 2016-07-29 | 0 | -0/+0 |
| | | |\ | | | | | | | | | Update DE translation strings | ||||
| | | | * | Update DE translation strings | phellmes | 2016-07-28 | 2 | -5061/+5301 |
| | | | | | |||||
| | * | | | move fixes to po2php forward to 1.10 | redmatrix | 2016-07-28 | 1 | -1/+2 |
| | |/ / | |||||
| | * | | fix it strings after merge stuffup | redmatrix | 2016-07-28 | 1 | -907/+947 |
| | | | | |||||
| | * | | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-28 | 3 | -2/+1 |
| | | | | |||||
| | * | | Updated language files for release | jeroenpraat | 2016-07-28 | 12 | -30503/+31943 |
| | | | | |||||
| | * | | Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into ↵ | redmatrix | 2016-07-28 | 80 | -40828/+38355 |
| | | | | | | | | | | | | | | | | | | | | | | 1.10RC_merge" This reverts commit 35f17acb388f68745068d6a60e12c7b777b92282, reversing changes made to 58cf5f310d89026fb526e201c301075725044e48. | ||||
| | * | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-28 | 80 | -38355/+40828 |
| | |\ \ | |||||
| | | * | | Updated language files for release | jeroenpraat | 2016-07-28 | 13 | -30504/+31943 |
| | | | | | |||||
| | | * | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC | jeroenpraat | 2016-07-28 | 0 | -0/+0 |
| | | |\| | |||||
| | | * | | 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 |
| | | | | | | | |||||
| | | * | | | | call wall_attach rather than wall_upload for drag/drop; which means you can ↵ | redmatrix | 2016-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | drag/drop any file and not just photos. | ||||
| | | * | | | | Merge pull request #459 from anaqreon/jot-drag-attach | hubzilla | 2016-07-25 | 2 | -1/+90 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Drag and drop one image file at a time into the post editor will uplo… | ||||
| | | | * | | | | Drag and drop one image file at a time into the post editor will upload it. | Andrew Manning | 2016-07-24 | 2 | -1/+90 |
| | | |/ / / / | |||||
| | | * | | | | Merge pull request #458 from anaqreon/dragdropupload | hubzilla | 2016-07-24 | 5 | -21/+147 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Drag-and-drop file upload for cloud files | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |