Morris Jobke
004d670d31
[autotest] wait for oracle docker container initialization instead of waiting a hard coded time
2015-07-15 15:38:50 +02:00
Morris Jobke
e46ec4a6b6
Merge pull request #17639 from owncloud/remove-file-target-index
...
Remove index on file_target of share table
2015-07-15 14:24:37 +02:00
Robin Appelman
23d1cf26b9
Lock scanner to the given user
2015-07-15 14:08:06 +02:00
Roeland Jago Douma
e35b97e4c5
Added test
2015-07-15 12:49:26 +02:00
Roeland Jago Douma
fea71a81fd
Cannot share the same file multiple times with remote user
...
Fix for #17183
It should not be possible to create multiple remote shares from user A
to user B of the same file/folder.
2015-07-15 12:42:40 +02:00
Morris Jobke
43afa4c0e3
refactor this to proper separation of concerns
2015-07-15 11:14:20 +02:00
Jenkins for ownCloud
5581ae12a1
[tx-robot] updated from transifex
2015-07-15 01:54:43 -04:00
Morris Jobke
ff5bd9d918
Remove index on file_target of share table
...
* causes issues on InnoDB because it exceeds the maximal key length
of an index which is 767 (3-byte charset * varchar(512) = 1536)
* fixes #17619
2015-07-14 13:26:51 +02:00
Morris Jobke
5cd7f7eccd
Merge pull request #17623 from owncloud/fed-throwcorrectexception
...
Throw storage not available on guzzle error
2015-07-14 10:12:32 +02:00
Morris Jobke
eab1116924
Merge pull request #17606 from owncloud/appstore-timeout
...
Handle returned null value in app level code
2015-07-14 08:57:37 +02:00
Morris Jobke
c601fb8181
Merge pull request #17620 from owncloud/s2s-hasupdated-catch405
...
Throw StorageNotAvailable if propfind on root failed
2015-07-14 08:56:53 +02:00
Jenkins for ownCloud
2d5ddb02fa
[tx-robot] updated from transifex
2015-07-14 01:54:45 -04:00
Roeland Douma
695af190f6
Merge pull request #17565 from owncloud/fix/remote_share
...
allow remote shares for users with email as usernames
2015-07-13 21:22:09 +02:00
Vincent Petry
3d6be69f25
Throw storage not available on guzzle error
...
If the remote server is in maintenance mode, we must throw storage not
available exception instead of not found which might auto-remove the
share.
2015-07-13 18:51:25 +02:00
Vincent Petry
f62d94c4ff
Throw StorageNotAvailable if propfind on root failed
...
If PROPFIND fails with 404 or 405 on the remote share root, it means the
storage is not available. Throw StorageNotAvailable is such case.
2015-07-13 18:28:53 +02:00
Morris Jobke
e18d0e26f6
Merge pull request #17599 from owncloud/fix-joinpaths-trailingslash
...
Fix OC.joinPaths with empty arguments
2015-07-13 17:25:27 +02:00
Vincent Petry
e4ed995727
Merge pull request #17605 from owncloud/pwebdav-stripmountinfo
...
Strip public webdav info about sharing and mount points
2015-07-13 17:21:40 +02:00
Morris Jobke
08faf1811b
Merge pull request #17609 from owncloud/core-js-helpersforcurrenturl
...
Add helper functions for host, port and webroot
2015-07-13 17:19:28 +02:00
Morris Jobke
533a23611a
Handle returned null value in app level code
...
* getApplication on OCSClient can also return null
this is now handled properly
* fixes #17587
2015-07-13 15:34:00 +02:00
Vincent Petry
b56a57e21c
Add helper functions for host, port and webroot
...
These should be used in the future instead of location.*.
It will make it possible to stub these methods for writing unit tests
and simulating different URL schemes.
2015-07-13 15:26:01 +02:00
Vincent Petry
b3b080e1c0
Strip public webdav info about sharing and mount points
...
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
2015-07-13 14:20:35 +02:00
Vincent Petry
1b7d42c569
Fix OC.joinPaths with empty arguments
...
When empty arguments are given, the leading or trailing slash was not
detected properly.
2015-07-13 10:57:52 +02:00
Morris Jobke
1006ec56ce
Merge pull request #17481 from rullzer/mimetype-list
...
Move mimetypes.list.php to config/mimetypemapping.dist.json
2015-07-13 08:31:18 +02:00
Jenkins for ownCloud
52e9c94e08
[tx-robot] updated from transifex
2015-07-13 01:54:50 -04:00
Jenkins for ownCloud
7cf6badad5
[tx-robot] updated from transifex
2015-07-12 01:54:49 -04:00
Jenkins for ownCloud
bfd7194cf9
[tx-robot] updated from transifex
2015-07-11 01:54:51 -04:00
Morris Jobke
ee7ccc9c3d
Merge pull request #17559 from owncloud/js-joinpathsutility
...
Add OC.joinPaths for convenient path joining
2015-07-10 17:07:19 +02:00
Vincent Petry
fbc03b43b9
More tests for joinPaths
2015-07-10 15:31:58 +02:00
Roeland Jago Douma
8cac236135
Move to OC::$configDif
2015-07-10 15:15:50 +02:00
Vincent Petry
a7c7d394ec
Merge pull request #17555 from owncloud/update-test-libraries
...
Update JS unit test libs
2015-07-10 15:11:53 +02:00
Felix Böhm
c9917e4cd6
allow remote shares for users with email as usernames
2015-07-10 14:58:32 +02:00
Vincent Petry
119e27166e
Add OC.joinPaths for convenient path joining
2015-07-10 13:02:28 +02:00
Roeland Douma
4806d7597b
Merge pull request #17509 from rullzer/mimetype-alias-dist
...
Move mimetypealiases.json to mimetypealiases.dist.json
2015-07-10 11:44:09 +02:00
Vincent Petry
9d71542ee4
Update JS unit test libs
...
Update sinon to 1.15.4.
Update karma-jasmine to 0.3.0
Update jasmine to 2.3.4
This brings a bunch of new useful functions for unit testing.
2015-07-10 11:21:47 +02:00
Roeland Jago Douma
032ffc969e
Move mimetypealiases.json to mimetypealiases.dist.json
2015-07-10 10:17:49 +02:00
Vincent Petry
87f3500fda
Merge pull request #17483 from rullzer/migrate-mimetype-js
...
Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
2015-07-10 10:14:03 +02:00
Jenkins for ownCloud
176dabd976
[tx-robot] updated from transifex
2015-07-10 01:54:55 -04:00
Morris Jobke
e3b4e4f0f3
Merge pull request #17546 from owncloud/forwardport-16917
...
Fix the config.php owner check for console.php
2015-07-10 02:34:58 +02:00
Morris Jobke
bceb38ce82
Merge pull request #17517 from RealRancor/fix_failed_login_syntax
...
Fixed "Remote IP:" syntax on failed logins
2015-07-10 02:34:09 +02:00
Philippe Le Brouster
12b751ddc9
Fix the config.php owner check for console.php
...
The config directory must be taken from OC::$configDir
Minor fix
- Remove uneeded slash in the configdir path.
2015-07-09 23:19:52 +02:00
Morris Jobke
c86e742e67
Merge pull request #15586 from Egari/addThemeSupportToMimeIcon
...
Add theme support to mimetypeIcon through imagePath integration
2015-07-09 23:02:46 +02:00
Morris Jobke
42eb18c747
Merge pull request #17473 from owncloud/enc_fix_migration
...
more secure way to update the database
2015-07-09 22:41:56 +02:00
Morris Jobke
28e4542b58
Merge pull request #17530 from owncloud/proper-config-for-singleuser-command
...
[command] single user mode - use config object & add tests
2015-07-09 22:20:02 +02:00
Roeland Jago Douma
eb7a796ad9
Fix unit tests
2015-07-09 18:42:46 +02:00
Morris Jobke
08afce3d7e
[command] single user mode - use config object & add tests
2015-07-09 18:33:46 +02:00
Morris Jobke
d52e197b0d
Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder
...
Add getUserFolder to IRootFolder
2015-07-09 14:29:47 +02:00
Roeland Jago Douma
eea56dc309
MimeTypes now also supports httpd/unix-directory
...
Since we both use dir and httpd/unix-directory in OC they should map to
the same icon.
Fixes #17527
2015-07-09 14:19:31 +02:00
Roeland Jago Douma
7d943b2ddc
Make the filelist get the mimetypeicon from the mimetype
2015-07-09 13:56:43 +02:00
Roeland Jago Douma
a727cbc7a9
Remove ajax/mimeicon.php and its route
2015-07-09 13:40:13 +02:00
Roeland Jago Douma
5c381ea532
Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl
2015-07-09 13:40:13 +02:00