Commit graph

32793 commits

Author SHA1 Message Date
Thomas Müller
f20c617154
Allow login by email address via webdav as well - fixes #24791 2016-06-09 12:08:49 +02:00
Vincent Petry
90c1ec1c49 Merge pull request #25014 from owncloud/admin-datadircheck-fix
Use temporary htaccesstest.txt for data dir security check
2016-06-09 11:58:28 +02:00
Vincent Petry
826e276a79 Merge pull request #24973 from owncloud/token-password-session-token
When creating a session token, make sure it's the login password and …
2016-06-09 11:58:04 +02:00
Thomas Müller
bfcd1dc49c
Filter confidential calendar objects in shared calendars
Filter private calendar objects in shared calendars
2016-06-09 11:09:14 +02:00
Thomas Müller
082f456b8b
Added unit testing for the migration step 2016-06-09 11:09:14 +02:00
Thomas Müller
369c3b5d7e
Implement classification migration as repair step 2016-06-09 11:09:14 +02:00
Thomas Müller
287e41732c
Bump dav app version and fix variable rename 2016-06-09 11:09:14 +02:00
Thomas Müller
f013cfc530
Add migration step 2016-06-09 11:09:13 +02:00
Thomas Müller
fbdec59f22
Extract CLASS property from calendar object and store it in the database 2016-06-09 11:09:13 +02:00
Vincent Petry
aca4ea12c1 Merge pull request #24826 from owncloud/cors-client-login
use client login method on CORS routes
2016-06-09 10:31:14 +02:00
Vincent Petry
0e3737ffe1 Merge pull request #25028 from owncloud/scanner-user-not-setup
skip scanning for a user when the user is not setup yet
2016-06-09 10:29:46 +02:00
Jenkins for ownCloud
355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Jürgen Weigert
0a6b845f37 Update autotest.sh
usage in sync with reality.
2016-06-08 17:46:50 +02:00
Vincent Petry
6de406ae51 Merge pull request #25023 from owncloud/fix-22127-trusted-servers
Fixed problem about removing trusted servers accidentally
2016-06-08 17:41:16 +02:00
Vincent Petry
7c8d2a8520 Merge pull request #25027 from owncloud/fix-22746-narrowtooltip
Added width of the tooltip
2016-06-08 17:34:30 +02:00
Joas Schilling
e49307014c Do not log token or challenge with exception stacktrace (#25026)
* Make the filtering better readable

* Add some more methods to the sensitive list
2016-06-08 16:32:58 +02:00
Vincent Petry
56215513e1 Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatch
Fix GDrive file size when mime type doesn't match contents
2016-06-08 16:24:14 +02:00
Christoph Wurst
9997c431c3
use client login method on CORS routes 2016-06-08 15:18:53 +02:00
Vincent Petry
396363cc5d Merge pull request #24974 from owncloud/htaccess_update
.htaccess update making two rules non-capturing
2016-06-08 15:08:32 +02:00
Christoph Wurst
46e26f6b49
catch sessionnotavailable exception if memory session is used 2016-06-08 15:03:15 +02:00
Robin Appelman
808438efc0 skip scanning for a user when the user is not setup yet 2016-06-08 14:19:42 +02:00
Sergio Bertolín
e70bd36e5d Added width of the tooltip 2016-06-08 11:38:39 +00:00
Christoph Wurst
ec929f07f2
When creating a session token, make sure it's the login password and not a device token 2016-06-08 13:31:55 +02:00
Sergio Bertolín
6bc7e3f92f Removed old html 2016-06-08 11:11:30 +00:00
Juan Pablo Villafáñez
7d85bed1fc Change the default value to true instead of null 2016-06-08 12:48:33 +02:00
Sergio Bertolín
b8493629ae Improve readability 2016-06-08 10:19:18 +00:00
Daniel Molkentin
e133f7e147 ownCloud 9.1.0 beta 2 2016-06-08 11:31:12 +02:00
Vincent Petry
c5a6c8b70b
Use array_merge when reading cached groups members 2016-06-08 11:22:01 +02:00
Sergio Bertolín
e0aaa21bd8 Fixed problem about removing trusted servers accidentally 2016-06-08 09:02:05 +00:00
Vincent Petry
7dcc47dc94 Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa
Allow to cancel 2FA after login
2016-06-08 10:27:21 +02:00
Vincent Petry
b3592ab806 Merge pull request #25019 from owncloud/fix_24937
Bring back sharedstorage hooks
2016-06-08 10:22:16 +02:00
Vincent Petry
8d0948977e Merge pull request #24899 from owncloud/local-storage-symlinks
dissalow symlinks in local storages that point outside the datadir
2016-06-08 10:19:24 +02:00
Vincent Petry
ed92f4c427 Merge pull request #24983 from owncloud/issue-23776-do-not-allow-boolean-user-config
Do not allow to store boolean configs, they behave unexpected on postgres
2016-06-08 10:14:08 +02:00
Vincent Petry
12683b786d Merge pull request #24991 from owncloud/2fa-do-not-generate-token
do not generate device token if 2FA is enable for user
2016-06-08 10:13:04 +02:00
Vincent Petry
9b6125e49b Merge pull request #24992 from owncloud/fix_decrypt_message
Fix Decrypt message via occ
2016-06-08 10:12:47 +02:00
Vincent Petry
b7935dcebd Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only
Allow to decrypt user '0' files only
2016-06-08 10:12:28 +02:00
Vincent Petry
111b4d7051 Merge pull request #24999 from owncloud/initial-userloading-workaround
decrease initial users to load to 50
2016-06-08 10:12:09 +02:00
Vincent Petry
56016842d4 Merge pull request #25018 from owncloud/background-contrast
darker background image for better font contrast
2016-06-08 10:11:40 +02:00
Vincent Petry
87c150e2fb Merge pull request #25005 from owncloud/parent-storage-time-cast
don't update storage mtime if we can't get the modified date
2016-06-08 09:57:17 +02:00
Vincent Petry
652b4961f2 Merge pull request #25001 from owncloud/issue-24939-better-ux-on-invalid-perma-link
Improve the UX for "not found" perma links
2016-06-08 09:56:24 +02:00
Vincent Petry
1ee4d4d692 Merge pull request #23996 from owncloud/integrations-tests-qa-145
Added tests about overwriting files and folders as recipient
2016-06-08 09:55:23 +02:00
Vincent Petry
fa9c96ac4f
Fix GDrive file size when mime type doesn't match contents
Uploading a txt file with XML contents makes GDrive return the XML mime
type.

This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size
properly rely on the Google Docs mime types.
2016-06-08 09:46:49 +02:00
Vincent Petry
4fd55c255f Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolder
Fix GDrive upload file which name might match the one of a folder
2016-06-08 09:46:15 +02:00
Joas Schilling
68a7aed27b
Adjust test to work with phpunit < 5.2 2016-06-08 09:24:00 +02:00
Christoph Wurst
4bff16e52d
darker background image for better font contrast 2016-06-08 08:34:08 +02:00
Roeland Jago Douma
4a3c67fdb4
Bring back sharedstorage hooks 2016-06-08 08:19:32 +02:00
Jenkins for ownCloud
bbd61cd98a [tx-robot] updated from transifex 2016-06-08 01:54:57 -04:00
Vincent Petry
fb087a0261
Use temporary htaccesstest.txt for data dir security check 2016-06-07 18:36:13 +02:00
Juan Pablo Villafáñez
a2b00582bc Fix test 2016-06-07 18:27:10 +02:00
Juan Pablo Villafáñez
110edd3d3c Rename variable 2016-06-07 18:25:17 +02:00