Commit Graph

29379 Commits

Author SHA1 Message Date
Thomas Müller 373776b8d8 Merge pull request #21622 from owncloud/revert-21479-fix-broken-state-in-htaccess-test
Revert "Remove unneeded check if htaccess test file already exists"
2016-01-11 16:28:44 +01:00
Lukas Reschke 43dbe1cebf Revert "Remove unneeded check if htaccess test file already exists" 2016-01-11 15:37:08 +01:00
Thomas Müller 3143555256 Merge pull request #21613 from owncloud/dav-fix-constructor
fix principal constructor for dav
2016-01-11 14:21:31 +01:00
Thomas Müller c1d8a03662 Merge pull request #21517 from owncloud/ext-oauth-fix
Fix OAuth external storage auth for step 2
2016-01-11 13:36:58 +01:00
Robin Appelman 56c3686ad6 fix principal constructor for dav 2016-01-11 13:36:26 +01:00
Thomas Müller 16097037af Merge pull request #21608 from owncloud/better-setting-templates
improve personal page template
2016-01-11 13:36:21 +01:00
Thomas Müller df2abda814 Merge pull request #21438 from owncloud/settings-anchors
remove unneeded 'goto' prefix from settings anchors
2016-01-11 11:53:40 +01:00
Joas Schilling 866b4b3053 Fix types 2016-01-11 11:43:58 +01:00
Joas Schilling 25a4878886 Fix table markup 2016-01-11 11:38:26 +01:00
Thomas Müller 05f9b40419 Merge pull request #21589 from owncloud/mobile-webDAV-select
webDAV select bug fixed
2016-01-11 11:31:33 +01:00
Thomas Müller 94cf9e56b6 Merge pull request #21593 from owncloud/strict_autoloader
Stricter autoloader
2016-01-11 11:24:11 +01:00
Thomas Müller 939cd43b58 Merge pull request #21586 from owncloud/fix-no-minimum-version
Assume apps from the appstore are compatible with the current version
2016-01-11 11:23:36 +01:00
Thomas Müller 2ee39cf4cf Merge pull request #21573 from owncloud/fix_21535_21534
Do not increase filecount in web on file update
2016-01-11 11:22:09 +01:00
Thomas Müller 171b279753 Merge pull request #21594 from owncloud/cleanup_util
Remove generateRandomBytes from OC_Util
2016-01-11 09:55:35 +01:00
Julian Müller 0249911536 webDAV select bug fixed 2016-01-11 08:41:16 +01:00
Jenkins for ownCloud 77a8085f84 [tx-robot] updated from transifex 2016-01-11 01:55:34 -05:00
Morris Jobke a1444da364 Merge pull request #21596 from owncloud/settings-footer
remove extra slogan footer from Personal and Admin pages
2016-01-11 07:17:49 +01:00
Jan-Christoph Borchardt d05e0c81d4 remove extra slogan footer from Personal and Admin pages 2016-01-11 03:18:06 +01:00
Roeland Jago Douma e01a488b31 Remove generateRandomBytes from OC_Util 2016-01-10 22:07:33 +01:00
Roeland Jago Douma 1a592e5745 Only '/tests' to be autoloaded when running unit tests 2016-01-10 21:36:14 +01:00
Roeland Jago Douma fce8c42240 OC autoloader is not allowed to load 3rdparty 2016-01-10 21:32:52 +01:00
Lukas Reschke e43bf54503 Assume apps from the appstore are compatible with the current version
Filtering is done server-side already so only compatible apps are delivered. Otherwise this leads to a ton of error messages as the info.xml cannot be read at that state.

Fixes https://github.com/owncloud/core/issues/21556
2016-01-10 17:02:50 +01:00
Thomas Müller 656b541899 Merge pull request #21572 from owncloud/fix-setup-warnings
Concat also the other results
2016-01-10 15:20:38 +01:00
Lukas Reschke f4c04c5f28 Concat also the other results
Otherwise this will ignore the two last checks 🙊
2016-01-10 11:39:44 +01:00
Morris Jobke 53c4a55275 Merge pull request #21577 from owncloud/make-code-cleaner-by-removing-unrequired-security-features
Remove code related to session regeneration after some time
2016-01-10 11:38:35 +01:00
Lukas Reschke 74876fa6e7 Remove code related to session regeneration after some time
I do not really consider this necessary or a real security addition. Let's get rid of it thus, cleans up the code and makes the logic easier.
2016-01-10 11:01:30 +01:00
Morris Jobke 21a700bcf7 Merge pull request #21575 from owncloud/use-session-clear
Use ISession::clear
2016-01-10 11:00:47 +01:00
Lukas Reschke a58ca89e7f Use ISession::clear
The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment.
2016-01-10 10:39:22 +01:00
Jenkins for ownCloud 580deb09f8 [tx-robot] updated from transifex 2016-01-10 01:55:57 -05:00
Lukas Reschke d04aadde8a Merge pull request #21576 from owncloud/use-proper-class-name
Use proper class name
2016-01-10 00:22:17 +01:00
Lukas Reschke 3d4cf2e598 Use proper class name
This has never worked before. Introduced with https://github.com/owncloud/core/pull/18658
2016-01-09 23:43:12 +01:00
Roeland Jago Douma 665d7b25b0 Add unit test for file update 2016-01-09 22:47:26 +01:00
Roeland Jago Douma 86735c6b5a Updating a file should not update the summary 2016-01-09 22:07:34 +01:00
Roeland Douma b1698e42d6 Merge pull request #21571 from owncloud/query_secure_random
Just query the securerandom from the container
2016-01-09 20:56:37 +01:00
Roeland Jago Douma 77c611d339 Just query the securerandom from the container 2016-01-09 19:57:03 +01:00
Thomas Müller c5b2b3a124 Merge pull request #21562 from owncloud/properly-check-for-well-known-redirect
Add check for .well-known URL in the root of the webservers URL
2016-01-09 17:42:11 +01:00
Jenkins for ownCloud 72b34575df [tx-robot] updated from transifex 2016-01-09 01:55:50 -05:00
Morris Jobke 0161928fc3 Add check for .well-known URL in the root of the webservers URL
* fixes #20012
2016-01-08 23:27:29 +01:00
Morris Jobke a259effc7d Merge pull request #19676 from owncloud/fix_15253
Make sure that permissions stay in sync for share_type 2
2016-01-08 21:37:12 +01:00
Roeland Jago Douma 17a066c18e Properly close db cursors 2016-01-08 20:27:01 +01:00
Roeland Jago Douma 629bac22fd Make sure to respect deleted group shares by user 2016-01-08 20:27:01 +01:00
Roeland Jago Douma c882d46e5f Moved to the query builder
Anything to keep Lukas happy
2016-01-08 20:27:01 +01:00
Roeland Jago Douma 066e3770bb Make sure that permissions stay in sync for share_type 2
When a file/folder is shared with a group and one of the group members
moves this file/folder an extra entry is created in the share table.

When the permission of the group share is updated we used to only
sometimes update the shares for individual users.

* Added intergration tests
2016-01-08 20:27:01 +01:00
Thomas Müller d7d0cfc775 Merge pull request #21008 from owncloud/UoM-ResPlat-DevOps-swift-acl-shared-containers
Allowing access to Swift containers shared by ACL
2016-01-08 20:13:13 +01:00
Thomas Müller ea227aadf2 Merge pull request #20961 from owncloud/provis-api-group-special-char
Remove unnecessary group name validation in provisioning_api
2016-01-08 20:11:20 +01:00
Thomas Müller 1f21f0eb73 Merge pull request #21491 from owncloud/webdav_auth_no_basic_auth
Also allow 'only cookie' auth to webdav
2016-01-08 20:09:16 +01:00
Thomas Müller 2659661cb0 Merge pull request #21546 from owncloud/jsunit-stubportinpublicappspec
Fix public page URL JS test
2016-01-08 20:08:01 +01:00
Thomas Müller 977e104cd4 Merge pull request #21553 from owncloud/gwdg-master
Respect user enumeration
2016-01-08 18:21:15 +01:00
Thomas Müller dfbb24aa92 Merge pull request #21458 from owncloud/login-gradient
add back gradient for log in page in Firefox, fix accidental removal
2016-01-08 18:20:54 +01:00
Thomas Müller 37265fd094 Merge pull request #21467 from owncloud/external-status-check-userglobal
Fix checking external storage status as non admin user
2016-01-08 18:19:48 +01:00