663cd7af4d
integration test
2015-06-30 12:52:27 +02:00
8625a8cf23
ensure groups match filter when using memberOf to read users group, refs #17119
2015-06-26 16:42:11 +02:00
58439c337c
Merge pull request #17070 from owncloud/lock-movemountbug
...
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
5f59393b30
Merge pull request #17110 from owncloud/share-error-handling
...
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
004280e407
Merge pull request #17136 from rullzer/fix_remove_link_OCS
...
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
1e7a3a4b3b
Merge pull request #17139 from owncloud/increase-oracle-init-time
...
Let's wait a little longer until oracle finally is available
2015-06-24 16:17:23 +02:00
8859004a2b
Rollback folder scan if an entry was locked
2015-06-24 15:42:00 +02:00
047b7a13a3
Let's wait a little longer until oracle finally is available
2015-06-24 14:09:32 +02:00
7a3cfbc3c8
Merge pull request #17133 from owncloud/rename-user-webdavauth
...
Rename user_webdavauth to prevent accidental activation - refs #17112
2015-06-24 13:57:52 +02:00
161ca900e0
Merge pull request #17130 from owncloud/update-mime-types
...
Update wmv and add mts and mt2s
2015-06-24 13:35:58 +02:00
6c3da1ec90
Added unit test to verify link password removeal
2015-06-24 12:38:33 +02:00
6977eff106
set NULL correctly in password update
...
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
2015-06-24 12:37:59 +02:00
6be0f833d0
Merge pull request #17105 from owncloud/app-content-z-index
...
explicitly set z-index on app-content, fix overlap from navigation
2015-06-24 12:27:29 +02:00
300d1c88d0
Merge pull request #17106 from owncloud/htaccess-update-only-once
...
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-24 12:20:22 +02:00
4da1c84296
Rename user_webdavauth to prevent accidental activation - refs #17112
2015-06-24 12:17:17 +02:00
9e93d1ed25
Merge pull request #17131 from owncloud/non-zero-exit-code-when-app-is-not-compliant
...
Use non-zero exit code when app is not compliant (so CIs can detect t…
2015-06-24 12:06:04 +02:00
e5bc50d156
Use non-zero exit code when app is not compliant (so CIs can detect the status)
2015-06-24 11:59:43 +02:00
35047a2300
Fix locked paths in the moveMount case
...
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.
Other operations will still lock the attached storage root.
2015-06-24 11:33:28 +02:00
5c213539af
Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107
2015-06-24 11:06:29 +02:00
ceb80ac123
[tx-robot] updated from transifex
2015-06-24 01:55:55 -04:00
4f2f8a6f28
[sharing] handle shares of users that aren't available anymore
...
* properly handle the case where an abandoned share is left and
simply skip it
2015-06-23 18:22:36 +02:00
02b2b60581
Merge pull request #17095 from owncloud/proper-error-handling
...
Proper error handling
2015-06-23 17:40:55 +02:00
0db311c9db
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-23 16:45:56 +02:00
e01db549a0
Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message
...
adding correct blocking logic for ffw
2015-06-23 15:08:47 +02:00
c86e129ce9
[updater] keep maintenance active on failure and mark failure in red
2015-06-23 14:45:53 +02:00
cce841c665
Merge pull request #17045 from owncloud/enc_improvements
...
encryption improvements
2015-06-23 14:30:21 +02:00
71e5bc1803
explicitly set z-index on app-content, fix overlap from navigation
2015-06-23 14:03:27 +02:00
4b5324341c
Merge pull request #17090 from owncloud/upgrade-app-info
...
[upgrade] print update message before running the update code
2015-06-23 13:14:35 +02:00
1ba9fd3ada
[upgrade] print update message before running the update code
...
* otherwise you don't know during which app update something failed
2015-06-23 13:13:44 +02:00
e722614639
Merge pull request #17092 from owncloud/fix-language-experimental
...
Accept this language change "at your own risk"
2015-06-23 12:14:11 +02:00
95602d4069
make sure that we always read the header from the original file
2015-06-23 11:41:21 +02:00
e0fb5f4b5e
Accept this language change at your own risk
2015-06-23 10:59:15 +02:00
fe42553e8a
[updater] propagate error case properly
...
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
2015-06-23 10:03:27 +02:00
fdd01cf15c
Added error message on initMountpoints exception
2015-06-23 09:54:03 +02:00
2654696086
Merge pull request #17081 from owncloud/issue-17079-risky-test-sabre-objecttree
...
Make an assertion in risky test testGetNodeForPathRoot
2015-06-23 09:11:36 +02:00
a059b090c3
Merge pull request #17085 from owncloud/use-trusted-mimetype
...
Use trusted mimetype
2015-06-23 08:45:05 +02:00
3cad0d4ed2
[tx-robot] updated from transifex
2015-06-23 01:56:15 -04:00
25581c7b63
Merge pull request #16940 from owncloud/ext-s3-touchmtimefix
...
Properly set mtime on S3 for touch operation
2015-06-22 22:25:45 +02:00
5466dcadc0
adding correct blocking logic for fff
2015-06-22 11:42:42 -04:00
5cfcda3e95
Merge pull request #17068 from owncloud/fix_16878
...
fix search for results only from subfolder
2015-06-22 17:55:56 +03:00
45f9083a58
Make an assertion in risky test testGetNodeForPathRoot
2015-06-22 16:49:04 +02:00
9dde482315
remove whitespace on bottom when no search results, fix laylout, fix #16878
2015-06-22 15:30:29 +02:00
3d2ac6dbb6
Use trusted mimetype
...
We shall not use untrusted mimetypes in this context
2015-06-22 15:30:27 +02:00
a88b370dc8
Merge pull request #12546 from oparoz/patch-1
...
Send the mime icon if we can't generate a preview
2015-06-22 13:55:17 +02:00
8eda9ae83c
add filter-empty class if no search result in current folder
2015-06-22 12:13:05 +02:00
ced15c44b4
Merge pull request #16657 from owncloud/view-emit-path
...
emit hooks from a view as long as the path is inside the default root
2015-06-22 11:29:11 +02:00
7fe5ab4d4a
Merge pull request #17056 from owncloud/appframework-type-cast
...
Allow multiple whitespace in type hints in AppFramework
2015-06-22 10:35:28 +02:00
c77e44117d
[tx-robot] updated from transifex
2015-06-22 01:55:00 -04:00
05fb9ceef9
Merge pull request #17025 from owncloud/sftp-rmdir-emptydir
...
Workaround for empty dir deletion for SFTP
2015-06-21 23:50:58 +01:00
103f8ca6e8
Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm
...
Use proper type
2015-06-21 23:33:19 +01:00
Arthur Schiwon
Vincent Petry
Morris Jobke
Lukas Reschke
Thomas Müller
Roeland Jago Douma
Joas Schilling
Jenkins for ownCloud
Björn Schießle
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Joas Schilling
Bjoern Schiessle
Clark Tomlinson
VicDeo
Bernhard Posselt
Robin McCorkell