Commit Graph

9719 Commits

Author SHA1 Message Date
Lukas Reschke ad4c731c4c Correct regular expressions
Previously the regex was only matching on single characters. Meaning that file names such as "👍.txt" where possible while "👍" alone never was. This check apparently never worked as expected.
2015-07-30 11:22:14 +02:00
Jenkins for ownCloud e77b2e5317 [tx-robot] updated from transifex 2015-07-29 01:55:08 -04:00
Morris Jobke c34e63bb1f Merge pull request #15543 from rullzer/mimetypedetector
Mimetypedetector
2015-07-28 13:35:26 +02:00
Roeland Douma 73169b0edb Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file
Remote shares should be uique
2015-07-28 13:06:25 +02:00
Jenkins for ownCloud c683b1d3c9 [tx-robot] updated from transifex 2015-07-28 01:55:00 -04:00
Vincent Petry 6ada1e3276 Merge pull request #17902 from owncloud/fix_17898
get header size before we open the file to avoid locking exception
2015-07-27 16:58:32 +02:00
Thomas Müller 68f14a943a Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption
Only set is encrypted when encryption is enabled
2015-07-27 16:06:39 +02:00
Roeland Jago Douma d276aebf40 Pass config dir as parameter to detection class
In order to properly test the mimetype function:

* constructor takes path to configdir
* Added unit tests for mimetype (only if vfsStream is available)
2015-07-27 14:59:49 +02:00
Roeland Jago Douma 88fb389eab Proper deprecate methods 2015-07-27 14:59:49 +02:00
Roeland Jago Douma 9cdd637050 Loading of mapping/aliases is done in class 2015-07-27 14:59:49 +02:00
Roeland Jago Douma 141a0f0f47 Move mimetypedetection to files/type/detection 2015-07-27 14:59:45 +02:00
Roeland Jago Douma 6db6689740 Added mimetype detector
* Copied unit tests from old functions
2015-07-27 14:58:45 +02:00
Bjoern Schiessle 0736b45d92 get header size before we open the file to avoid locking exception 2015-07-27 14:29:07 +02:00
Thomas Müller c030ae9dec Merge pull request #17879 from owncloud/scan-check-path
check if the user is trying to scan a valid path
2015-07-27 13:39:53 +02:00
Robin Appelman f74525c349 check if the user is trying to scan a valid path 2015-07-27 11:21:48 +02:00
Morris Jobke c9e22f70c8 Add PHPDoc for classes and interfaces 2015-07-27 10:49:26 +02:00
Thomas Müller 11244736ae Merge pull request #17838 from owncloud/sharing-password-policy-master
Use a hook to integrate sharing password verification
2015-07-24 16:47:18 +02:00
Thomas Müller 1f8ee61006 Merge pull request #17755 from owncloud/alias-container-alive
Add registerAlias method to shortcut interface registration #17714
2015-07-24 13:11:32 +02:00
Morris Jobke 5265a44260 Remove commented code 2015-07-24 00:47:41 +02:00
Bernhard Posselt 582f07950f Merge pull request #17075 from owncloud/bootstrap-tooltip
Replace jQuery tipsy with bootstrap tooltip
2015-07-23 19:25:09 +02:00
Thomas Müller 632e39a750 Fix PHPDoc on setPassword 2015-07-23 16:11:06 +02:00
Joas Schilling 9cee8ff9f8 Only set is encrypted when encryption is enabled 2015-07-23 15:18:59 +02:00
Thomas Müller ac08685234 Use a hook to integrate sharing password verification 2015-07-23 14:44:48 +02:00
Joas Schilling 20cd0ae55b Add a log message when the Doctrine Query Builder is retrieved 2015-07-21 15:53:28 +02:00
Joas Schilling f9071ed5b7 Comment out LIMIT 0 case because of the mixed results 2015-07-21 15:25:48 +02:00
Joas Schilling c9564503c2 Fix tests for setFirstResult and setMaxResults on oracle 2015-07-21 15:25:48 +02:00
Joas Schilling f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling 516f7e8299 Add unit tests and automatic quoting 2015-07-21 15:25:47 +02:00
Joas Schilling de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +02:00
Joas Schilling 1bfb944d51 Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers 2015-07-21 15:25:47 +02:00
Morris Jobke 2d691c2fb4 Merge pull request #17381 from owncloud/fix_sharing_add_to_group
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
Roeland Douma 40170f35f6 Merge pull request #17766 from owncloud/escape-ampersand
Escape ampersand in logout URL
2015-07-21 09:32:16 +02:00
Jenkins for ownCloud 24f12e65ec [tx-robot] updated from transifex 2015-07-21 01:54:52 -04:00
Morris Jobke 5a5c59639b Escape ampersand in logout URL
* fixes #17757
2015-07-21 00:26:30 +02:00
Bernhard Posselt d20e2002a6 Merge pull request #17743 from owncloud/return-proper-statuscodes
Return proper status code in case of a CORS exception
2015-07-20 18:03:25 +02:00
Lukas Reschke 7dda86f371 Return proper status code in case of a CORS exception
When returning a 500 statuscode external applications may interpret this as an error instead of handling this more gracefully. This will now make return a 401 thus.

Fixes https://github.com/owncloud/core/issues/17742
2015-07-20 12:54:22 +02:00
Joas Schilling 0dd1a785fe Merge pull request #16935 from owncloud/allow-app-check-code-for-deprecated-classes
Allow app check code for deprecated classes
2015-07-20 08:39:53 +02:00
Jenkins for ownCloud 83a13c0635 [tx-robot] updated from transifex 2015-07-20 01:54:47 -04:00
Lukas Reschke 1e4496c1cb Merge pull request #17698 from owncloud/allow-update-of-disabled-apps
Allow upgrade of not enabled apps
2015-07-19 12:14:13 +02:00
Bernhard Posselt a4e3939204 add registerAlias method to shorcut interface registration
remove unused import

add since tag

fix typo
2015-07-18 13:43:54 +02:00
Björn Schießle f363fc2d4a Merge pull request #17540 from owncloud/enc_detect_legacy_files2
make sure that we always detect legacy files correctly
2015-07-17 21:42:32 +02:00
Thomas Müller 2e1cc2d825 Merge pull request #17682 from owncloud/fix-undefined-REMOTE_ADDR-master
Fixing 'Undefined index: REMOTE_ADDR'
2015-07-17 14:27:33 +02:00
Bjoern Schiessle 16d8014cdd set targetIsEncrypted to true if file cache indicates that we try to read a encrypted file 2015-07-17 13:30:08 +02:00
Bjoern Schiessle a2e2005e67 make sure that we always detect legacy files correctly 2015-07-17 13:30:08 +02:00
Morris Jobke f7a78cf650 Merge pull request #17663 from owncloud/occ-memcache
Missing memcache should not cause occ hard-fail
2015-07-17 13:15:47 +02:00
Joas Schilling 3566dcf246 PR #17046 deprecated OCP\Util::mb_(sub)str_replace() 2015-07-17 12:34:56 +02:00
Joas Schilling 8a64abf4e4 Only decorate the type when it was matched 2015-07-17 12:34:56 +02:00
Joas Schilling a0c6f2e5e0 Use the decorator pattern 2015-07-17 12:34:56 +02:00
Joas Schilling bba87a2a3b Restructor the code into different classes instead of extending 2015-07-17 12:34:56 +02:00
Joas Schilling eb1c437941 Check for methods as good as possible 2015-07-17 12:34:56 +02:00