fe05c0c81b
move session reset to endTest() - necessary because we need a valid session in the next unit tests setUp() call
2014-03-14 18:16:20 +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
55c630ea7d
remove unneeded icon class
2014-03-14 14:47:40 +01:00
0f0baa5303
Merge pull request #7725 from owncloud/body-public
...
add 'body-public' ID to body in base layout so it can be identified via CSS
2014-03-14 16:27:43 +05:30
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
74eb9bea22
add 'body-public' ID to body in base layout so it can be identified via CSS
2014-03-14 11:08:16 +01:00
53f5747ac1
[tx-robot] updated from transifex
2014-03-14 01:55:34 -04:00
49deb752cf
[tx-robot] updated from transifex
2014-03-13 17:20:51 -04:00
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
b2757e621c
Merge pull request #7686 from owncloud/ocs_fix_paths
...
finally fix the paths for the OCS Share API
2014-03-13 20:27:07 +01:00
a7695b8dd0
Merge pull request #7718 from owncloud/fixing-7345-master
...
map transifex language ja_JP to ja
2014-03-13 18:02:53 +01:00
7bd2a51be5
map transifex language ja_JP to ja
2014-03-13 17:57:14 +01:00
fc697c7298
adding StartSessionListener which initializes the session before each test case execution
2014-03-13 16:19:17 +01:00
eabeedb306
Merge branch 'master' into cachehooks-first
2014-03-13 15:22:00 +01:00
9d32475260
finally fix the paths for the OCS Share API
2014-03-13 15:16:59 +01:00
a8eb7a5092
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-13 13:33:09 +01:00
3c03ff5bb5
Merge pull request #7340 from owncloud/hide_remove_image_avatar
...
Hide remove image, if there's no custom avatar
2014-03-13 13:20:00 +01:00
9fa9c791eb
Merge pull request #7671 from fpiraneo/patch-1
...
Update index.php
2014-03-13 13:04:30 +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
b506de6f08
Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master
...
remove Sabre_DAV_Browser_Plugin
2014-03-12 22:28:01 +01:00
b2ac8755ce
Merge pull request #6632 from eduardosan/master
...
Fix PostgreSQL port configuration on install
2014-03-12 18:52:47 +01:00
5fcfb2ef84
Merge pull request #7564 from owncloud/issue/7559
...
Hide QMail when not selected and hide SendMail when not available on the server
2014-03-12 18:32:38 +01:00
556c6eca23
Use OC_Util::formatDate()
2014-03-12 17:53:39 +01:00
c5440fa133
Move cron status to the right of the heading
2014-03-12 17:29:26 +01:00
b92be2ef1c
Merge pull request #7669 from owncloud/versions_predelete
...
add preDelete hook for files_versions app
2014-03-12 17:23:54 +01:00
881739cbac
Merge pull request #7668 from owncloud/trashbin_predelete
...
add preDelete hook for files_trashbin app
2014-03-12 17:23:38 +01:00
612b52abc5
Merge pull request #7695 from owncloud/fix-3rdparty-master
...
Re-add submodule 3rdparty
2014-03-12 17:12:18 +01:00
8ba278bf6a
Re-add submodule 3rdparty
2014-03-12 17:10:57 +01:00
8fafee31ef
Use $.hide() instead of .hidden for now
...
.inlineblock ranks higher than .hidden
2014-03-12 15:42:29 +01:00
dd97d532be
Remove OC.Router usage
2014-03-12 15:31:48 +01:00
1c82b4751e
Merge branch 'master' into hide_remove_image_avatar
2014-03-12 15:29:26 +01:00
547b563464
Log last cron execution
...
Fixes #2012
2014-03-12 15:20:51 +01:00
efbca04ab4
Use command -v to check for sendmail
...
Fix #7559
2014-03-12 11:47:21 +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
ae13ff112f
remove Sabre_DAV_Browser_Plugin
2014-03-12 00:10:16 +01:00
364e1f852f
Merge pull request #7674 from owncloud/fix-spelling-master
...
Authentification -> Authentication
2014-03-11 17:14:10 +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
5713b0dedb
Authentification -> Authentication
2014-03-11 16:24:50 +01:00
c0b567dbec
Fix 3rdparty submodule after transifex sync broke it
2014-03-11 15:40:14 +01:00
Thomas Müller
Georg Ehrke
Vincent Petry
Jan-Christoph Borchardt
Raghu Nayyar
Björn Schießle
Robin Appelman
Morris Jobke
Lukas Reschke
kondou
Joas Schilling