Commit Graph

6022 Commits

Author SHA1 Message Date
Bjoern Schiessle 16efd81a0e first check if file exists before checking the files size 2013-08-17 11:57:50 +02:00
Morris Jobke 837cefd8a3 Merge pull request #4442 from owncloud/no-smb-client-on-windows-master
no files external for SMB on windows
2013-08-16 02:48:42 -07:00
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt d2767faf61 Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
2013-08-15 15:31:42 -07:00
Thomas Müller bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
Thomas Müller ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Thomas Müller 05549884c6 no files external for SMB on windows 2013-08-15 12:00:02 +02:00
Jenkins for ownCloud 680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Morris Jobke de89c31f5a Merge pull request #4302 from synchrone/master
Fixing owncloud/core#4301
2013-08-14 17:11:30 -07:00
Andreas Fischer 75e9015b54 Merge pull request #4393 from owncloud/fix_4326
provide correct path for require_once

* owncloud/fix_4326:
  use __DIR__ instead of realpath
  provide correct path for require_once
2013-08-14 21:20:53 +02:00
Jörn Friedrich Dreyer 8f3f47e868 Merge pull request #4376 from owncloud/use_plurals
Use plural translations
2013-08-14 10:23:19 -07:00
Thomas Müller b3b2b2d64c Merge pull request #4363 from owncloud/fix-4355
Send mime-type for new files
2013-08-14 09:46:10 -07:00
Bjoern Schiessle 7d0e9cc685 use __DIR__ instead of realpath 2013-08-14 17:15:01 +02:00
kondou 4002491947 Reword a phrase 2013-08-14 06:29:19 +02:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Bjoern Schiessle eb0fdc8380 provide correct path for require_once 2013-08-12 17:38:57 +02:00
Jenkins for ownCloud 5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
kondou 9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Andreas Fischer beb27168de Use multiple lines for the JSON data array. 2013-08-08 22:14:21 +02:00
Andreas Fischer 0ab8850478 Adjust JSON code to stable5. 2013-08-08 22:14:21 +02:00
Andreas Fischer 1ed049a682 Do not repeat JSON success code. 2013-08-08 22:14:21 +02:00
Andreas Fischer 0718c92dc8 Do not repeat definition of $target. 2013-08-08 22:13:53 +02:00
Jan-Christoph Borchardt 8652137ad6 Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
2013-08-08 07:31:01 -07:00
Jörn Friedrich Dreyer ff67f115d4 fix #2711 using a custom event, also use css selectors over filterAttr 2013-08-08 13:50:04 +02:00
Björn Schießle c2f40d2495 Merge pull request #4243 from owncloud/no_empty_versions
don't create empty versions
2013-08-08 03:57:43 -07:00
Thomas Müller f7915d745a Merge pull request #4340 from owncloud/true-false-as-filename
Allow true and false as filenames.
2013-08-08 00:03:50 -07:00
Bjoern Schiessle b39d2d1938 more error messages which might be useful for the user to debug his server config 2013-08-08 08:39:11 +02:00
Bjoern Schiessle 7ce03ba37c improved error message to refect openSSL PHP extension and stock openSSL configuration issues 2013-08-08 08:39:01 +02:00
Bjoern Schiessle 7aeb0068be also write error message to the log 2013-08-08 08:38:52 +02:00
Bjoern Schiessle cfbdad9cdb catch broken server config and disable encryption app. 2013-08-08 08:38:37 +02:00
Andreas Fischer 67df0a60fb Check expected type after JSON decode instead of checking what is not expected.
This will also allow "true" and "false" as filenames instead of only "null".
2013-08-07 17:01:14 +02:00
Jenkins for ownCloud 0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Jenkins for ownCloud 0fce89308e [tx-robot] updated from transifex 2013-08-05 07:54:38 -04:00
Thomas Müller bf1a9dfae3 Merge pull request #4285 from owncloud/scan-files-script-master
adding new cli script to rescan files
2013-08-05 01:09:15 -07:00
Jenkins for ownCloud 9923fe655b [tx-robot] updated from transifex 2013-08-04 02:01:28 -04:00
Jenkins for ownCloud 17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Thomas Müller 010c4e0b83 remove cli check 2013-08-02 21:28:04 +02:00
Thomas Müller 5e1a775016 adjust usage text 2013-08-02 21:23:26 +02:00
Alexander Bogdanov 72ad843203 Fixing owncloud/core#4301
Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
2013-08-02 23:18:29 +04:00
Bart Visscher a7a05b321a Use console.php entry point for file scanning from console 2013-08-02 15:36:54 +02:00
Jörn Friedrich Dreyer 895d9ba1b9 Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
Use !== and === in files_trashbin app
2013-08-02 03:14:24 -07:00
Jenkins for ownCloud 16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
Björn Schießle 930f0e4c18 Merge pull request #4270 from owncloud/fix_4253
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 07:43:50 -07:00
Jörn Friedrich Dreyer 77dad7070d Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
added @var tags
2013-08-01 07:40:01 -07:00
Jörn Friedrich Dreyer 43c6d82825 Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging
write all catched exception messages to the log
2013-08-01 07:38:45 -07:00
Bjoern Schiessle 69173c2a6b fix test and make warning translatable 2013-08-01 14:19:33 +02:00
Bjoern Schiessle 9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Christian Berendt 5a4c39207e write all catched exception messages to the log 2013-08-01 10:08:41 +02:00
Christian Berendt 3e53e25cd1 added @var tags 2013-08-01 10:05:01 +02:00