Commit Graph

22666 Commits

Author SHA1 Message Date
Thomas Müller a24d73aa0c Merge pull request #13837 from owncloud/endless-redirect
Add callCheck to testremote.php
2015-02-03 11:28:15 +01:00
Jenkins for ownCloud 6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Lukas Reschke 4270188252 Add callCheck to testremote.php
Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
2015-02-02 19:39:41 +01:00
Thomas Müller 92bc1b44d5 Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag
include core version into js/css version tag
2015-02-02 15:02:11 +01:00
Thomas Müller 24daee836a include core version into js/css version tag - fixes #13702 2015-02-02 13:02:11 +01:00
Morris Jobke 1bb8d5978c Merge pull request #13817 from owncloud/core-apps-dependencies
encryption requires openssl and user_ldap requires ldap 🙊
2015-02-02 12:49:45 +01:00
Lukas Reschke 2426bd1b9d Merge pull request #13811 from owncloud/default-to-null
Default to `null` for lostpassword
2015-02-02 11:41:14 +01:00
Thomas Müller 82b271855c add libs which have no version number 2015-02-02 10:49:46 +01:00
Thomas Müller 359abca50c Merge pull request #13790 from owncloud/fix-subadmin-group
Fix subadmin listing of group
2015-02-02 09:45:28 +01:00
Thomas Müller c9543c9e8e encryption requires openssl and user_ldap requires ldap 🙊 2015-02-02 09:20:05 +01:00
Jenkins for ownCloud 800829d93d [tx-robot] updated from transifex 2015-02-02 01:54:32 -05:00
Lukas Reschke 944dc127b8 Mock l10n in the setup 2015-02-01 17:46:48 +01:00
Lukas Reschke ba29ea178f Add unit tests for empty token 2015-02-01 17:34:03 +01:00
Thomas Müller 4ecf1f85be Merge pull request #13810 from owncloud/tdomain
fix trusted domain localization
2015-02-01 17:26:55 +01:00
Lukas Reschke 35afb0d22e Default to `null` for lostpassword
We oC 8 we use the `StringUtils::equals` method which will also verify the type, since we don't anylonger hash the token twice this is required in case somebody is able to invoke this route with an empty `$token`.
2015-02-01 17:07:10 +01:00
Volkan Gezer 9beb033a9f fix trusted domain localization 2015-02-01 16:06:12 +01:00
Jenkins for ownCloud a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Lukas Reschke 012d06e8a2 Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares
make sure that we get the correct user from the path
2015-01-31 08:52:07 +01:00
Jenkins for ownCloud c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Lukas Reschke fcd5056376 Consistent variable naming 2015-01-30 18:31:04 +01:00
Joas Schilling b58f2faf21 Merge pull request #13804 from owncloud/check-return-before-assuming-array
Check whether return is an error case before using it
2015-01-30 17:39:28 +01:00
Lukas Reschke 0f7634eadc Switch to a factory and add unit tests 2015-01-30 17:24:42 +01:00
Joas Schilling 7bd7c20295 Check whether return is an error case before using it 2015-01-30 16:39:57 +01:00
Bjoern Schiessle 9ef96e4dd5 no need to initialize the same view twice 2015-01-30 14:39:31 +01:00
Bjoern Schiessle ed29c6ce86 get correct user for paths to the trash bin, needed for remote shares if the size of of trash gets calculated 2015-01-30 14:39:09 +01:00
Lukas Reschke 7e7dd92f6b Add unit tests 2015-01-30 14:29:46 +01:00
Lukas Reschke 734dcc82dd Fix subadmin listing of group
Without this patch filtering for the "_everyone" (empty) group did not work for subadmins.

Fixes itself.
2015-01-30 14:29:46 +01:00
Morris Jobke e7900ba255 Merge pull request #13508 from owncloud/failed-delete-cache
Dont remove a file from cache if the delete operation failed
2015-01-30 14:08:44 +01:00
Jenkins for ownCloud f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Robin McCorkell 24fc1c751a Merge pull request #13774 from owncloud/fix-exception-css
add CSS to exception page - fixes #13747
2015-01-29 22:00:03 +00:00
Morris Jobke 5b4fd12b5b add CSS to exception page - fixes #13747 2015-01-29 20:18:08 +01:00
Vincent Petry 790622e9fd Merge pull request #13772 from owncloud/closecursor-allconfig
Close cursor after checking for existing config values
2015-01-29 19:31:21 +01:00
Morris Jobke b1d8d88df8 Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares
make sure that we always create a public share key for remote shares
2015-01-29 17:54:04 +01:00
Joas Schilling 333f4e7913 Fix intendation 2015-01-29 16:57:46 +01:00
Joas Schilling 4a5f626979 Fix more assertions 2015-01-29 16:54:27 +01:00
Joas Schilling 9a7dd57bc8 Fix 2 assertions 2015-01-29 16:09:35 +01:00
Thomas Müller 5c8e5e223d Merge pull request #13728 from owncloud/federated_cloud
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:54:19 +01:00
Robin Appelman ce0aa02aac Dont do a cache rename if we cant delete the source file 2015-01-29 15:52:40 +01:00
Robin Appelman 215388f4e0 Make sure we delete the file when doing a cross storage trashbin move 2015-01-29 15:40:01 +01:00
Robin Appelman d4c4e2a322 Detect failed deletes in the trashbin 2015-01-29 15:39:58 +01:00
Robin Appelman 2124540d1d Dont remove a file from cache if the delete operation failed 2015-01-29 15:39:56 +01:00
Lukas Reschke 65ec950b27 Merge pull request #13757 from owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces
Scroll to file in folder, when using "search in other places" link
2015-01-29 15:36:25 +01:00
Bjoern Schiessle 8a091629dc rename 'server-to-server sharing' to 'federated cloud' 2015-01-29 15:05:39 +01:00
Björn Schießle 2c1bacadca Merge pull request #13762 from owncloud/ignore_trailing_slash
ignore trailing slash for remote URL
2015-01-29 15:00:44 +01:00
Morris Jobke acf0582029 Merge pull request #13752 from owncloud/closecursor1
Close cursor early in calculateFolderSize
2015-01-29 14:23:16 +01:00
Bjoern Schiessle c78e3c4a7f make sure that we always create a public share key for remote shares 2015-01-29 14:23:14 +01:00
Morris Jobke a685354aee Merge pull request #13682 from owncloud/webdav-single-file-put
Fix WebDAV put for single file shares
2015-01-29 14:19:27 +01:00
Bjoern Schiessle 82de50d5b9 remove trailing slash 2015-01-29 14:03:09 +01:00
Thomas Müller a25063a8ed Merge pull request #13746 from owncloud/no-groups-provisioning-api
disallow provisioning api to be enabled for groups only
2015-01-29 12:47:54 +01:00
Robin Appelman 05035ef4af Fix webdav put for single file webdav shares 2015-01-29 12:47:12 +01:00