summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix minor issuesChristoph Wurst2016-12-197-15/+45
* push activity when backup codes are generatedChristoph Wurst2016-12-195-4/+123
* Publish, parse and filter 2FA activitiesChristoph Wurst2016-12-199-2/+516
* 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
| * | | | | | also handle can-edit changeArthur Schiwon2016-12-081-0/+5
| * | | | | | flicker-free permission change in share dialogArthur Schiwon2016-12-082-63/+132
* | | | | | | Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activityLukas Reschke2016-12-169-11/+13
|\ \ \ \ \ \ \
| * | | | | | | Remove leading slash from sharing activityJoas Schilling2016-12-159-11/+13
* | | | | | | | Merge pull request #2715 from nextcloud/fix_dav_toto_testsRoeland Jago Douma2016-12-161-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix TodoTestRoeland Jago Douma2016-12-161-3/+3
|/ / / / / / /
* | | | | | | Merge pull request #2625 from nextcloud/fix-todo-filterRoeland Jago Douma2016-12-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix the Todos filterJoas Schilling2016-12-121-1/+1
* | | | | | | | Merge pull request #2681 from nextcloud/changes-to-changelogRoeland Jago Douma2016-12-161-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | let's add a date :DJos Poortvliet2016-12-151-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-lea...Lukas Reschke2016-12-152-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Don't disable apps on update if PHP >= 7.0.0Lukas Reschke2016-12-152-1/+7
| |/ / / / / /
* | | | | | | Merge pull request #2673 from nextcloud/shared-scanner-unmaskedLukas Reschke2016-12-154-3/+57
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add integration tests for uploading files to a permission limited shareRobin Appelman2016-12-151-0/+20