Commit Graph

17483 Commits

Author SHA1 Message Date
Lukas Reschke e910e63140 Merge pull request #8372 from owncloud/give-admins-a-hint
Clarify the trusted_domain error page
2014-04-27 18:28:18 +02:00
Lukas Reschke 1d9ac38da6 Remove an added t by the github webeditor
Notice to myself: Stick to my IDE.
2014-04-27 16:41:09 +02:00
Lukas Reschke 7a8bfeae6e Grammatical fixes 2014-04-27 16:31:04 +02:00
Jenkins for ownCloud 8e5c9eea3a [tx-robot] updated from transifex 2014-04-27 01:54:54 -04:00
Lukas Reschke b6612ef04a Clarify the trusted_domain error page 2014-04-26 23:11:29 +02:00
Thomas Müller a1ddd23289 Merge pull request #8371 from owncloud/example-config
Add another example to the trusted_domains config
2014-04-26 23:00:02 +02:00
Lukas Reschke 2bea7ec2e7 Add another example to the trusted_domains config
Users often ask in IRC or the forum how to add another domain. 
Hopefully they will be able to find it out on their own if we have an example with two domains.
2014-04-26 22:37:30 +02:00
Lukas Reschke 15d05e55cb Merge pull request #8343 from owncloud/fix-status
Use echo since print_unescaped is not defined
2014-04-26 16:51:29 +02:00
icewind1991 7ac7546b71 Merge pull request #8353 from owncloud/publicshare-webdav
Expose public shares over webdav
2014-04-26 15:55:37 +02:00
Andreas Fischer ff6564af57 "echo" is a language construct. Don't treat it like a function. 2014-04-26 14:50:34 +02:00
Lukas Reschke 96c06c14d8 Merge pull request #8341 from owncloud/template-tests-output-buffering
Improve Template Tests by Removing Manual Output Buffering
2014-04-26 12:29:36 +02:00
Jenkins for ownCloud c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Andreas Fischer 63cdf78390 Merge pull request #8355 from owncloud/l10n-expire
typo fix, by translators on transifex

* owncloud/l10n-expire:
  typo fix, by translators on transifex
2014-04-26 01:21:31 +02:00
icewind1991 282ea27ab9 Merge pull request #8356 from owncloud/fix-external-css
fix layout of external storage config table
2014-04-26 00:06:06 +02:00
Morris Jobke ace0293bd1 fix layout of external storage config table 2014-04-25 16:34:48 +02:00
Volkan Gezer ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
icewind1991 7599fa94ce Merge pull request #8350 from owncloud/share-search-mime
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
Robin Appelman b176708505 Expose public shares over webdav 2014-04-25 14:45:18 +02:00
icewind1991 5194f014c9 Merge pull request #7504 from owncloud/webdav-injection
Proper injection of filesystem view into the webdav connector
2014-04-25 14:42:43 +02:00
Robin Appelman 194ea66cb5 Merge branch 'master' into share-search-mime 2014-04-25 14:04:41 +02:00
Robin Appelman b42418246f Also fixed the returned internal path when getting the root shared item by id 2014-04-25 14:04:22 +02:00
icewind1991 6925e722fa Merge pull request #8351 from owncloud/search-mime-substorage
fix paths of searchByMime results on substorages
2014-04-25 14:03:43 +02:00
Robin Appelman 672a8248ce Correct the path returned by getFolderContent for substorages 2014-04-25 13:56:45 +02:00
Jan-Christoph Borchardt b41fc7cb7a Merge pull request #8352 from owncloud/icons
Icon improvements
2014-04-25 13:18:55 +02:00
Morris Jobke 99c2c6b1c6 remove metadata 2014-04-25 13:15:58 +02:00
Jan-Christoph Borchardt 93d2ff73f1 use trash as delete icon to differentiate from close 2014-04-25 12:40:14 +02:00
Robin Appelman 456ca0cf7d fix paths of searchByMime results on substorages 2014-04-25 12:31:44 +02:00
Robin Appelman c53c4b9791 fix search by mime for shared single files 2014-04-25 12:28:10 +02:00
Robin Appelman 4109521cce remove outdated test 2014-04-25 12:24:18 +02:00
Jan-Christoph Borchardt ad9ff07569 compress view-close icon 2014-04-25 12:16:17 +02:00
Robin Appelman 6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Jenkins for ownCloud 3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Andreas Fischer 5eafdf156c Merge pull request #8338 from owncloud/phpunit-4.0-compat
Make PHPUnit_Framework_TestListener implementations compatible to 4.0.

* owncloud/phpunit-4.0-compat:
  Normalise testcleanuplistener.php indentation and end of file.
  Make PHPUnit_Framework_TestListener implementations compatible to 4.0.
2014-04-24 22:00:12 +02:00
Lukas Reschke 1cafd1e3b9 Merge pull request #8337 from owncloud/flv-to-mimes
Add flv to known mimetypes
2014-04-24 19:09:01 +02:00
Björn Schießle f520305848 Merge pull request #8026 from owncloud/remove_shared_folder
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
Lukas Reschke d85b64ede6 Use echo since print_unescaped is not defined
Fixes https://github.com/owncloud/core/issues/8342
2014-04-24 18:41:06 +02:00
Victor Dubiniuk fc4be3d0ad Add flv to known mimetypes 2014-04-24 19:09:31 +03:00
Thomas Müller 40257d9736 Merge pull request #8339 from owncloud/fix_unit_tests
fixing unit tests
2014-04-24 17:28:07 +02:00
Andreas Fischer 916b265cd5 Normalise testcleanuplistener.php indentation and end of file. 2014-04-24 16:42:28 +02:00
Andreas Fischer f45080e811 Use PHPUnit's expectOutputString() instead of performing output buffering. 2014-04-24 15:45:07 +02:00
Andreas Fischer 88778b569e Split testP() tests into multiple methods. 2014-04-24 15:36:02 +02:00
Andreas Fischer 0d3ddd9e11 Remove redundant test case for non-HTML string. 2014-04-24 15:34:09 +02:00
Bjoern Schiessle 35321c7d41 add additional rows to the select statement, 'stime' is needed for the expire check 2014-04-24 15:18:25 +02:00
Andreas Fischer e85fe01faf Make PHPUnit_Framework_TestListener implementations compatible to 4.0. 2014-04-24 15:16:57 +02:00
Andreas Fischer f9091a8584 Merge pull request #8304 from owncloud/add-xss-tests
Add unit tests for arrays and quotationmark

* owncloud/add-xss-tests:
  Remove uneeded newline
  Fix indentation
  Add unit tests for arrays and "
2014-04-24 15:09:36 +02:00
Andreas Fischer 522d101607 Merge pull request #8335 from owncloud/sharing_set_default_expire_date
[sharing] allow admin to set default expire date

* owncloud/sharing_set_default_expire_date:
  add setting to set default expire date
2014-04-24 14:03:41 +02:00
Bjoern Schiessle 6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Robin Appelman cd0c5990f8 properly quote etags 2014-04-24 11:12:39 +02:00
Robin Appelman 49b44e7e22 Normalize paths when moving properties 2014-04-24 11:12:39 +02:00
Thomas Müller 8127e984bd Merge pull request #8332 from owncloud/l10n-access-untrusted
This adds one more missing untranslated text from lib/share
2014-04-24 10:06:37 +02:00