]>
source.dussan.org Git - nextcloud-server.git/log
Arthur Schiwon [Fri, 2 Dec 2016 10:16:33 +0000 (11:16 +0100)]
don't regenerate Session ID twice, also fixes tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Arthur Schiwon [Thu, 1 Dec 2016 13:06:22 +0000 (14:06 +0100)]
regenerate session id on successful login, fixes integration test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Arthur Schiwon [Wed, 30 Nov 2016 12:28:36 +0000 (13:28 +0100)]
do login routine only once when done via LoginController
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Arthur Schiwon [Wed, 30 Nov 2016 13:59:59 +0000 (14:59 +0100)]
fix login controller tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Joas Schilling [Thu, 6 Apr 2017 07:56:41 +0000 (09:56 +0200)]
Merge pull request #4153 from nextcloud/fix-upload
Fix upload of folders in Chrome
Morris Jobke [Wed, 29 Mar 2017 23:24:28 +0000 (17:24 -0600)]
Fix upload of folders in Chrome
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 6 Apr 2017 01:55:39 +0000 (20:55 -0500)]
Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpoint
Don't list on public calendar endpoints
Nextcloud bot [Thu, 6 Apr 2017 00:07:50 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Lukas Reschke [Wed, 5 Apr 2017 20:43:05 +0000 (22:43 +0200)]
Don't list on public calendar endpoints
There is no need to allow listing here.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Roeland Jago Douma [Wed, 5 Apr 2017 20:05:11 +0000 (22:05 +0200)]
Merge pull request #3526 from nextcloud/token-save-scope
Save the scope of an auth token in the session
Lukas Reschke [Wed, 5 Apr 2017 11:14:59 +0000 (13:14 +0200)]
Add integration tests for token auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Robin Appelman [Fri, 17 Feb 2017 14:40:20 +0000 (15:40 +0100)]
Save the scope of an auth token in the session
Signed-off-by: Robin Appelman <robin@icewind.nl>
Roeland Jago Douma [Wed, 5 Apr 2017 13:21:38 +0000 (15:21 +0200)]
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
Jos Poortvliet [Wed, 5 Apr 2017 09:01:33 +0000 (11:01 +0200)]
Merge pull request #4215 from nextcloud/issue-template
Rename config section
Joas Schilling [Wed, 5 Apr 2017 08:59:02 +0000 (10:59 +0200)]
Rename config section
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Wed, 5 Apr 2017 07:12:41 +0000 (09:12 +0200)]
Merge pull request #4123 from nextcloud/allow-password-reset-with-email
Allow to reset the password with the email as an input
Roeland Jago Douma [Wed, 5 Apr 2017 07:02:58 +0000 (09:02 +0200)]
Merge pull request #3741 from nextcloud/user-settings-design
User mgmt settings design improvements
Nextcloud bot [Wed, 5 Apr 2017 00:08:20 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Jan-Christoph Borchardt [Mon, 6 Mar 2017 17:07:07 +0000 (18:07 +0100)]
proper padding for checkboxes in app-settings
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Jan-Christoph Borchardt [Mon, 6 Mar 2017 17:06:08 +0000 (18:06 +0100)]
correct sorting of user management settings, wording
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Morris Jobke [Tue, 4 Apr 2017 20:52:53 +0000 (15:52 -0500)]
Merge pull request #4138 from nextcloud/resources_match_fullid
Match slashes in ../{id} resource routes
Morris Jobke [Tue, 4 Apr 2017 20:47:35 +0000 (15:47 -0500)]
Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection
Redirect to 2FA selection screen
Roeland Jago Douma [Tue, 4 Apr 2017 19:15:34 +0000 (21:15 +0200)]
Merge pull request #4204 from nextcloud/append-fixes-swift
fix fseek (Swift backend) against string not resource by removing append support
Arthur Schiwon [Tue, 4 Apr 2017 11:12:29 +0000 (13:12 +0200)]
fix fseek against string not resource by removing append support
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Morris Jobke [Tue, 4 Apr 2017 16:42:26 +0000 (11:42 -0500)]
Merge pull request #3310 from duritong/patch-1
only chmod logfile if necessary
Joas Schilling [Tue, 4 Apr 2017 14:29:53 +0000 (16:29 +0200)]
Merge pull request #4071 from nextcloud/issue-173-database-conversion-failure
Make sure blob columns are correctly converted as parameters
Lukas Reschke [Tue, 4 Apr 2017 09:57:43 +0000 (11:57 +0200)]
Merge pull request #2095 from nextcloud/bruteforcesetttings
Introduce bruteforce settings
Roeland Jago Douma [Tue, 4 Apr 2017 09:46:13 +0000 (11:46 +0200)]
Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12
Make public links work with master key
Roeland Jago Douma [Tue, 4 Apr 2017 09:04:21 +0000 (11:04 +0200)]
Merge pull request #4093 from nextcloud/endorse-password-protection
Endorse password protection
Roeland Jago Douma [Sun, 2 Apr 2017 19:41:14 +0000 (21:41 +0200)]
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Tue, 4 Apr 2017 08:25:13 +0000 (10:25 +0200)]
Merge pull request #4147 from nextcloud/fix_3890
Don't try to parse empty body if there is no body
Roeland Jago Douma [Tue, 4 Apr 2017 08:24:32 +0000 (10:24 +0200)]
Merge pull request #3896 from nextcloud/xx621998xx-newbranch
Fix remaining upload time calculation
Joas Schilling [Fri, 17 Mar 2017 11:59:33 +0000 (12:59 +0100)]
Some more hardening
Signed-off-by: Joas Schilling <coding@schilljs.com>
SarthikaDhawan [Mon, 6 Mar 2017 11:08:35 +0000 (16:38 +0530)]
file-upload.js modified : Remaining upload time corrected
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Wed, 29 Mar 2017 09:03:53 +0000 (11:03 +0200)]
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>
Roeland Jago Douma [Wed, 29 Mar 2017 13:09:45 +0000 (15:09 +0200)]
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>
Nextcloud bot [Tue, 4 Apr 2017 00:07:46 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 3 Apr 2017 18:12:56 +0000 (13:12 -0500)]
Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_shared_calendars
allow sharees to edit certain calendar properties for themselves
Roeland Jago Douma [Mon, 3 Apr 2017 13:32:42 +0000 (15:32 +0200)]
Merge pull request #4191 from nextcloud/bump-autosize
Bump autosize
Christoph Wurst [Mon, 3 Apr 2017 12:29:24 +0000 (14:29 +0200)]
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>
Roeland Jago Douma [Mon, 3 Apr 2017 11:42:33 +0000 (13:42 +0200)]
Move to autosize.min.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 3 Apr 2017 11:40:34 +0000 (13:40 +0200)]
Bump autosize.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 3 Apr 2017 10:46:00 +0000 (12:46 +0200)]
Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on-calendars
Make sure transparency is an integer when saving a calendar
Jos Poortvliet [Mon, 3 Apr 2017 10:12:00 +0000 (12:12 +0200)]
Merge pull request #4189 from nextcloud/add-issue-template-app
Add reference to issue template app
Jos Poortvliet [Mon, 3 Apr 2017 10:11:34 +0000 (12:11 +0200)]
Update issue_template.md
Christoph Wurst [Mon, 3 Apr 2017 09:27:39 +0000 (11:27 +0200)]
Merge pull request #4131 from nextcloud/fix-jscombiner
Fix check for cache value in JSCombiner
Roeland Jago Douma [Mon, 3 Apr 2017 08:59:44 +0000 (10:59 +0200)]
Merge pull request #4175 from nextcloud/fix-socialmenudisplay
Do not show social menu when there is no link share
Bjoern Schiessle [Mon, 3 Apr 2017 08:54:25 +0000 (10:54 +0200)]
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Timo Benk [Mon, 17 Oct 2016 12:23:55 +0000 (14:23 +0200)]
let the user set an empty password for share link
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Timo Benk [Mon, 17 Oct 2016 07:11:30 +0000 (09:11 +0200)]
endorseLinkPassword changed to enableLinkPasswordByDefault
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Timo Benk [Fri, 14 Oct 2016 07:58:24 +0000 (09:58 +0200)]
feature endorse password for share links
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Mon, 27 Mar 2017 13:11:13 +0000 (15:11 +0200)]
feature endorse password for share links
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set. by Timo Benk
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Nextcloud bot [Mon, 3 Apr 2017 00:08:20 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Lukas Reschke [Sun, 2 Apr 2017 20:13:04 +0000 (22:13 +0200)]
Add reference to issue template app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Roeland Jago Douma [Sun, 2 Apr 2017 19:26:02 +0000 (21:26 +0200)]
Move app to own repo
https://github.com/nextcloud/bruteforcesettings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Morris Jobke [Tue, 14 Mar 2017 01:44:10 +0000 (19:44 -0600)]
Fixed layout of bruteforcesettings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Sun, 2 Apr 2017 19:16:22 +0000 (21:16 +0200)]
Fix app
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sat, 19 Nov 2016 20:03:39 +0000 (21:03 +0100)]
Update App Manager test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 18 Nov 2016 08:27:33 +0000 (09:27 +0100)]
App is always enabled
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 14 Nov 2016 13:05:01 +0000 (14:05 +0100)]
Respect bruteforce settings in the Throttler
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 14 Nov 2016 13:02:03 +0000 (14:02 +0100)]
Adds security section to the admin page
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 14 Nov 2016 12:59:52 +0000 (13:59 +0100)]
Initial commit of the bruteforcesettings app
This adds the bruteforce settings app that allows to configure (for now)
subnets that are to be ignored when doing brute force analysis. This can
for example be the LAN since we trust people from there.
* Add app
* Add php tests
* Add js tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Lukas Reschke [Sun, 2 Apr 2017 14:45:07 +0000 (16:45 +0200)]
Merge pull request #4183 from nextcloud/css-shortcuts-view
Add CSS for styling of keyboard shortcuts view
Nextcloud bot [Sun, 2 Apr 2017 00:07:48 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Sat, 1 Apr 2017 12:00:25 +0000 (14:00 +0200)]
Merge pull request #4139 from nextcloud/phpseclib
[3rdparty] Bump phpseclib to 2.0.4
Christoph Wurst [Sat, 1 Apr 2017 06:38:47 +0000 (08:38 +0200)]
Merge pull request #4174 from nextcloud/mergejs-newline
mergejs should print a newline between imports
Nextcloud bot [Sat, 1 Apr 2017 00:08:09 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Fri, 31 Mar 2017 15:29:41 +0000 (17:29 +0200)]
Do not show social menu when there is no link share
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 31 Mar 2017 15:06:38 +0000 (17:06 +0200)]
mergejs should print a newline between imports
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 31 Mar 2017 13:07:39 +0000 (15:07 +0200)]
Merge pull request #3438 from nextcloud/external-storage-user-folder
Allow using '/' as external storage mountpoint
Björn Schießle [Fri, 31 Mar 2017 12:49:38 +0000 (14:49 +0200)]
Merge pull request #4140 from nextcloud/no_encryption_no_wrapper
Don't add the Encryption Storage Wrapper if there are no encryption modules
Nextcloud bot [Fri, 31 Mar 2017 00:08:35 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Thu, 9 Mar 2017 10:58:26 +0000 (11:58 +0100)]
Also add the root of external storages to the file id list
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Thu, 30 Mar 2017 16:25:50 +0000 (18:25 +0200)]
Merge pull request #3832 from nextcloud/fix_1303
Do not clear CSRF token on logout (fix for #1303)
Joas Schilling [Thu, 30 Mar 2017 15:58:12 +0000 (17:58 +0200)]
Make sure transparency is an integer when saving a calendar
Signed-off-by: Joas Schilling <coding@schilljs.com>
Robin Appelman [Thu, 30 Mar 2017 15:16:59 +0000 (17:16 +0200)]
fix setup of external storage integration tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
Joas Schilling [Thu, 30 Mar 2017 13:16:33 +0000 (15:16 +0200)]
Merge pull request #4150 from nextcloud/capped-memcache-push
support pushing to CappedMemoryCache
Joas Schilling [Thu, 30 Mar 2017 12:37:03 +0000 (14:37 +0200)]
Merge pull request #4128 from nextcloud/updateclipboard
Update clipboard.js
Roeland Jago Douma [Thu, 30 Mar 2017 12:10:21 +0000 (14:10 +0200)]
Merge pull request #4143 from nextcloud/ldap-downstream-64
Correctly apply quota
Roeland Jago Douma [Thu, 30 Mar 2017 12:08:31 +0000 (14:08 +0200)]
Merge pull request #3089 from nextcloud/cache-move-single-query
Move all children of a folder in a single query
Jan-Christoph Borchardt [Thu, 30 Mar 2017 11:07:26 +0000 (13:07 +0200)]
Add CSS for styling of keyboard shortcuts view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Robin Appelman [Thu, 30 Mar 2017 10:24:46 +0000 (12:24 +0200)]
user ids are strings
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Wed, 29 Mar 2017 17:16:12 +0000 (19:16 +0200)]
support pushing to CappedMemoryCache
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Sun, 26 Mar 2017 18:45:49 +0000 (20:45 +0200)]
rename fun to func
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Tue, 21 Feb 2017 13:48:00 +0000 (14:48 +0100)]
Add tests for query builder (i)like
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Thu, 26 Jan 2017 11:15:26 +0000 (12:15 +0100)]
dont double escape
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Thu, 26 Jan 2017 11:02:09 +0000 (12:02 +0100)]
update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Wed, 18 Jan 2017 14:47:05 +0000 (15:47 +0100)]
fix licence headers
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Mon, 16 Jan 2017 15:20:53 +0000 (16:20 +0100)]
Move all children of a folder in a single query
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Mon, 16 Jan 2017 14:31:04 +0000 (15:31 +0100)]
Add function builder to the query builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Mon, 16 Jan 2017 14:12:30 +0000 (15:12 +0100)]
add support for escaping like parameters when using the query builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Mon, 16 Jan 2017 15:16:32 +0000 (16:16 +0100)]
Add MD5() to sqlite
Signed-off-by: Robin Appelman <robin@icewind.nl>
Lukas Reschke [Thu, 30 Mar 2017 08:47:28 +0000 (10:47 +0200)]
Merge pull request #4132 from nextcloud/fix-safari-gzip
Fix gzip files for Safari
Roeland Jago Douma [Wed, 29 Mar 2017 10:14:57 +0000 (12:14 +0200)]
[3rdparty] Bump phpseclib to 2.0.4
See: https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Morris Jobke [Thu, 30 Mar 2017 03:43:18 +0000 (21:43 -0600)]
Merge pull request #4100 from nextcloud/header-indicator
show triangle below user menu too when an entry inside there is active
Nextcloud bot [Thu, 30 Mar 2017 00:07:41 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 29 Mar 2017 23:17:19 +0000 (17:17 -0600)]
Merge pull request #4142 from nextcloud/numeric_avatar
Allow avatars for full numeric users
Morris Jobke [Wed, 29 Mar 2017 21:47:28 +0000 (15:47 -0600)]
Merge pull request #4141 from nextcloud/ldap-downstream-9
Convert the group limit to match the same behaviour as the user search
Roeland Jago Douma [Wed, 29 Mar 2017 20:54:08 +0000 (22:54 +0200)]
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 29 Mar 2017 17:31:35 +0000 (19:31 +0200)]
Merge pull request #4145 from nextcloud/ldap-downstream-54
Add tooltips to LDAP wizard special attributtes