Lukas Reschke
8daf3d4a70
Update autoloader
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Lukas Reschke
281ad406e8
Add support for theming
...
Add support for theming in generated emails and simplify API
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Lukas Reschke
1be75e8db8
Fix tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Morris Jobke
0560e69913
New layout for welcome email
...
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-07 12:03:32 -05:00
Lukas Reschke
325f925e14
Merge pull request #4249 from nextcloud/dont-force-accept-language-anymore
...
Don't force the use of Accept-Language anymore
2017-04-07 17:05:09 +02:00
Joas Schilling
9f3d9b5b23
Don't force the use of Accept-Language anymore
...
This is not intended anymore, since it falls back to force english
when the header is not set. Also 0228bc6e66
makes clear that the order should be:
1. User setting
2. Accept language
3. Admin default
This is the case since the commit from above, unless via OCS and DAV.
Both forced to accept-language falling back to english.
By removing the force, it now also matches the w3 priority list:
https://www.w3.org/International/questions/qa-lang-priorities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 11:10:04 +02:00
Nextcloud bot
536650c02f
[tx-robot] updated from transifex
2017-04-07 00:09:11 +00:00
Joas Schilling
287bae8c5f
Merge pull request #4153 from nextcloud/fix-upload
...
Fix upload of folders in Chrome
2017-04-06 09:56:41 +02:00
Morris Jobke
6e72fd5f9f
Fix upload of folders in Chrome
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-06 00:50:58 -05:00
Morris Jobke
b084ceec3d
Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpoint
...
Don't list on public calendar endpoints
2017-04-05 20:55:39 -05:00
Nextcloud bot
7d9688c89e
[tx-robot] updated from transifex
2017-04-06 00:07:50 +00:00
Lukas Reschke
63288ebc50
Don't list on public calendar endpoints
...
There is no need to allow listing here.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 22:43:05 +02:00
Roeland Jago Douma
56797fd695
Merge pull request #3526 from nextcloud/token-save-scope
...
Save the scope of an auth token in the session
2017-04-05 22:05:11 +02:00
Lukas Reschke
1d3e391ad8
Add integration tests for token auth
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 17:58:33 +02:00
Robin Appelman
baec42e80a
Save the scope of an auth token in the session
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 17:58:33 +02:00
Roeland Jago Douma
00558de782
Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storages
...
Also add the root of external storages to the file id list
2017-04-05 15:21:38 +02:00
Jos Poortvliet
98312a9a58
Merge pull request #4215 from nextcloud/issue-template
...
Rename config section
2017-04-05 11:01:33 +02:00
Joas Schilling
e3a3ff98ab
Rename config section
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-05 11:00:33 +02:00
Roeland Jago Douma
6bdd3a167d
Merge pull request #4123 from nextcloud/allow-password-reset-with-email
...
Allow to reset the password with the email as an input
2017-04-05 09:12:41 +02:00
Roeland Jago Douma
ddd157a84c
Merge pull request #3741 from nextcloud/user-settings-design
...
User mgmt settings design improvements
2017-04-05 09:02:58 +02:00
Nextcloud bot
84035862f7
[tx-robot] updated from transifex
2017-04-05 00:08:20 +00:00
Jan-Christoph Borchardt
94d4d20c39
proper padding for checkboxes in app-settings
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-04 16:49:43 -05:00
Jan-Christoph Borchardt
602819d6ab
correct sorting of user management settings, wording
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-04 16:49:43 -05:00
Morris Jobke
fa4107893d
Merge pull request #4138 from nextcloud/resources_match_fullid
...
Match slashes in ../{id} resource routes
2017-04-04 15:52:53 -05:00
Morris Jobke
b78876236d
Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection
...
Redirect to 2FA selection screen
2017-04-04 15:47:35 -05:00
Roeland Jago Douma
72b8784e2a
Merge pull request #4204 from nextcloud/append-fixes-swift
...
fix fseek (Swift backend) against string not resource by removing append support
2017-04-04 21:15:34 +02:00
Arthur Schiwon
30c95b51fb
fix fseek against string not resource by removing append support
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-04 20:25:59 +02:00
Morris Jobke
52eaf6cfbb
Merge pull request #3310 from duritong/patch-1
...
only chmod logfile if necessary
2017-04-04 11:42:26 -05:00
Joas Schilling
75657c1a6e
Merge pull request #4071 from nextcloud/issue-173-database-conversion-failure
...
Make sure blob columns are correctly converted as parameters
2017-04-04 16:29:53 +02:00
Lukas Reschke
e0227cb458
Merge pull request #2095 from nextcloud/bruteforcesetttings
...
Introduce bruteforce settings
2017-04-04 11:57:43 +02:00
Roeland Jago Douma
da178db98e
Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12
...
Make public links work with master key
2017-04-04 11:46:13 +02:00
Roeland Jago Douma
efb21a948e
Merge pull request #4093 from nextcloud/endorse-password-protection
...
Endorse password protection
2017-04-04 11:04:21 +02:00
Roeland Jago Douma
aee2d6318f
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 10:29:12 +02:00
Roeland Jago Douma
0d69b52fde
Merge pull request #4147 from nextcloud/fix_3890
...
Don't try to parse empty body if there is no body
2017-04-04 10:25:13 +02:00
Roeland Jago Douma
c0972a26ed
Merge pull request #3896 from nextcloud/xx621998xx-newbranch
...
Fix remaining upload time calculation
2017-04-04 10:24:32 +02:00
Joas Schilling
b6c1f3fc6d
Some more hardening
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-04 08:51:21 +02:00
SarthikaDhawan
62fb3bb3ef
file-upload.js modified : Remaining upload time corrected
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 08:51:20 +02:00
Roeland Jago Douma
31f9be7a75
Match slashes in ../{id} resource routes
...
Fixes #2954
Before we could match on <prefix>/{id} however if the id contains a /
this would not match properly. But since we define the resource routes
internally we now make sure that we match all chars (up until the ?).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 08:37:11 +02:00
Roeland Jago Douma
2a9192334e
Don't try to parse empty body if there is no body
...
Fixes #3890
If we do a put request without a body the current code still tries to
read the body. This patch makes sure that we do not try to read the body
if the content length is 0.
See RFC 2616 Section 4.3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 08:22:33 +02:00
Nextcloud bot
ec5377306d
[tx-robot] updated from transifex
2017-04-04 00:07:46 +00:00
Morris Jobke
51bcb0bbe1
Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_shared_calendars
...
allow sharees to edit certain calendar properties for themselves
2017-04-03 13:12:56 -05:00
Roeland Jago Douma
55c94caff5
Merge pull request #4191 from nextcloud/bump-autosize
...
Bump autosize
2017-04-03 15:32:42 +02:00
Christoph Wurst
a7cc8c86ab
Redirect to 2FA selection screen
...
Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the
current request is authenticated. Since we redirected to the index
page before, it resulted in an infinite redirection loop. This change
sets the redirection URL to the 2FA selection page, which is the only
allowed page in that authentication state.
Fixes https://github.com/nextcloud/server/issues/3702
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-03 14:31:57 +02:00
Roeland Jago Douma
7d72ae3011
Move to autosize.min.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:42:33 +02:00
Roeland Jago Douma
497fe1682f
Bump autosize.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:40:34 +02:00
Roeland Jago Douma
455542d306
Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on-calendars
...
Make sure transparency is an integer when saving a calendar
2017-04-03 12:46:00 +02:00
Jos Poortvliet
13e7a93860
Merge pull request #4189 from nextcloud/add-issue-template-app
...
Add reference to issue template app
2017-04-03 12:12:00 +02:00
Jos Poortvliet
543555ec95
Update issue_template.md
2017-04-03 12:11:34 +02:00
Christoph Wurst
cbe44043be
Merge pull request #4131 from nextcloud/fix-jscombiner
...
Fix check for cache value in JSCombiner
2017-04-03 11:27:39 +02:00
Roeland Jago Douma
47e342c730
Merge pull request #4175 from nextcloud/fix-socialmenudisplay
...
Do not show social menu when there is no link share
2017-04-03 10:59:44 +02:00