]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoAdd mimetypes for jp2 and webp
Stefan Weil [Sun, 23 Apr 2017 14:40:42 +0000 (16:40 +0200)]
Add mimetypes for jp2 and webp

Those image formats can be processed by Tesseract, so they are needed
for improved Nextcloud OCR.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
7 years agoMerge pull request #4494 from nextcloud/fix-jsunit
Morris Jobke [Tue, 25 Apr 2017 15:45:52 +0000 (12:45 -0300)]
Merge pull request #4494 from nextcloud/fix-jsunit

Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher

7 years agoMerge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion
Joas Schilling [Tue, 25 Apr 2017 14:14:52 +0000 (16:14 +0200)]
Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion

Audit group creation/deletion

7 years agoMerge pull request #3531 from nextcloud/theming-scss
Morris Jobke [Tue, 25 Apr 2017 13:56:13 +0000 (10:56 -0300)]
Merge pull request #3531 from nextcloud/theming-scss

Theming using SCSS variables

7 years agoMerge pull request #4485 from nextcloud/translation-checker
Morris Jobke [Tue, 25 Apr 2017 13:46:51 +0000 (10:46 -0300)]
Merge pull request #4485 from nextcloud/translation-checker

Check whether we can json decode the translations

7 years agoFix JS unit failure because of Jasmine 2.6 and the phantomjs launcher 4494/head
Morris Jobke [Tue, 25 Apr 2017 13:26:46 +0000 (10:26 -0300)]
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3195 from nextcloud/settings-apps-tabular
Morris Jobke [Tue, 25 Apr 2017 13:25:29 +0000 (10:25 -0300)]
Merge pull request #3195 from nextcloud/settings-apps-tabular

Make apps settings tabular

7 years agoLoop over the apps directory and add the task 4485/head
Joas Schilling [Tue, 25 Apr 2017 12:35:51 +0000 (14:35 +0200)]
Loop over the apps directory and add the task

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4462 from danxuliu/fix-sharing-password-protected-link
Roeland Jago Douma [Tue, 25 Apr 2017 12:12:44 +0000 (14:12 +0200)]
Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link

Fix sharing a password protected link

7 years agoMerge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login
blizzz [Tue, 25 Apr 2017 11:15:53 +0000 (13:15 +0200)]
Merge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login

Fix remember redirect_url on failed login attempts

7 years ago4190 4490/head
Roger Szabo [Tue, 25 Apr 2017 11:06:49 +0000 (19:06 +0800)]
4190

Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years agoMock it 3531/head
Joas Schilling [Tue, 25 Apr 2017 10:16:07 +0000 (12:16 +0200)]
Mock it

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoLogo and background URLs must be relative
Joas Schilling [Mon, 24 Apr 2017 10:15:28 +0000 (12:15 +0200)]
Logo and background URLs must be relative

They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix theming tests
Julius Härtl [Mon, 24 Apr 2017 08:50:24 +0000 (10:50 +0200)]
Fix theming tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoUse theming cachebuster for server resources
Julius Härtl [Sat, 22 Apr 2017 09:57:08 +0000 (11:57 +0200)]
Use theming cachebuster for server resources

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoImplement scss variable injection by OC_Defaults
Julius Haertl [Fri, 17 Feb 2017 15:42:07 +0000 (16:42 +0100)]
Implement scss variable injection by OC_Defaults

Signed-off-by: Julius Haertl <jus@bitgrid.net>
Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>
Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>
MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix invalid character
Joas Schilling [Tue, 25 Apr 2017 09:06:27 +0000 (11:06 +0200)]
Fix invalid character

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoCheck whether we can json decode the translations
Joas Schilling [Tue, 25 Apr 2017 09:01:34 +0000 (11:01 +0200)]
Check whether we can json decode the translations

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix remember redirect_url on failed login attempts 4484/head
Christoph Wurst [Tue, 25 Apr 2017 07:38:19 +0000 (09:38 +0200)]
Fix remember redirect_url on failed login attempts

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 25 Apr 2017 00:07:30 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoFix app icon being inverted for app store apps too 3195/head
Jan-Christoph Borchardt [Mon, 24 Apr 2017 22:20:12 +0000 (00:20 +0200)]
Fix app icon being inverted for app store apps too

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoShow spinner until app store images loaded
Jan-Christoph Borchardt [Mon, 24 Apr 2017 21:52:07 +0000 (23:52 +0200)]
Show spinner until app store images loaded

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoShow placeholder for image-less apps in app management
Jan-Christoph Borchardt [Mon, 24 Apr 2017 21:49:04 +0000 (23:49 +0200)]
Show placeholder for image-less apps in app management

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoCenter spinner in apps management
Jan-Christoph Borchardt [Mon, 24 Apr 2017 21:13:46 +0000 (23:13 +0200)]
Center spinner in apps management

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAdd installed category in AppSettingsControlerTest
Felix A. Epp [Thu, 6 Apr 2017 11:10:42 +0000 (13:10 +0200)]
Add installed category in AppSettingsControlerTest

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoMake svgs more fluid and consistent remove action, instead of 'remove app'
Felix A. Epp [Wed, 5 Apr 2017 20:12:49 +0000 (22:12 +0200)]
Make svgs more fluid and consistent remove action, instead of 'remove app'

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agorename Uninstall to Remove
Jan-Christoph Borchardt [Tue, 28 Mar 2017 23:41:53 +0000 (01:41 +0200)]
rename Uninstall to Remove

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoalso improve layout of apps from store
Jan-Christoph Borchardt [Tue, 28 Mar 2017 23:35:18 +0000 (01:35 +0200)]
also improve layout of apps from store

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoRevert "Add Minor styling improvements with opacity instead of grey"
Jan-Christoph Borchardt [Tue, 28 Mar 2017 23:13:48 +0000 (01:13 +0200)]
Revert "Add Minor styling improvements with opacity instead of grey"

This reverts commit e9f8a15692ccd4690eef9d4268343d59aa8491ea.

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agofix sizing and alignment of your app list
Jan-Christoph Borchardt [Tue, 28 Mar 2017 23:12:46 +0000 (01:12 +0200)]
fix sizing and alignment of your app list

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agohide app version and level on narrower screens
Jan-Christoph Borchardt [Tue, 28 Mar 2017 21:55:11 +0000 (23:55 +0200)]
hide app version and level on narrower screens

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoimprove wording of Apps mgmt navigation entries
Jan-Christoph Borchardt [Tue, 28 Mar 2017 20:17:31 +0000 (22:17 +0200)]
improve wording of Apps mgmt navigation entries

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAdd Minor styling improvements with opacity instead of grey
Felix A. Epp [Mon, 27 Mar 2017 14:55:12 +0000 (16:55 +0200)]
Add Minor styling improvements with opacity instead of grey

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoFix spacing between enbale-groups label and select2
Felix A. Epp [Mon, 23 Jan 2017 16:48:37 +0000 (17:48 +0100)]
Fix spacing between enbale-groups label and select2

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoFix uninstall in tabular view
Felix A. Epp [Mon, 23 Jan 2017 15:29:16 +0000 (16:29 +0100)]
Fix uninstall in tabular view

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoFix app-icon opacity and positioing
Felix A. Epp [Sun, 22 Jan 2017 21:16:12 +0000 (22:16 +0100)]
Fix app-icon opacity and positioing

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoAdd a link to the appstore page in the installed apps settings categories
Felix A. Epp [Sun, 22 Jan 2017 15:32:10 +0000 (16:32 +0100)]
Add a link to the appstore page in the installed apps settings categories

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoAdd apps category 'all installed'
Felix A. Epp [Sat, 21 Jan 2017 16:10:08 +0000 (17:10 +0100)]
Add apps category 'all installed'

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoMake enabled and disabled apps a tabular list
Felix A. Epp [Sat, 21 Jan 2017 16:06:26 +0000 (17:06 +0100)]
Make enabled and disabled apps a tabular list

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoUse "complete" callback in onPasswordEntered 4462/head
Daniel Calviño Sánchez [Mon, 24 Apr 2017 20:18:52 +0000 (22:18 +0200)]
Use "complete" callback in onPasswordEntered

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoExtract common ajax call for addShare and updateShare
Daniel Calviño Sánchez [Mon, 24 Apr 2017 20:07:08 +0000 (22:07 +0200)]
Extract common ajax call for addShare and updateShare

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoDocument options parameter in saveLinkShare
Daniel Calviño Sánchez [Mon, 24 Apr 2017 20:05:34 +0000 (22:05 +0200)]
Document options parameter in saveLinkShare

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAdd "complete" callback support for addShare
Daniel Calviño Sánchez [Mon, 24 Apr 2017 19:31:53 +0000 (21:31 +0200)]
Add "complete" callback support for addShare

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAdd "complete" callback support for updateShare
Daniel Calviño Sánchez [Mon, 24 Apr 2017 19:18:29 +0000 (21:18 +0200)]
Add "complete" callback support for updateShare

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAdd missing unit test cases and conditions
Daniel Calviño Sánchez [Mon, 24 Apr 2017 19:16:28 +0000 (21:16 +0200)]
Add missing unit test cases and conditions

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoMerge pull request #4472 from nextcloud/downstream-27714
Roeland Jago Douma [Mon, 24 Apr 2017 17:44:57 +0000 (19:44 +0200)]
Merge pull request #4472 from nextcloud/downstream-27714

Allow apps to register plugins for the user management

7 years agoMerge pull request #4477 from danxuliu/acceptance-macos-nitpicking
Roeland Jago Douma [Mon, 24 Apr 2017 17:30:03 +0000 (19:30 +0200)]
Merge pull request #4477 from danxuliu/acceptance-macos-nitpicking

Fix minor code style issues in acceptance test runner

7 years agoMerge pull request #4473 from nextcloud/downstream-27488
Roeland Jago Douma [Mon, 24 Apr 2017 17:29:23 +0000 (19:29 +0200)]
Merge pull request #4473 from nextcloud/downstream-27488

Add unit tests for mounts of delete users

7 years agoAdd unit tests for mounts of delete users 4473/head
Joas Schilling [Mon, 24 Apr 2017 14:43:25 +0000 (16:43 +0200)]
Add unit tests for mounts of delete users

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4321 from nextcloud/improve-sharing-tooltip
Morris Jobke [Mon, 24 Apr 2017 14:12:41 +0000 (11:12 -0300)]
Merge pull request #4321 from nextcloud/improve-sharing-tooltip

change sharing tooltip with a more general description of all available share options

7 years agoAllow apps to register plugins for the user management 4472/head
Joas Schilling [Mon, 24 Apr 2017 14:07:02 +0000 (16:07 +0200)]
Allow apps to register plugins for the user management

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4465 from nextcloud/fix-test-mail
Morris Jobke [Mon, 24 Apr 2017 13:49:29 +0000 (10:49 -0300)]
Merge pull request #4465 from nextcloud/fix-test-mail

Don't send the test mail twice

7 years agoMerge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing
Morris Jobke [Mon, 24 Apr 2017 13:41:16 +0000 (10:41 -0300)]
Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing

Fix storage info with wrong casing

7 years agoMerge pull request #4468 from nextcloud/fix_link_password
Christoph Wurst [Mon, 24 Apr 2017 13:26:52 +0000 (15:26 +0200)]
Merge pull request #4468 from nextcloud/fix_link_password

Fix link password toggle

7 years agoFix link password toggle 4468/head
Roeland Jago Douma [Mon, 24 Apr 2017 12:41:41 +0000 (14:41 +0200)]
Fix link password toggle

We took the wrong field from the share api response. So the password was
never shown as set.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save
Roeland Jago Douma [Mon, 24 Apr 2017 12:34:56 +0000 (14:34 +0200)]
Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save

Fix working icon placement on password save

7 years agoMerge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings
Roeland Jago Douma [Mon, 24 Apr 2017 11:47:46 +0000 (13:47 +0200)]
Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings

Fix sinon.stub deprecation warnings

7 years agoExtract updateSharePasswordIfNeeded function
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:47:28 +0000 (19:47 +0200)]
Extract updateSharePasswordIfNeeded function

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoJoin if block to preceding if chain
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:32:15 +0000 (19:32 +0200)]
Join if block to preceding if chain

If getShareType() returns "email" it can not also return "user", "group"
nor "link", so the if block can be added to the preceding if chain.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoDon't send the test mail twice 4465/head
Joas Schilling [Mon, 24 Apr 2017 10:32:38 +0000 (12:32 +0200)]
Don't send the test mail twice

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #1023 from GitHubUser4234/ldap_password_renew_pr
blizzz [Mon, 24 Apr 2017 10:17:04 +0000 (12:17 +0200)]
Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr

Handle password expiry in user_ldap

7 years agoFix working icon placement on password save 4463/head
Daniel Calviño Sánchez [Sun, 23 Apr 2017 22:07:20 +0000 (00:07 +0200)]
Fix working icon placement on password save

Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.

The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.

Fixes #4135

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoMerge pull request #4443 from nextcloud/cleanup-unused-imports
Joas Schilling [Mon, 24 Apr 2017 09:47:37 +0000 (11:47 +0200)]
Merge pull request #4443 from nextcloud/cleanup-unused-imports

Remove unused use statements

7 years agoAdd missing unit test for updateShare with email share
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:11:06 +0000 (19:11 +0200)]
Add missing unit test for updateShare with email share

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAdd missing hook check
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:10:00 +0000 (19:10 +0200)]
Add missing hook check

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoFix double hashing of shared link passwords
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:04:06 +0000 (19:04 +0200)]
Fix double hashing of shared link passwords

The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoFix working icon not hidden when successfully setting a password
Daniel Calviño Sánchez [Sun, 23 Apr 2017 16:54:33 +0000 (18:54 +0200)]
Fix working icon not hidden when successfully setting a password

When a request to set the password of a shared link is sent a working
icon is shown. However, as there was no "success" callback, the icon was
never hidden again after successfully setting the password (it worked
fine if there was an error, though).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAdd acceptance tests for sharing password protected links
Daniel Calviño Sánchez [Sat, 22 Apr 2017 16:20:32 +0000 (18:20 +0200)]
Add acceptance tests for sharing password protected links

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoAdd system to share data between acceptance test steps
Daniel Calviño Sánchez [Sun, 23 Apr 2017 16:40:58 +0000 (18:40 +0200)]
Add system to share data between acceptance test steps

The data storage (the "notebook") is shared between all the actors, so
the data can be stored and retrieved between different steps by any
actor in the same scenario.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoFix sinon.stub deprecation warnings 4458/head
Christoph Wurst [Mon, 24 Apr 2017 08:39:37 +0000 (10:39 +0200)]
Fix sinon.stub deprecation warnings

Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore
replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by
the deprecation warning.

This makes the js unit testing output readable again.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoRemove dead arguments 4457/head
Joas Schilling [Mon, 24 Apr 2017 08:18:14 +0000 (10:18 +0200)]
Remove dead arguments

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix similar issues with the group id
Joas Schilling [Mon, 24 Apr 2017 08:15:03 +0000 (10:15 +0200)]
Fix similar issues with the group id

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix the storage info and other checks when the user has wrong casing
Joas Schilling [Mon, 24 Apr 2017 07:43:44 +0000 (09:43 +0200)]
Fix the storage info and other checks when the user has wrong casing

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4434 from nextcloud/add-rate-limiting-to-solve-challenge-controller
Lukas Reschke [Mon, 24 Apr 2017 08:03:19 +0000 (10:03 +0200)]
Merge pull request #4434 from nextcloud/add-rate-limiting-to-solve-challenge-controller

Add rate limit to TOTP solve challenge controller

7 years agoMerge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname
Roeland Jago Douma [Mon, 24 Apr 2017 07:17:55 +0000 (09:17 +0200)]
Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname

add owner-displayname property to calendars and addressbooks

7 years agoMerge pull request #4444 from nextcloud/remove-unused-variables
Roeland Jago Douma [Mon, 24 Apr 2017 06:09:01 +0000 (08:09 +0200)]
Merge pull request #4444 from nextcloud/remove-unused-variables

Remove unused variables

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 24 Apr 2017 00:07:28 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoadd owner-displayname property to calendars and addressbooks 4401/head
Georg Ehrke [Wed, 19 Apr 2017 14:18:44 +0000 (16:18 +0200)]
add owner-displayname property to calendars and addressbooks

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoRemove unused use statements 4443/head
Morris Jobke [Sat, 22 Apr 2017 23:13:48 +0000 (18:13 -0500)]
Remove unused use statements

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 23 Apr 2017 00:07:31 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoRemove unused variables 4444/head
Morris Jobke [Sat, 22 Apr 2017 23:20:51 +0000 (18:20 -0500)]
Remove unused variables

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix minor code style issues (also known as nitpicking) 4477/head
Daniel Calviño Sánchez [Sat, 22 Apr 2017 15:46:20 +0000 (17:46 +0200)]
Fix minor code style issues (also known as nitpicking)

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
7 years agoMerge pull request #4435 from nextcloud/allow-at-maximum-10-reset-mails-requests...
Lukas Reschke [Sat, 22 Apr 2017 09:17:54 +0000 (11:17 +0200)]
Merge pull request #4435 from nextcloud/allow-at-maximum-10-reset-mails-requests-per-5-minutes

Add at most 10 password reset requests per 5 minutes and IP range

7 years agoMerge pull request #4432 from nextcloud/fix-grammar
Lukas Reschke [Sat, 22 Apr 2017 06:15:46 +0000 (08:15 +0200)]
Merge pull request #4432 from nextcloud/fix-grammar

Fix grammar

7 years agoAdd at most 10 password reset requests per 5 minutes and IP range 4435/head
Lukas Reschke [Sat, 22 Apr 2017 06:12:54 +0000 (08:12 +0200)]
Add at most 10 password reset requests per 5 minutes and IP range

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd rate limit to TOTP solve challenge controller 4434/head
Lukas Reschke [Sat, 22 Apr 2017 05:59:40 +0000 (07:59 +0200)]
Add rate limit to TOTP solve challenge controller

Fixes https://github.com/nextcloud/server/issues/2626

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 22 Apr 2017 00:07:36 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4431 from nextcloud/acceptance-macos
Morris Jobke [Fri, 21 Apr 2017 21:09:50 +0000 (16:09 -0500)]
Merge pull request #4431 from nextcloud/acceptance-macos

Run acceptance tests on macOS

7 years agoFix grammar 4432/head
Morris Jobke [Fri, 21 Apr 2017 21:07:12 +0000 (16:07 -0500)]
Fix grammar

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRun acceptance tests on macOS 4431/head
Morris Jobke [Fri, 21 Apr 2017 19:11:56 +0000 (14:11 -0500)]
Run acceptance tests on macOS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4208 from danxuliu/add-basic-acceptance-test-system
Roeland Jago Douma [Fri, 21 Apr 2017 18:53:32 +0000 (20:53 +0200)]
Merge pull request #4208 from danxuliu/add-basic-acceptance-test-system

Add basic acceptance test system

7 years agoMerge pull request #4396 from nextcloud/scan-non-existing
Roeland Jago Douma [Fri, 21 Apr 2017 17:47:33 +0000 (19:47 +0200)]
Merge pull request #4396 from nextcloud/scan-non-existing

show error when trying to scan non existing path

7 years agoMerge pull request #4428 from nextcloud/file-by-id-limit-user
Roeland Jago Douma [Fri, 21 Apr 2017 17:43:53 +0000 (19:43 +0200)]
Merge pull request #4428 from nextcloud/file-by-id-limit-user

limit the user when searching for a file by id if we know the user already

7 years agoMerge pull request #4426 from nextcloud/update-dom-purify
Morris Jobke [Fri, 21 Apr 2017 17:41:26 +0000 (12:41 -0500)]
Merge pull request #4426 from nextcloud/update-dom-purify

Bump to DOMPurify 0.8.6

7 years agoMerge pull request #4429 from nextcloud/proper-return-code-for-welcome-email
Lukas Reschke [Fri, 21 Apr 2017 17:39:40 +0000 (19:39 +0200)]
Merge pull request #4429 from nextcloud/proper-return-code-for-welcome-email

Use RESPOND_NOT_FOUND for non existing user

7 years agoUse RESPOND_NOT_FOUND for non existing user 4429/head
Morris Jobke [Fri, 21 Apr 2017 16:30:00 +0000 (11:30 -0500)]
Use RESPOND_NOT_FOUND for non existing user

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agolimit the user when searching for a file by id if we know the user already 4428/head
Robin Appelman [Fri, 21 Apr 2017 15:11:26 +0000 (17:11 +0200)]
limit the user when searching for a file by id if we know the user already

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoUpdate core.js 4426/head
Roeland Jago Douma [Fri, 21 Apr 2017 14:44:11 +0000 (16:44 +0200)]
Update core.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4422 from nextcloud/favorite-wording-detail
Roeland Jago Douma [Fri, 21 Apr 2017 14:43:22 +0000 (16:43 +0200)]
Merge pull request #4422 from nextcloud/favorite-wording-detail

Wording detail fix for favorite emptycontent view

7 years agoMerge pull request #4423 from nextcloud/reload-fav-view
Morris Jobke [Fri, 21 Apr 2017 14:35:34 +0000 (09:35 -0500)]
Merge pull request #4423 from nextcloud/reload-fav-view

properly reload favorites list