Commit Graph

25695 Commits

Author SHA1 Message Date
Thomas Müller 9be1d08c3c Merge pull request #17162 from owncloud/LukasReschke-patch-1
Create .htaccess
2015-06-25 11:44:38 +02:00
Morris Jobke cdb0e62e9b [license script] sort names case insensitive 2015-06-25 11:43:07 +02:00
Lukas Reschke 08984154cd Create .htaccess
Ref https://github.com/owncloud/core/pull/16724#discussion_r33236344 – shouldn't hurt also.
2015-06-25 11:23:11 +02:00
Morris Jobke 5cb1e20214 remove duplicate ID in HTML template for public shares 2015-06-25 10:13:56 +02:00
Morris Jobke 1601867c9d Remove unneeded getetag entries in properties table
* fixes #13281
2015-06-25 08:44:26 +02:00
Morris Jobke 160d8003f8 Merge pull request #17152 from owncloud/LDAP/AD-Typo
Ldap/ad typo
2015-06-25 07:56:04 +02:00
Jenkins for ownCloud dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Lukas Reschke a63f6023fd Dropped an S from the mouseover
We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
2015-06-24 22:10:10 +02:00
Bjoern Schiessle 407db913de add occ command to trashbin to remove deleted files 2015-06-24 19:09:20 +02:00
Vincent Petry 58439c337c Merge pull request #17070 from owncloud/lock-movemountbug
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
Robin Appelman c87ab65081 fix etag propagation for single file shares 2015-06-24 18:16:03 +02:00
Robin Appelman f847d9409e add unit test for single file share etag propagation 2015-06-24 18:16:03 +02:00
Morris Jobke 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
Lukas Reschke 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
Thomas Müller 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
Vincent Petry 8859004a2b Rollback folder scan if an entry was locked 2015-06-24 15:42:00 +02:00
Thomas Müller 047b7a13a3 Let's wait a little longer until oracle finally is available 2015-06-24 14:09:32 +02:00
Thomas Müller 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
Thomas Müller 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
Roeland Jago Douma 6c3da1ec90 Added unit test to verify link password removeal 2015-06-24 12:38:33 +02:00
Roeland Jago Douma 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
Morris Jobke 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
Morris Jobke 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
Thomas Müller 4da1c84296 Rename user_webdavauth to prevent accidental activation - refs #17112 2015-06-24 12:17:17 +02:00
Thomas Müller 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
Joas Schilling 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
Vincent Petry 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
Thomas Müller 5c213539af Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107 2015-06-24 11:06:29 +02:00
Morris Jobke 17ff77c4e7 [Repair] add repair info for changed collation 2015-06-24 10:25:07 +02:00
Morris Jobke 5ff536b45a [upgrade] add verbosity check and show repair info & steps 2015-06-24 10:25:05 +02:00
Joas Schilling dba5d5e205 Use a OutputFormatter instead of hacking into writeln() 2015-06-24 09:26:30 +02:00
Joas Schilling d8b9f6ac23 Use logtimezone and logdateformat 2015-06-24 09:24:28 +02:00
Morris Jobke 0137a3c5e0 [upgrade] show timestamp for output during upgrade
* added --show-timestamp option
2015-06-24 09:24:25 +02:00
Jenkins for ownCloud ceb80ac123 [tx-robot] updated from transifex 2015-06-24 01:55:55 -04:00
Morris Jobke 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
Morris Jobke 02b2b60581 Merge pull request #17095 from owncloud/proper-error-handling
Proper error handling
2015-06-23 17:40:55 +02:00
Joas Schilling 0db311c9db Only update the htaccess ErrorDocument links when they are not set yet 2015-06-23 16:45:56 +02:00
Vincent Petry 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
Morris Jobke c86e129ce9 [updater] keep maintenance active on failure and mark failure in red 2015-06-23 14:45:53 +02:00
Björn Schießle cce841c665 Merge pull request #17045 from owncloud/enc_improvements
encryption improvements
2015-06-23 14:30:21 +02:00
Jan-Christoph Borchardt 71e5bc1803 explicitly set z-index on app-content, fix overlap from navigation 2015-06-23 14:03:27 +02:00
Jörn Friedrich Dreyer 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
Morris Jobke 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
Joas Schilling 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
Bjoern Schiessle 95602d4069 make sure that we always read the header from the original file 2015-06-23 11:41:21 +02:00
Joas Schilling e0fb5f4b5e Accept this language change at your own risk 2015-06-23 10:59:15 +02:00
Morris Jobke 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
Morris Jobke fdd01cf15c Added error message on initMountpoints exception 2015-06-23 09:54:03 +02:00
Lukas Reschke 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
Morris Jobke a059b090c3 Merge pull request #17085 from owncloud/use-trusted-mimetype
Use trusted mimetype
2015-06-23 08:45:05 +02:00