36c0f08ec0
Merge pull request #7732 from owncloud/datafolderexistence
...
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
970878b581
Merge pull request #7818 from owncloud/logException_undefined_variable
...
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 11:14:30 +01:00
8a81df0f2c
Merge pull request #7651 from owncloud/close-session-faster-master
...
Close session faster
2014-03-20 11:07:21 +01:00
51fe3b8ccd
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 10:23:40 +01:00
9abe6b7f87
Add mimetype for MKV videos
...
This will make oC create previews for MKVs.
Test file: http://www.auby.no/files/video_tests/h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv
To test this just apply this change and upload the test file, if an preview is generated this change is most likely working as expecting.
2014-03-19 17:45:20 +01:00
c216c4777b
Merge branch 'master' into close-session-faster-master
...
Conflicts:
apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
33e96597d1
Merge pull request #7790 from owncloud/fix/7788
...
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
6b9ae27b90
drop file cache migration OC5 -> OC6
2014-03-18 17:14:38 +01:00
effea790c7
redefine reopen() in class \OC\Session\Internal to avoid accidental calls in productive code
2014-03-18 11:44:22 +01:00
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
6bbbf8536f
introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened
2014-03-17 21:57:10 +01:00
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
6fbf3dd7c4
Merge pull request #7764 from owncloud/datadir-chmod
...
use a non-recursive chmod on the datadir
2014-03-17 15:52:44 +01:00
5c72b526a3
Merge pull request #7760 from owncloud/core-roundbytes
...
Correctly round bytes when converted from human readable format
2014-03-17 15:21:57 +01:00
4112d63a40
Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning
...
Added warning for trusted_domains after CLI upgrade
2014-03-17 13:21:54 +01:00
bd98538a36
Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete_hook_2
...
use preDelete instead of postDelete hook
2014-03-17 12:59:35 +01:00
43ebd8cb64
Merge pull request #7728 from owncloud/oc_image_show_save_custom_mime
...
make it possible to influence output type of \OC_Image
2014-03-17 12:58:40 +01:00
166dfbf58b
use a non-recursive chmod on the datadir
2014-03-17 12:53:55 +01:00
145db370d1
Correctly round bytes when converted from human readable format
...
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
2014-03-17 12:15:12 +01:00
cd038604d3
unit tests for specific image type output added
2014-03-17 08:40:59 +01:00
79ba930ef9
fixing PHPDoc
2014-03-17 08:17:56 +01:00
c89aa6d5fe
[tx-robot] updated from transifex
2014-03-16 03:13:21 -04:00
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
b619ff6076
Return 503 when a config/data dir error exists
2014-03-14 21:05:15 +01:00
3527adbbe1
OC_Image::_output() - throw exception instead of falling back to png
2014-03-14 18:19:16 +01:00
9dee3772eb
remove image/pjpeg from OC_Image::_output
2014-03-14 18:12:33 +01:00
3c46dcd7dd
Added .ocdata file to check for data folder validity
...
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
2014-03-14 15:36:35 +01:00
c140010e81
don't change mimetype of whole image object
2014-03-14 11:17:20 +01:00
1a116828cf
Added warning for trusted_domains after CLI upgrade
...
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
2014-03-14 11:16:45 +01:00
0c3c75efd5
always output a png
2014-03-14 11:14:09 +01:00
6f96ab3e90
make it possible to influence output type of \OC_Image
2014-03-14 11:13:45 +01:00
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
9d32475260
finally fix the paths for the OCS Share API
2014-03-13 15:16:59 +01:00
f438337493
improve validation of getFileInfo in \OC\Preview
2014-03-13 12:32:13 +01:00
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
8048868bd7
use preDelete instead of postDelete hook
2014-03-13 03:14:42 +01:00
b2ac8755ce
Merge pull request #6632 from eduardosan/master
...
Fix PostgreSQL port configuration on install
2014-03-12 18:52:47 +01:00
ce790119ae
Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions
...
set content-type on ocs exceptions
2014-03-12 10:19:40 +01:00
88f6dd7db1
fixing method names
2014-03-12 10:00:22 +01:00
942d5fcff3
Merge pull request #7682 from owncloud/sanitize-fallbackid-master
...
sanitize fallbackId
2014-03-12 09:22:46 +01:00
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
743addd1e3
set content-type on ocs exceptions
2014-03-12 00:35:19 +01:00
7c78368e8b
sanitize fallbackId
2014-03-12 00:18:51 +01:00
03f40116e1
Merge pull request #7665 from owncloud/fix_ocs_share_api_paths
...
Fix ocs share api paths
2014-03-11 16:55:52 +01:00
36885dc64c
fix path creation for re-shares, issue #7662
2014-03-11 12:58:46 +01:00
c1cb9ee9b0
Merge pull request #7650 from owncloud/quota-totalspace
...
Fixed total space display when data size exceeds quota
2014-03-11 12:40:59 +01:00
0e4d522dd9
Merge pull request #7659 from owncloud/fix-7596
...
Fix 7596
2014-03-11 11:36:22 +01:00
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
0de43f1fbe
remove magic handling of recipient lists by exploding the string - this functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname
2014-03-10 21:56:37 +01:00
Vincent Petry
Morris Jobke
Thomas Müller
Thomas Tanghus
Lukas Reschke
icewind1991
Robin Appelman
Georg Ehrke
Bjoern Schiessle