aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '1.10RC'1.10redmatrix2016-07-28527-45648/+76729
|\
| * Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-280-0/+0
| |\
| | * Merge pull request #465 from phellmes/de20160728hubzilla2016-07-290-0/+0
| | |\
| | | * Update DE translation stringsphellmes2016-07-282-5061/+5301
| * | | move fixes to po2php forward to 1.10redmatrix2016-07-281-1/+2
| |/ /
| * | fix it strings after merge stuffupredmatrix2016-07-281-907/+947
| * | github didn't accept the last push. Touching the files to force a git revisionredmatrix2016-07-283-2/+1
| * | Updated language files for releasejeroenpraat2016-07-2812-30503/+31943
| * | Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1...redmatrix2016-07-2880-40828/+38355
| * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-2880-38355/+40828
| |\ \
| | * | Updated language files for releasejeroenpraat2016-07-2813-30504/+31943
| | * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RCjeroenpraat2016-07-280-0/+0
| | |\|
| | * | 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
| | * | 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 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
| | * | | set App::$error on 404 so we don't get two 'Page not found.' page bodies.redmatrix2016-07-261-0/+1
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-263-6472/+6713
| | |\| |
| | | * | Merge pull request #462 from wave72/devWave2016-07-262-6471/+6711
| | | |\ \
| | | | * | Updated Italian stringsWave722016-07-262-6471/+6711
| | | | * | Merge pull request #6 from redmatrix/devWave2016-07-224855-289863/+312221
| | | | |\ \
| | | * | | | URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav cli...Mario Vavti2016-07-261-1/+2
| | * | | | | issue #460 - remove reference to $a which was passed by value since it doesn'...redmatrix2016-07-261-53/+53
| | |/ / / /
| | * | | | check for new permissions and update channels and connections with defaults i...redmatrix2016-07-251-0/+64
| | * | | | move openid to addonredmatrix2016-07-252-517/+0
| | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-252-1/+2
| | |\ \ \ \
| | | * | | | revert multiple testMario Vavti2016-07-251-1/+1
| | | * | | | css fixesMario Vavti2016-07-252-1/+2
| | * | | | | issue #460redmatrix2016-07-251-1/+3
| | |/ / / /
| | * | | | revert cloud acl selector (branched so as to continue development)redmatrix2016-07-252-20/+8
| | * | | | make drag/drop work with acl, which bypassed the formredmatrix2016-07-242-2/+4
| | * | | | trace log pconfig cache if for some reason it isn't an arrayredmatrix2016-07-242-1/+9
| | * | | | add acl selection to files upload via /cloud (still missing from directory cr...redmatrix2016-07-243-7/+76
| | * | | | string update and some minor comment editsredmatrix2016-07-243-1491/+1570
| | * | | | call wall_attach rather than wall_upload for drag/drop; which means you can d...redmatrix2016-07-241-1/+1
| | * | | | Merge pull request #459 from anaqreon/jot-drag-attachhubzilla2016-07-252-1/+90
| | |\ \ \ \
| | | * | | | Drag and drop one image file at a time into the post editor will upload it.Andrew Manning2016-07-242-1/+90
| | |/ / / /
| | * | | | Merge pull request #458 from anaqreon/dragdropuploadhubzilla2016-07-245-21/+147
| | |\ \ \ \