Joas Schilling
31b93ac19a
Do not overwrite the shareType so the post hook is still correct
2015-02-09 12:59:29 +01:00
Jenkins for ownCloud
e2d4b3c123
[tx-robot] updated from transifex
2015-02-09 01:54:53 -05:00
Lukas Reschke
0e604aa875
Merge pull request #13948 from owncloud/cache-move-transaction
...
Use transactions when renaming directory contents
2015-02-08 19:08:52 +01:00
Jenkins for ownCloud
60e771685e
[tx-robot] updated from transifex
2015-02-08 01:54:53 -05:00
Morris Jobke
90556cb70b
Merge pull request #12283 from oparoz/sfnt-fonts
...
Updated the media type of some font types
2015-02-07 13:33:49 +01:00
Morris Jobke
11ded92a73
Merge pull request #13830 from owncloud/fix-redirect-404
...
Don't encode url unecessary twice
2015-02-07 13:24:47 +01:00
Jenkins for ownCloud
4bf7b2c130
[tx-robot] updated from transifex
2015-02-07 01:54:35 -05:00
Robin Appelman
6c00521e8b
Use transactions when renaming directory contents
2015-02-06 15:20:53 +01:00
Thomas Müller
bc56fef619
Merge pull request #13932 from owncloud/revert-sabredav-etag-master
...
Revert "adding OC-ETag header"
2015-02-06 12:05:32 +01:00
Lukas Reschke
4d91fa4c93
Normalize before processing
2015-02-06 15:03:29 +01:00
Jenkins for ownCloud
bd60abbefc
[tx-robot] updated from transifex
2015-02-06 01:57:07 -05:00
Vincent Petry
8210200770
Revert "adding OC-ETag header"
...
This reverts commit 96a931929e
.
2015-02-05 20:43:37 +01:00
Björn Schießle
486f49ed72
Merge pull request #13881 from owncloud/upload_to_root_of_mountpoint
...
detect root of mountpoint also if the trailing slash is missed
2015-02-04 14:44:02 +01:00
Bjoern Schiessle
21c45925fe
detect root of mountpoint also if the trailing slash is missed
2015-02-04 12:47:04 +01:00
Jenkins for ownCloud
77e9c212ed
[tx-robot] updated from transifex
2015-02-04 01:55:49 -05:00
Thomas Müller
23c6a0cf99
Merge pull request #13843 from owncloud/fix-files-disabled
...
Fix disabled files app
2015-02-03 16:13:15 +01:00
Morris Jobke
d70160c607
enabled disabled files app in repair step
2015-02-03 14:03:43 +01:00
Thomas Müller
9e222ec841
Merge pull request #13791 from owncloud/extstorage-fixdavexceptions
...
Fix DAV exceptions, some will still return false now
2015-02-03 13:31:32 +01:00
Jenkins for ownCloud
6aef13fb07
[tx-robot] updated from transifex
2015-02-03 01:54:50 -05:00
Morris Jobke
a7eedf0149
Disallow disabling of files app
2015-02-03 00:39:01 +01:00
Lukas Reschke
2bd1c17345
Don't encode url unecessary twice
...
The URL was previously encoded twice which leads to getting redirected to a 404 page when the password has been entered incorrect at least once.
Testplan:
- [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin ` redirects to the admin page when providing the correct credentials
- [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin ` redirects to the admin page when providing the invalid credentials and then providing valid ones.
- [ ] Logging in as admin then going to the admin page and clearing the cookies and refreshing will show the login and when repeating the above test steps you're redirected correctly.
Fixes https://github.com/owncloud/core/issues/9804
2015-02-02 15:09:59 +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
Thomas Müller
82b271855c
add libs which have no version number
2015-02-02 10:49:46 +01:00
Jenkins for ownCloud
800829d93d
[tx-robot] updated from transifex
2015-02-02 01:54:32 -05:00
Jenkins for ownCloud
a3067b3b9f
[tx-robot] updated from transifex
2015-02-01 01:54:33 -05:00
Jenkins for ownCloud
c877fbdac8
[tx-robot] updated from transifex
2015-01-31 01:54:39 -05: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
Vincent Petry
5ade2854ee
Fix DAV exceptions, some will still return false now
...
Since the Storage interface isn't ready to work directly with exceptions
like Forbidden and NotFound, the DAV storage has been adapted to still
return false when expected.
2015-01-30 12:02:23 +01:00
Jenkins for ownCloud
f4d20dc1f3
[tx-robot] updated from transifex
2015-01-30 01:55:06 -05: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
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
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
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
Bjoern Schiessle
82de50d5b9
remove trailing slash
2015-01-29 14:03:09 +01:00
Robin Appelman
05035ef4af
Fix webdav put for single file webdav shares
2015-01-29 12:47:12 +01:00
Robin Appelman
ddee63fa00
Fix resolving paths for views rooted in a file
2015-01-29 12:47:11 +01:00
Joas Schilling
54303484eb
Scroll to file in folder, when using "search in other places" link
2015-01-29 12:21:20 +01:00
Robin Appelman
41382ef7fc
Merge pull request #13667 from owncloud/rename-always-update-cache
...
Update the cache when renaming even if we dont emit hooks
2015-01-28 17:15:11 +01:00
Robin Appelman
8c9f1a982c
Update the cache when renaming even if we dont emit hooks
2015-01-28 13:44:39 +01:00
Lukas Reschke
20199dd168
Reference module with .c
...
Fixes https://github.com/owncloud/core/issues/13657
2015-01-28 13:15:32 +01:00
Jenkins for ownCloud
55142186de
[tx-robot] updated from transifex
2015-01-28 01:55:53 -05:00
Morris Jobke
1efb1fee11
Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection
...
let init() take a ICollection or an INode - fixes PHP message
2015-01-28 01:14:47 +01:00
Morris Jobke
752b94d363
Merge pull request #13717 from owncloud/storage-donotwrapnullstorage
...
Prevent wrapping null storage
2015-01-28 01:00:20 +01:00
Morris Jobke
87b39e8f03
Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage
...
Catch storage exception in scanner for remote shares
2015-01-28 00:31:37 +01:00