summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2774 from nextcloud/fix-2585Lukas Reschke2016-12-201-5/+0
|\
| * remove frequent, unimportant log messageArthur Schiwon2016-12-191-5/+0
|/
* Merge pull request #2764 from nextcloud/fix-groupshare-sharetimesortChristoph Wurst2016-12-191-1/+1
|\
| * When grouping shares, sort by stime then id (#26777)Vincent Petry2016-12-191-1/+1
* | Merge pull request #2762 from nextcloud/add-js-computerFileSizeLukas Reschke2016-12-192-0/+76
|\ \ | |/ |/|
| * Verify input, add more unit testsPatrick Paysant2016-12-192-12/+23
| * Add test for unparseable stringPatrick Paysant2016-12-191-1/+2
| * Implements all comments from @PVince81Patrick Paysant2016-12-192-48/+46
| * Adding computerFileSize in OC.UtilPatrick Paysant2016-12-192-0/+66
|/
* Merge pull request #2757 from nextcloud/cron-5.6Lukas Reschke2016-12-191-0/+7
|\
| * Also check in cron for old php versionRoeland Jago Douma2016-12-191-0/+7
* | Merge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-stor...Lukas Reschke2016-12-191-3/+3
|\ \
| * | Use a form so firefox doesn't try to save the space as a passwordJoas Schilling2016-12-191-3/+3
* | | Merge pull request #2754 from nextcloud/activities-manager-publish-exceptionRobin Appelman2016-12-191-0/+1
|\ \ \
| * | | Activities IManager throws an BadMethodCallExceptionChristoph Wurst2016-12-191-0/+1
| | |/ | |/|
* | | Merge pull request #2689 from andreas-p/fix-remote-conflictLukas Reschke2016-12-191-1/+12
|\ \ \ | |/ / |/| |
| * | Fix showConflictpflug2016-12-191-1/+12
* | | Merge pull request #2727 from nextcloud/fix-colon-issueRoeland Jago Douma2016-12-193-0/+25
|\ \ \ | |_|/ |/| |
| * | Update third-party ref for new sabre/uri versionLukas Reschke2016-12-171-0/+0
| * | Add integration test for creating folder with colonVincent Petry2016-12-162-0/+25
* | | Merge pull request #2721 from nextcloud/ocs-die-on-exceptionRoeland Jago Douma2016-12-191-1/+3
|\ \ \
| * | | Die in OCS v1.php on exceptionVincent Petry2016-12-161-1/+3
| |/ /
* | | Merge pull request #2723 from nextcloud/integrity-exit-codeRoeland Jago Douma2016-12-192-0/+6
|\ \ \
| * | | Return 1 if integrity check is failed. Fixes #22806Victor Dubiniuk2016-12-162-0/+6
| |/ /
* | | Merge pull request #2726 from nextcloud/check-all-channelsChristoph Wurst2016-12-181-7/+3
|\ \ \
| * | | Consider all channel except blank and git to be signedVictor Dubiniuk2016-12-161-7/+3
| |/ /
* | | Merge pull request #2735 from nextcloud/fix-settingsmenuChristoph Wurst2016-12-181-4/+3
|\ \ \
| * | | Adjust shadows and fix positioningJulius Haertl2016-12-171-4/+3
| |/ /
* | | Merge pull request #2725 from nextcloud/memcached-connect-onceRoeland Jago Douma2016-12-171-10/+11
|\ \ \
| * | | Set options, then add serversVictor Dubiniuk2016-12-161-10/+11
| |/ /
* | | Merge pull request #2722 from nextcloud/failed-to-create-share-fixRoeland Jago Douma2016-12-171-1/+1
|\ \ \
| * | | commit transaction after select queryphisch2016-12-161-1/+1
| |/ /
* | | Merge pull request #2720 from nextcloud/fix-25692Roeland Jago Douma2016-12-171-1/+3
|\ \ \ | |/ / |/| |
| * | Do not validate return code is set is successfulVictor Dubiniuk2016-12-161-1/+3
|/ /
* | Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgradeLukas Reschke2016-12-168-25/+159
|\ \
| * | Clear appstore cache on version upgradeRoeland Jago Douma2016-12-158-25/+159
* | | Merge pull request #2504 from nextcloud/downstream-ldap-15Roeland Jago Douma2016-12-161-22/+122
|\ \ \
| * | | adjust: sanitizeDN resides in HelperArthur Schiwon2016-12-051-1/+1
| * | | Extract lowercase conversion out of the loopJuan Pablo Villafáñez2016-12-051-1/+2
| * | | range support for LDAP read operationsArthur Schiwon2016-12-051-22/+121
* | | | Merge pull request #2550 from nextcloud/smb-notify-renameLukas Reschke2016-12-161-3/+5
|\ \ \ \
| * | | | Fix order of parameters when getting notified of smb renamesRobin Appelman2016-12-071-3/+5
* | | | | Merge pull request #2714 from amittel/patch-1Lukas Reschke2016-12-161-1/+1
|\ \ \ \ \
| * | | | | Changed anchoramittel2016-12-161-1/+1
* | | | | | Merge pull request #1678 from nextcloud/smb-stat-rootLukas Reschke2016-12-161-2/+44
|\ \ \ \ \ \
| * | | | | | Fix mtimes for share rootRobin Appelman2016-10-111-2/+44
* | | | | | | Merge pull request #2398 from nextcloud/fix-2368Lukas Reschke2016-12-162-65/+157
|\ \ \ \ \ \ \
| * | | | | | | fix rendering for mail sharesArthur Schiwon2016-12-081-2/+5
| * | | | | | | disable checkboxes during save op to avoid race conditionsArthur Schiwon2016-12-082-2/+17
| * | | | | | | fix some coding style and stricter comparisons, makes scrutinizer happierArthur Schiwon2016-12-082-4/+4