]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoChange 2FA activities to more generic security activities
Christoph Wurst [Tue, 16 May 2017 07:37:21 +0000 (09:37 +0200)]
Change 2FA activities to more generic security activities

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMerge pull request #4812 from nextcloud/move-sharing-to-migration
Björn Schießle [Thu, 18 May 2017 16:24:43 +0000 (18:24 +0200)]
Merge pull request #4812 from nextcloud/move-sharing-to-migration

Move the file sharing app to migration

7 years agoMerge pull request #4939 from nextcloud/add-share-name-column
Björn Schießle [Thu, 18 May 2017 16:10:32 +0000 (18:10 +0200)]
Merge pull request #4939 from nextcloud/add-share-name-column

Add the column so we keep the value from before the update

7 years agoAdd the column so we keep the value from before the update 4939/head
Joas Schilling [Thu, 18 May 2017 12:28:27 +0000 (14:28 +0200)]
Add the column so we keep the value from before the update

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 18 May 2017 00:07:48 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4929 from nextcloud/beta-4 v12.0.0beta4
Lukas Reschke [Wed, 17 May 2017 22:02:27 +0000 (00:02 +0200)]
Merge pull request #4929 from nextcloud/beta-4

12.0.0 Beta 4

7 years agoMerge pull request #4892 from nextcloud/fix/encryption-remembered-login-hook
Lukas Reschke [Wed, 17 May 2017 20:21:09 +0000 (22:21 +0200)]
Merge pull request #4892 from nextcloud/fix/encryption-remembered-login-hook

Fix encryption + remembered login due to missing login hook

7 years agoMerge pull request #4921 from nextcloud/filerow-clickability
Lukas Reschke [Wed, 17 May 2017 20:15:46 +0000 (22:15 +0200)]
Merge pull request #4921 from nextcloud/filerow-clickability

Increase width of clickable area in file row to open file/folder

7 years ago12.0.0 Beta 4 4929/head
Lukas Reschke [Wed, 17 May 2017 20:14:23 +0000 (22:14 +0200)]
12.0.0 Beta 4

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4923 from nextcloud/backgroundjobs-wording
Lukas Reschke [Wed, 17 May 2017 18:38:03 +0000 (20:38 +0200)]
Merge pull request #4923 from nextcloud/backgroundjobs-wording

Change cron wording to background jobs

7 years agoMerge pull request #4926 from nextcloud/remove-saml-from-shipped-apps
Lukas Reschke [Wed, 17 May 2017 18:37:24 +0000 (20:37 +0200)]
Merge pull request #4926 from nextcloud/remove-saml-from-shipped-apps

user_saml is shipped via appstore

7 years agoMerge pull request #4927 from nextcloud/bump-dom-purify-release
Lukas Reschke [Wed, 17 May 2017 18:37:03 +0000 (20:37 +0200)]
Merge pull request #4927 from nextcloud/bump-dom-purify-release

Bump DOMPurify version to 0.8.9

7 years agoBump DOMPurify version to 0.8.9 4927/head
Lukas Reschke [Wed, 17 May 2017 16:23:21 +0000 (18:23 +0200)]
Bump DOMPurify version to 0.8.9

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4924 from nextcloud/shadow-style
Lukas Reschke [Wed, 17 May 2017 16:21:01 +0000 (18:21 +0200)]
Merge pull request #4924 from nextcloud/shadow-style

Unify box-shadow style, remove filter

7 years agouser_saml is shipped via appstore 4926/head
Lukas Reschke [Wed, 17 May 2017 16:05:06 +0000 (18:05 +0200)]
user_saml is shipped via appstore

Keeping it in the shipped.json leads to odd side-effects such as https://help.nextcloud.com/t/earn-a-t-shirt-by-testing-nextcloud-12-beta-2/12374/41?u=lukasreschke in case a previous version was installed.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 17 May 2017 15:56:32 +0000 (15:56 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4922 from nextcloud/verbose-uploadmenu-text
Morris Jobke [Wed, 17 May 2017 15:48:52 +0000 (10:48 -0500)]
Merge pull request #4922 from nextcloud/verbose-uploadmenu-text

Use more verbose text for upload menu

7 years agoMerge pull request #4918 from nextcloud/theming-capabilities-plain-background
Morris Jobke [Wed, 17 May 2017 15:42:41 +0000 (10:42 -0500)]
Merge pull request #4918 from nextcloud/theming-capabilities-plain-background

OCS Return color when theming uses no background image

7 years agoMerge pull request #4887 from nextcloud/theming-appdata-fix
Morris Jobke [Wed, 17 May 2017 15:38:50 +0000 (10:38 -0500)]
Merge pull request #4887 from nextcloud/theming-appdata-fix

Use appdata logo when generating icons

7 years agoReturn color when theming uses no background image 4918/head
Julius Härtl [Wed, 17 May 2017 11:16:44 +0000 (13:16 +0200)]
Return color when theming uses no background image

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoFix tests 4887/head
Julius Härtl [Wed, 17 May 2017 08:16:59 +0000 (10:16 +0200)]
Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoUse appdata logo when generating icons
Julius Härtl [Sun, 14 May 2017 21:52:14 +0000 (23:52 +0200)]
Use appdata logo when generating icons

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 17 May 2017 00:08:09 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4767 from nextcloud/app-code-checker
Morris Jobke [Tue, 16 May 2017 21:20:27 +0000 (16:20 -0500)]
Merge pull request #4767 from nextcloud/app-code-checker

Check language files and database schema with app code checker

7 years agoImplement skip checkers and log the currently tested app 4767/head
Morris Jobke [Tue, 16 May 2017 21:18:02 +0000 (16:18 -0500)]
Implement skip checkers and log the currently tested app

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4911 from nextcloud/public-link-button
Morris Jobke [Tue, 16 May 2017 20:12:54 +0000 (15:12 -0500)]
Merge pull request #4911 from nextcloud/public-link-button

Remove primary class from public link download button

7 years agoChange cron wording to background jobs 4923/head
Jan-Christoph Borchardt [Tue, 16 May 2017 19:12:28 +0000 (21:12 +0200)]
Change cron wording to background jobs

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoUnify box-shadow style, remove filter 4924/head
Jan-Christoph Borchardt [Tue, 16 May 2017 19:08:44 +0000 (21:08 +0200)]
Unify box-shadow style, remove filter

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoUse more verbose text for upload menu 4922/head
Jan-Christoph Borchardt [Tue, 16 May 2017 19:06:05 +0000 (21:06 +0200)]
Use more verbose text for upload menu

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoIncrease width of clickable area in file row to open file/folder 4921/head
Jan-Christoph Borchardt [Tue, 16 May 2017 19:04:43 +0000 (21:04 +0200)]
Increase width of clickable area in file row to open file/folder

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoRemove primary class from public link download button 4911/head
Jan-Christoph Borchardt [Tue, 16 May 2017 18:47:52 +0000 (20:47 +0200)]
Remove primary class from public link download button

7 years agoMerge pull request #4900 from nextcloud/fix-search-mime-icons
Christoph Wurst [Tue, 16 May 2017 18:04:33 +0000 (20:04 +0200)]
Merge pull request #4900 from nextcloud/fix-search-mime-icons

Use proper mime icons for search results

7 years agoMerge pull request #4907 from nextcloud/mention-bog
Lukas Reschke [Tue, 16 May 2017 15:52:58 +0000 (17:52 +0200)]
Merge pull request #4907 from nextcloud/mention-bog

Add some ignores

7 years agoAdd some ignores 4907/head
Morris Jobke [Tue, 16 May 2017 15:48:36 +0000 (10:48 -0500)]
Add some ignores

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4906 from nextcloud/use-review-requested-feature
Morris Jobke [Tue, 16 May 2017 15:47:27 +0000 (10:47 -0500)]
Merge pull request #4906 from nextcloud/use-review-requested-feature

Use reviews instead of comments

7 years agoUse reviews instead of comments 4906/head
Lukas Reschke [Tue, 16 May 2017 15:46:18 +0000 (17:46 +0200)]
Use reviews instead of comments

Allows using stuff such as https://github.com/nextcloud/server/pulls/review-requested/LukasReschke

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4893 from nextcloud/fix_4886
Morris Jobke [Tue, 16 May 2017 15:30:59 +0000 (10:30 -0500)]
Merge pull request #4893 from nextcloud/fix_4886

Cache deps list to memcache on write not on first read

7 years agoMerge pull request #4666 from nextcloud/enable-redis-cluster
Morris Jobke [Tue, 16 May 2017 15:10:25 +0000 (10:10 -0500)]
Merge pull request #4666 from nextcloud/enable-redis-cluster

Add redis cluster tests to our CI jobs

7 years agoMerge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user
Lukas Reschke [Tue, 16 May 2017 14:29:09 +0000 (16:29 +0200)]
Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user

Make it clear that you can now click on usernames

7 years agoSkip the code checking for now
Joas Schilling [Thu, 11 May 2017 07:52:55 +0000 (09:52 +0200)]
Skip the code checking for now

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix return code handling
Joas Schilling [Wed, 10 May 2017 12:56:16 +0000 (14:56 +0200)]
Fix return code handling

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRun the app checker on all apps
Joas Schilling [Wed, 10 May 2017 11:54:36 +0000 (13:54 +0200)]
Run the app checker on all apps

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoWe don't use the prefix on index names
Joas Schilling [Wed, 10 May 2017 10:35:14 +0000 (12:35 +0200)]
We don't use the prefix on index names

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix apps without translations
Joas Schilling [Tue, 9 May 2017 15:22:59 +0000 (17:22 +0200)]
Fix apps without translations

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoCheck the name length of database items
Joas Schilling [Tue, 9 May 2017 14:49:56 +0000 (16:49 +0200)]
Check the name length of database items

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoCheck the syntax of the language file
Joas Schilling [Tue, 9 May 2017 13:46:33 +0000 (15:46 +0200)]
Check the syntax of the language file

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse proper mime icons for search results 4900/head
Julius Härtl [Tue, 16 May 2017 12:26:44 +0000 (14:26 +0200)]
Use proper mime icons for search results

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoMerge pull request #4865 from nextcloud/improve-two-factor-buttons
Roeland Jago Douma [Tue, 16 May 2017 11:11:55 +0000 (13:11 +0200)]
Merge pull request #4865 from nextcloud/improve-two-factor-buttons

Improve layout of buttons for two factor auth

7 years agoDo not scan for keys just get all the keys (with prefix) 4666/head
Roeland Jago Douma [Tue, 16 May 2017 07:52:05 +0000 (09:52 +0200)]
Do not scan for keys just get all the keys (with prefix)

Apparently scan leads to some issues sometimes on cluster. So just use
the get function to fetch the keys.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4889 from nextcloud/fix-contactsmenu-overflow
Roeland Jago Douma [Tue, 16 May 2017 07:19:34 +0000 (09:19 +0200)]
Merge pull request #4889 from nextcloud/fix-contactsmenu-overflow

Fix contacts menu overflow for few entries, fix #4744

7 years agoCache deps list to memcache on write not on first read 4893/head
Roeland Jago Douma [Tue, 16 May 2017 07:01:20 +0000 (09:01 +0200)]
Cache deps list to memcache on write not on first read

Fixes #4886

Caching on first read leads to the bug that if the files are updated we
will never cache again. Since we will always fetch from the memcache
(which works) and then see that the files are newer.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix encryption + remembered login due to missing login hook 4892/head
Christoph Wurst [Tue, 16 May 2017 06:41:11 +0000 (08:41 +0200)]
Fix encryption + remembered login due to missing login hook

The encryption app relies on the post_login hook to initialize its keys.
Since we do not emit it on a remembered login, the keys were always un-
initialized and the user was asked to log out and in again.
This patch *translates* the postRememberedLogin hook to a post_login
hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMerge pull request #4425 from nextcloud/oci
Morris Jobke [Tue, 16 May 2017 04:55:50 +0000 (23:55 -0500)]
Merge pull request #4425 from nextcloud/oci

Primary key is too long for oracle

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 16 May 2017 00:08:08 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoFix contacts menu overflow for few entries, fix #4744 4889/head
Jan-Christoph Borchardt [Mon, 15 May 2017 23:08:49 +0000 (01:08 +0200)]
Fix contacts menu overflow for few entries, fix #4744

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoRename the index so the name is unique until the old table is deleted 4425/head
Joas Schilling [Mon, 15 May 2017 10:42:04 +0000 (12:42 +0200)]
Rename the index so the name is unique until the old table is deleted

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd a update step that copies all the backup codes
Joas Schilling [Tue, 9 May 2017 15:16:03 +0000 (17:16 +0200)]
Add a update step that copies all the backup codes

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRename the table to a valid name
Joas Schilling [Tue, 9 May 2017 14:59:18 +0000 (16:59 +0200)]
Rename the table to a valid name

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4881 from nextcloud/sign-off-check v12.0.0beta3
Roeland Jago Douma [Mon, 15 May 2017 20:18:27 +0000 (22:18 +0200)]
Merge pull request #4881 from nextcloud/sign-off-check

Run sign-off check as last check

7 years agoMerge pull request #4884 from nextcloud/beta-3
Lukas Reschke [Mon, 15 May 2017 20:09:43 +0000 (22:09 +0200)]
Merge pull request #4884 from nextcloud/beta-3

Bump to 12.0.0 beta 3

7 years agoBump to 12.0.0 beta 3 4884/head
Lukas Reschke [Mon, 15 May 2017 18:25:17 +0000 (20:25 +0200)]
Bump to 12.0.0 beta 3

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4883 from nextcloud/revert-4685-fix_4683
Morris Jobke [Mon, 15 May 2017 17:43:36 +0000 (12:43 -0500)]
Merge pull request #4883 from nextcloud/revert-4685-fix_4683

Revert "fix permissions of mountpoints - take 2"

7 years agoRevert "fix permissions of mountpoints - take 2" 4883/head
Morris Jobke [Mon, 15 May 2017 17:43:25 +0000 (12:43 -0500)]
Revert "fix permissions of mountpoints - take 2"

7 years agoMerge pull request #4685 from nextcloud/fix_4683
Morris Jobke [Mon, 15 May 2017 16:53:59 +0000 (11:53 -0500)]
Merge pull request #4685 from nextcloud/fix_4683

fix permissions of mountpoints - take 2

7 years agoImprove layout of buttons for two factor auth 4865/head
Morris Jobke [Mon, 15 May 2017 03:19:09 +0000 (22:19 -0500)]
Improve layout of buttons for two factor auth

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion
Morris Jobke [Mon, 15 May 2017 16:03:33 +0000 (11:03 -0500)]
Merge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion

Remove more personal info on user deletion

7 years agoMerge pull request #4867 from nextcloud/kill-install-app
Lukas Reschke [Mon, 15 May 2017 16:01:12 +0000 (18:01 +0200)]
Merge pull request #4867 from nextcloud/kill-install-app

Remove OC_App:installApp

7 years agoRun sign-off check as last check 4881/head
Morris Jobke [Mon, 15 May 2017 16:01:06 +0000 (11:01 -0500)]
Run sign-off check as last check

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4810 from nextcloud/downstream-27668
Morris Jobke [Mon, 15 May 2017 15:56:18 +0000 (10:56 -0500)]
Merge pull request #4810 from nextcloud/downstream-27668

Fix mimetype update query

7 years agoMerge pull request #4877 from nextcloud/oc-group-is-gone
Morris Jobke [Mon, 15 May 2017 14:51:42 +0000 (09:51 -0500)]
Merge pull request #4877 from nextcloud/oc-group-is-gone

Remove OC_Group call

7 years agoMerge pull request #4847 from nextcloud/throw-exception-if-password-not-avail
Morris Jobke [Mon, 15 May 2017 14:50:28 +0000 (09:50 -0500)]
Merge pull request #4847 from nextcloud/throw-exception-if-password-not-avail

Throws exception if password not available

7 years agoMerge pull request #4873 from nextcloud/check-whether-REQUEST-exists
Morris Jobke [Mon, 15 May 2017 14:49:11 +0000 (09:49 -0500)]
Merge pull request #4873 from nextcloud/check-whether-REQUEST-exists

Check whether the $_SERVER['REQUEST_*'] vars exist before using them

7 years agoMerge pull request #4872 from nextcloud/os-rename
Morris Jobke [Mon, 15 May 2017 14:12:55 +0000 (09:12 -0500)]
Merge pull request #4872 from nextcloud/os-rename

Revert "fix objectstore rename"

7 years agoupdate comment to code 4685/head
Robin Appelman [Mon, 15 May 2017 13:54:37 +0000 (15:54 +0200)]
update comment to code

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoRemove OC_Group call 4877/head
Lukas Reschke [Mon, 15 May 2017 12:52:40 +0000 (14:52 +0200)]
Remove OC_Group call

OC_Group has been removed in March with https://github.com/nextcloud/server/pull/4867, the check in question is also performed two lines below already.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoCheck whether the $_SERVER['REQUEST_*'] vars exist before using them 4873/head
Joas Schilling [Mon, 15 May 2017 12:33:27 +0000 (14:33 +0200)]
Check whether the $_SERVER['REQUEST_*'] vars exist before using them

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4805 from nextcloud/enforce-upgrade-for-big-instances
Lukas Reschke [Mon, 15 May 2017 12:28:28 +0000 (14:28 +0200)]
Merge pull request #4805 from nextcloud/enforce-upgrade-for-big-instances

Allow to enforce update via web UI

7 years agoUpdate autoloader map 4847/head
Lukas Reschke [Mon, 15 May 2017 12:24:44 +0000 (14:24 +0200)]
Update autoloader map

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4866 from nextcloud/login-footer-bold-link
Lukas Reschke [Mon, 15 May 2017 12:22:19 +0000 (14:22 +0200)]
Merge pull request #4866 from nextcloud/login-footer-bold-link

Bold link in footer on login page

7 years agoRevert "fix objectstore rename" 4872/head
Roeland Jago Douma [Mon, 15 May 2017 11:59:18 +0000 (13:59 +0200)]
Revert "fix objectstore rename"

This reverts commit 5334a3dc337b5883763ac8e1eaef58c1a435144b.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoRemove account data on user deletion 4871/head
Joas Schilling [Mon, 15 May 2017 11:30:52 +0000 (13:30 +0200)]
Remove account data on user deletion

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRemove 2FA backup codes on user deletion
Joas Schilling [Mon, 15 May 2017 11:19:44 +0000 (13:19 +0200)]
Remove 2FA backup codes on user deletion

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4862 from coderkun/issue-440-localhost-regex
Joas Schilling [Mon, 15 May 2017 10:45:39 +0000 (12:45 +0200)]
Merge pull request #4862 from coderkun/issue-440-localhost-regex

Add IPv6 to “localhost” regex (#440)

7 years agoFix variable names 4810/head
Joas Schilling [Mon, 15 May 2017 10:38:30 +0000 (12:38 +0200)]
Fix variable names

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRemove OC_App:installApp 4867/head
Morris Jobke [Mon, 15 May 2017 05:03:35 +0000 (00:03 -0500)]
Remove OC_App:installApp

* uses Installer->installApp now
* removes unused code
* fixes #4453
* added some additional checks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoBold link in footer on login page 4866/head
Morris Jobke [Mon, 15 May 2017 03:26:10 +0000 (22:26 -0500)]
Bold link in footer on login page

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 15 May 2017 00:08:14 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoAdd IPv6 to “localhost” regex (#440) 4862/head
coderkun [Sun, 14 May 2017 19:22:13 +0000 (21:22 +0200)]
Add IPv6 to “localhost” regex (#440)

Signed-off-by: Oliver Hanraths <olli@coderkun.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 14 May 2017 00:07:54 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 13 May 2017 00:08:00 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoThows exception if password not available
Morris Jobke [Fri, 12 May 2017 17:53:29 +0000 (12:53 -0500)]
Thows exception if password not available

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4816 from nextcloud/Ardinis-quota-files_external
Morris Jobke [Fri, 12 May 2017 16:33:54 +0000 (11:33 -0500)]
Merge pull request #4816 from nextcloud/Ardinis-quota-files_external

Correctly calculate used space for quota with external storage

7 years agofix quota tests for external storage 4816/head
Morris Jobke [Thu, 11 May 2017 16:35:48 +0000 (11:35 -0500)]
fix quota tests for external storage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoCorrectly calculate used space for quota with external storage
Ardinis [Sun, 16 Apr 2017 00:32:14 +0000 (02:32 +0200)]
Correctly calculate used space for quota with external storage

issue #4348

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4829 from nextcloud/theming-preview-click
Morris Jobke [Fri, 12 May 2017 15:22:20 +0000 (10:22 -0500)]
Merge pull request #4829 from nextcloud/theming-preview-click

Clicking on theming preview triggers fileupload dialog

7 years agoMerge pull request #4809 from nextcloud/downstream-27676
Lukas Reschke [Fri, 12 May 2017 10:39:07 +0000 (12:39 +0200)]
Merge pull request #4809 from nextcloud/downstream-27676

Disable reset password link

7 years agoMerge pull request #4825 from nextcloud/add-timeout-appstore
Lukas Reschke [Fri, 12 May 2017 10:37:18 +0000 (12:37 +0200)]
Merge pull request #4825 from nextcloud/add-timeout-appstore

Add timeout for requests to appstore

7 years agoMerge pull request #4822 from nextcloud/fix-input-size
Lukas Reschke [Fri, 12 May 2017 10:31:30 +0000 (12:31 +0200)]
Merge pull request #4822 from nextcloud/fix-input-size

Fix size of enforced expiry date input

7 years agoMerge pull request #4824 from nextcloud/log-connection-problems-appfetcher
Lukas Reschke [Fri, 12 May 2017 10:30:17 +0000 (12:30 +0200)]
Merge pull request #4824 from nextcloud/log-connection-problems-appfetcher

Log connectiong problems while fetching data from appstore

7 years agoFix unit tests 4824/head
Joas Schilling [Fri, 12 May 2017 08:02:15 +0000 (10:02 +0200)]
Fix unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>