Commit Graph

36339 Commits

Author SHA1 Message Date
Joas Schilling 03b648be13 Merge pull request #2643 from nextcloud/apps-buttons-wording
fix wording for apps mgmt buttons
2016-12-13 15:49:38 +01:00
Lukas Reschke ed7b18799f Merge pull request #2636 from nextcloud/add-repair-step-to-fix-mounts
Add a repair step to fix broken mounts
2016-12-13 14:19:56 +01:00
Lukas Reschke edd01e3ce4 Merge pull request #2637 from nextcloud/mount-cache-storageid
also compare storage ids when checking for changed mounts
2016-12-13 14:02:49 +01:00
Joas Schilling 69575f099c
Update autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 13:56:30 +01:00
Joas Schilling a7aa7de6c2
Add a unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 13:54:18 +01:00
Joas Schilling d5df692481
Add a repair step to fix broken mounts
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 13:54:18 +01:00
Lukas Reschke 3b3ab256a5 Merge pull request #2642 from nextcloud/avatars_class_name
Avatars class name
2016-12-13 13:22:50 +01:00
Jan-Christoph Borchardt 89252497c6 fix wording for apps mgmt buttons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-12-13 13:19:10 +01:00
Lukas Reschke b56a47eba6 Merge pull request #2639 from nextcloud/final-increase-of-version
Final version increasement for 11
2016-12-13 12:59:59 +01:00
Robin Appelman 14a561ddad
always use numeric storage id in cacheentry
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:53:38 +01:00
Robin Appelman 86473306f3
fix cacheentry return wrong storage id
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:50:17 +01:00
Roeland Jago Douma e3d6b4fe1c
Fixed correct filename of MoveAvatarsBackgroundJob
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 12:46:58 +01:00
Roeland Jago Douma df03860e2e Merge pull request #2635 from nextcloud/fix_autoload_checker
Fix autoload checker
2016-12-13 12:46:10 +01:00
Robin Appelman bbe24d29ca
reuse cacheentry
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
Lukas Reschke 72884b45a1
Final version increasement for 11
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-13 12:16:16 +01:00
Robin Appelman 6f46a8bd5b
also compare storage ids when checking for changed mounts
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:11:10 +01:00
Roeland Jago Douma 36da3aa52d
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 12:07:10 +01:00
Roeland Jago Douma 60af938bf6
The hash can change so checking for it is kind of dangerous
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 12:07:07 +01:00
Lukas Reschke e49088315e Merge pull request #2615 from nextcloud/daita-sharecontroller
Download a file in a subfolder in a sharedlink is not working
2016-12-12 18:28:06 +01:00
Maxence Lange 43374292b1 update phpdoc
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
Lukas Reschke e79cd27e5d Merge pull request #2629 from nextcloud/increase-v-1-again
Increase version once again
2016-12-12 18:13:13 +01:00
Lukas Reschke 3f5bbb22d2
Increase version once again
For https://github.com/nextcloud/server/pull/2615

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-12 18:03:49 +01:00
Lukas Reschke ab3ef8a44a Merge pull request #2627 from nextcloud/already-increase-version
Increase version to 11.0.0
2016-12-12 16:40:40 +01:00
Lukas Reschke 6cd421e603 Merge pull request #2620 from nextcloud/theming-externalfiles
Show theming icons on external storage folders
2016-12-12 16:04:48 +01:00
Lukas Reschke 7c1ffe231e
Increase version to 11.0.0
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-12 16:03:17 +01:00
Lukas Reschke f46e02210e Merge pull request #2622 from nextcloud/improve-wording
improve wording of admin settings to enable search on the public address book
2016-12-12 14:49:19 +01:00
Bjoern Schiessle 91303469e0
improve wording of admin settings to enable search on the public address book
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-12 13:55:12 +01:00
Julius Haertl b12db1b494
Show theming icons on external storage folders
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-12 12:18:38 +01:00
Nextcloud bot 0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00
Maxence Lange 9ef8d25e46 Download a file in a subfolder in a sharedlink is not working
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
2016-12-11 18:32:28 -01:00
Lukas Reschke 36717f564e
11.0 RC2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-11 16:34:27 +01:00
Nextcloud bot ea7a69f198
[tx-robot] updated from transifex 2016-12-11 01:07:18 +00:00
Lukas Reschke 4456fa57e0 Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendars
Do not add invites into read-only calendars
2016-12-10 12:22:15 +01:00
Lukas Reschke aedd1fc9a0 Merge pull request #2598 from nextcloud/fix_2403
Check for app updates on disabled page
2016-12-10 12:21:20 +01:00
Nextcloud bot 7cb99e74db
[tx-robot] updated from transifex 2016-12-10 01:07:15 +00:00
Roeland Jago Douma 341265fbcb Merge pull request #2590 from nextcloud/postgres-install-failing
Revert "Quote database and role in queries"
2016-12-09 22:46:03 +01:00
Roeland Jago Douma 4f3f799e06 Merge pull request #2594 from nextcloud/dont-use-cached-info
Don't use cached informations for app version when installing the app
2016-12-09 22:43:21 +01:00
Roeland Jago Douma d59ffb8bf1
Check for app updates on disabled page
Fixes #2403

We need to check for updates of disabled apps so that if you update with
incompatible apps you at least get a chance to upgrade.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-09 22:30:54 +01:00
John Molakvoæ 9dc29aa24f Merge pull request #2596 from nextcloud/nc11-dev-manual-link
Fix dev manual link for NC11
2016-12-09 20:24:08 +01:00
Christoph Wurst fbc494234b Fix dev manual link for NC11
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-09 19:32:16 +01:00
Lukas Reschke 32bf8ec826
Don't use cached informations for app version
When installing an app from the appstore the `\OC_App::getAppVersion` code is triggered twice:

- First when the downloader tries to compare the current version to the new version on the appstore to check if there is a newer version. This protects against downgrade attacks and is implemented in `\OC\Installer::downloadApp`.
- Second, when the app is actually installed the current version is written to the database. (`\OC\Installer::installApp`)

This fails however when the version is actually cached. Because in step 1 the cached version will be set to "0" and then be reused in the second step.

While this is probably not the cleanest version I assume this is an approach that is least invasive. Feedback and suggestions welcome :)

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-09 18:01:45 +01:00
Joas Schilling a5a35cda7c
Lower the role name before using it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-09 16:41:01 +01:00
Morris Jobke 0de83a3a01 Merge pull request #2587 from nextcloud/theming-app-not-loaded
Check if the theming app is loaded
2016-12-09 16:34:33 +01:00
Björn Schießle d10be51d40 Merge pull request #2588 from nextcloud/theming-check-empty
Check if image files for theming are empty
2016-12-09 15:57:44 +01:00
Joas Schilling 0d6134f512
Revert "Quote database and role in queries"
This reverts commit 9ebd5d5bb2.
2016-12-09 15:36:14 +01:00
Joas Schilling de8908bf29 Merge pull request #2584 from nextcloud/theming-filter-fix
Add fallback to FILTER_LANCZOS for icon resizing
2016-12-09 14:53:34 +01:00
Lukas Reschke 49473dee85 Merge pull request #2582 from nextcloud/callback-alos-on-close
Fire callback also on pure closing of prompt dialog
2016-12-09 13:44:53 +01:00
Julius Haertl 5fbadee95f
Check if image files for theming are empty
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 12:54:03 +01:00
Morris Jobke ec52286a0f
Fire callback also on pure closing of prompt dialog
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-09 12:52:46 +01:00
Julius Haertl 086a5eb9d0
Check if the theming app is loaded
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 12:52:17 +01:00