| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix minor issues | Christoph Wurst | 2016-12-19 | 7 | -15/+45 |
| | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | push activity when backup codes are generated | Christoph Wurst | 2016-12-19 | 5 | -4/+123 |
| | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Publish, parse and filter 2FA activities | Christoph Wurst | 2016-12-19 | 9 | -2/+516 |
| | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Merge pull request #2727 from nextcloud/fix-colon-issue | Roeland Jago Douma | 2016-12-19 | 3 | -0/+25 |
| |\ | | | | | [downstream] Fix colon issue | ||||
| | * | Update third-party ref for new sabre/uri version | Lukas Reschke | 2016-12-17 | 1 | -0/+0 |
| | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | Add integration test for creating folder with colon | Vincent Petry | 2016-12-16 | 2 | -0/+25 |
| | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2721 from nextcloud/ocs-die-on-exception | Roeland Jago Douma | 2016-12-19 | 1 | -1/+3 |
| |\ \ | | | | | | | [downstream] Die in OCS v1.php on exception | ||||
| | * | | Die in OCS v1.php on exception | Vincent Petry | 2016-12-16 | 1 | -1/+3 |
| | |/ | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2723 from nextcloud/integrity-exit-code | Roeland Jago Douma | 2016-12-19 | 2 | -0/+6 |
| |\ \ | | | | | | | [downstream] Return 1 if integrity check is failed. Fixes #22806 | ||||
| | * | | Return 1 if integrity check is failed. Fixes #22806 | Victor Dubiniuk | 2016-12-16 | 2 | -0/+6 |
| | |/ | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2726 from nextcloud/check-all-channels | Christoph Wurst | 2016-12-18 | 1 | -7/+3 |
| |\ \ | | | | | | | [downstream] Consider all channel except blank and git to be signed | ||||
| | * | | Consider all channel except blank and git to be signed | Victor Dubiniuk | 2016-12-16 | 1 | -7/+3 |
| | |/ | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2735 from nextcloud/fix-settingsmenu | Christoph Wurst | 2016-12-18 | 1 | -4/+3 |
| |\ \ | | | | | | | Adjust shadows and fix positioning in header menus | ||||
| | * | | Adjust shadows and fix positioning | Julius Haertl | 2016-12-17 | 1 | -4/+3 |
| | |/ | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| * | | Merge pull request #2725 from nextcloud/memcached-connect-once | Roeland Jago Douma | 2016-12-17 | 1 | -10/+11 |
| |\ \ | | | | | | | [downstream] Set options, then add servers | ||||
| | * | | Set options, then add servers | Victor Dubiniuk | 2016-12-16 | 1 | -10/+11 |
| | |/ | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2722 from nextcloud/failed-to-create-share-fix | Roeland Jago Douma | 2016-12-17 | 1 | -1/+1 |
| |\ \ | | | | | | | [downstream] commit transaction after select query | ||||
| | * | | commit transaction after select query | phisch | 2016-12-16 | 1 | -1/+1 |
| | |/ | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2720 from nextcloud/fix-25692 | Roeland Jago Douma | 2016-12-17 | 1 | -1/+3 |
| |\ \ | |/ |/| | [downstream] Do not validate return code is set is successful | ||||
| | * | Do not validate return code is set is successful | Victor Dubiniuk | 2016-12-16 | 1 | -1/+3 |
| |/ | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgrade | Lukas Reschke | 2016-12-16 | 8 | -25/+159 |
| |\ | | | | | Clear appstore cache on version upgrade | ||||
| | * | Clear appstore cache on version upgrade | Roeland Jago Douma | 2016-12-15 | 8 | -25/+159 |
| | | | | | | | | | | | | | | | | | | | * Add version to cached json * Compare version * Updated calls * Updated tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #2504 from nextcloud/downstream-ldap-15 | Roeland Jago Douma | 2016-12-16 | 1 | -22/+122 |
| |\ \ | | | | | | | Downstream LDAP Range Support | ||||
| | * | | adjust: sanitizeDN resides in Helper | Arthur Schiwon | 2016-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | Extract lowercase conversion out of the loop | Juan Pablo Villafáñez | 2016-12-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | range support for LDAP read operations | Arthur Schiwon | 2016-12-05 | 1 | -22/+121 |
| | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | Merge pull request #2550 from nextcloud/smb-notify-rename | Lukas Reschke | 2016-12-16 | 1 | -3/+5 |
| |\ \ \ | | | | | | | | | Fix order of parameters when getting notified of smb renames | ||||
| | * | | | Fix order of parameters when getting notified of smb renames | Robin Appelman | 2016-12-07 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | Merge pull request #2714 from amittel/patch-1 | Lukas Reschke | 2016-12-16 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Changed anchor | ||||
| | * | | | | Changed anchor | amittel | 2016-12-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | from `avatar` to `personal-settings` fixes #2711 | ||||
| * | | | | | Merge pull request #1678 from nextcloud/smb-stat-root | Lukas Reschke | 2016-12-16 | 1 | -2/+44 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix mtimes for share root | ||||
| | * | | | | | Fix mtimes for share root | Robin Appelman | 2016-10-11 | 1 | -2/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | Merge pull request #2398 from nextcloud/fix-2368 | Lukas Reschke | 2016-12-16 | 2 | -65/+157 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | flicker-free permission change in share dialog | ||||
| | * | | | | | | fix rendering for mail shares | Arthur Schiwon | 2016-12-08 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | | | | disable checkboxes during save op to avoid race conditions | Arthur Schiwon | 2016-12-08 | 2 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | | | | fix some coding style and stricter comparisons, makes scrutinizer happier | Arthur Schiwon | 2016-12-08 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | | | | also handle can-edit change | Arthur Schiwon | 2016-12-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| | * | | | | | | flicker-free permission change in share dialog | Arthur Schiwon | 2016-12-08 | 2 | -63/+132 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | | | | Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity | Lukas Reschke | 2016-12-16 | 9 | -11/+13 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove leading slash from sharing activity | ||||
| | * | | | | | | | Remove leading slash from sharing activity | Joas Schilling | 2016-12-15 | 9 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | | | | Merge pull request #2715 from nextcloud/fix_dav_toto_tests | Roeland Jago Douma | 2016-12-16 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Fix TodoTest | ||||
| | * | | | | | | | Fix TodoTest | Roeland Jago Douma | 2016-12-16 | 1 | -3/+3 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | | | Merge pull request #2625 from nextcloud/fix-todo-filter | Roeland Jago Douma | 2016-12-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix the Todos filter | ||||
| | * | | | | | | | Fix the Todos filter | Joas Schilling | 2016-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | | | | Merge pull request #2681 from nextcloud/changes-to-changelog | Roeland Jago Douma | 2016-12-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | let's add a date :D | ||||
| | * | | | | | | | let's add a date :D | Jos Poortvliet | 2016-12-15 | 1 | -1/+1 |
| | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | | | Merge pull request #2698 from ↵ | Lukas Reschke | 2016-12-15 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dont-disable-apps-on-update-if-at-least-php7 Don't disable apps on update if PHP >= 7.0.0 | ||||
| | * | | | | | | | Don't disable apps on update if PHP >= 7.0.0 | Lukas Reschke | 2016-12-15 | 2 | -1/+7 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When PHP in a version higher than 7.0.0 is used we catch fatal exceptions in app.php and gracefully already disable the app. There is thus no need to also disable the apps on updates. This has been requested by Jan to fix because that is "the most annoying thing ever" :TM:. – I'd say we give it a try and if that causes problems in the future we can consider alternative approaches. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | | | | Merge pull request #2673 from nextcloud/shared-scanner-unmasked | Lukas Reschke | 2016-12-15 | 4 | -3/+57 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | use unmasked permissions in shared scanner | ||||
| | * | | | | | | Add integration tests for uploading files to a permission limited share | Robin Appelman | 2016-12-15 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |