37d085901b
Merge pull request #17706 from rullzer/external_diricon_filelist
...
The external directories should get the correct icon in filelist
2015-07-17 16:39:46 +02:00
b0f21c0a43
The external directories should get the correct icon
2015-07-17 14:30:12 +02:00
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
c00211034d
Merge pull request #17490 from owncloud/fix-closest
...
Fix browser compatibility issue for element.closest()
2015-07-17 14:10:35 +02:00
de555cf229
Merge pull request #17670 from owncloud/timeout-oracle-docker-startup
...
[autotest] timeout oracle docker startup after 2 minutes
2015-07-17 13:51:20 +02:00
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
3fae984b56
Merge pull request #17282 from owncloud/s2s-catchremotelockexceptions
...
Throw lock exceptions if remote share returned 423 status code
2015-07-17 11:34:34 +02:00
8723410319
[tx-robot] updated from transifex
2015-07-17 01:54:52 -04:00
bd71540c8a
Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460
2015-07-16 16:40:57 +02:00
15877ac7eb
Merge pull request #17474 from owncloud/fix_trashbin
...
Don't try to move files to the trashbin outside of user/files
2015-07-16 14:15:45 +02:00
d6f02eb703
Merge pull request #17500 from owncloud/encryption_migration_improvements
...
Only clean up if migration finished succesfully
2015-07-16 14:03:21 +02:00
a6daafa3cd
[autotest] timeout oracle docker startup after 2 minutes
2015-07-16 11:51:15 +02:00
bfb90d10ed
Merge pull request #17046 from nicolas-grekas/fix-16654
...
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:35:25 +02:00
472d48f6e3
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:00:04 +02:00
8efa23c895
Fix memcache factory unit tests
2015-07-16 03:53:18 +01:00
e556d97b64
Fix memcache factory creation when not installed
...
Memcache factory expects a class name, not an instantiated object
2015-07-15 22:55:30 +01:00
7830434d78
Missing memcache should not cause occ hard-fail
...
Warning is now printed to logs, but occ and cron will still work.
2015-07-15 22:53:14 +01:00
dce462c28d
Merge pull request #17660 from owncloud/properly-wait-for-oracle-docker
...
[autotest] wait for oracle docker container initialization instead of…
2015-07-15 17:26:40 +02:00
a5016cfee8
Merge pull request #17659 from owncloud/files-scan-user-path
...
Lock scanner to the given user
2015-07-15 16:17:24 +02:00
004d670d31
[autotest] wait for oracle docker container initialization instead of waiting a hard coded time
2015-07-15 15:38:50 +02:00
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
23d1cf26b9
Lock scanner to the given user
2015-07-15 14:08:06 +02:00
5581ae12a1
[tx-robot] updated from transifex
2015-07-15 01:54:43 -04:00
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
5cd7f7eccd
Merge pull request #17623 from owncloud/fed-throwcorrectexception
...
Throw storage not available on guzzle error
2015-07-14 10:12:32 +02:00
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
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
2d5ddb02fa
[tx-robot] updated from transifex
2015-07-14 01:54:45 -04:00
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
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
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
e18d0e26f6
Merge pull request #17599 from owncloud/fix-joinpaths-trailingslash
...
Fix OC.joinPaths with empty arguments
2015-07-13 17:25:27 +02:00
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
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
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
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
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
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
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
52e9c94e08
[tx-robot] updated from transifex
2015-07-13 01:54:50 -04:00
7cf6badad5
[tx-robot] updated from transifex
2015-07-12 01:54:49 -04:00
bfd7194cf9
[tx-robot] updated from transifex
2015-07-11 01:54:51 -04:00
ee7ccc9c3d
Merge pull request #17559 from owncloud/js-joinpathsutility
...
Add OC.joinPaths for convenient path joining
2015-07-10 17:07:19 +02:00
fbc03b43b9
More tests for joinPaths
2015-07-10 15:31:58 +02:00
8cac236135
Move to OC::$configDif
2015-07-10 15:15:50 +02:00
a7c7d394ec
Merge pull request #17555 from owncloud/update-test-libraries
...
Update JS unit test libs
2015-07-10 15:11:53 +02:00
c9917e4cd6
allow remote shares for users with email as usernames
2015-07-10 14:58:32 +02:00
119e27166e
Add OC.joinPaths for convenient path joining
2015-07-10 13:02:28 +02:00
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
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
Morris Jobke
Roeland Jago Douma
Thomas Müller
Jenkins for ownCloud
Vincent Petry
blizzz
Nicolas Grekas
Robin McCorkell
Robin Appelman
Roeland Douma
Felix Böhm