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
413afab424
Replace console.time/timeEnd
2014-03-17 19:39:19 +01:00
3cd09f2b09
Added PostgreSQL version warning on upgrade
2014-03-17 18:58:00 +01:00
082c4cda50
Increase version to trigger upgrade related to .ocdata
2014-03-17 17:58:19 +01:00
38b1529c2a
More robust way to check if the folder is empty
2014-03-17 17:03:32 +01:00
332c14a878
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-17 16:35:08 +01:00
792d0d3314
Fix smb4php to work with home shares
...
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
2014-03-17 15:03:25 +00: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
239069c838
Use $installedVersion instead of $currentVersion
2014-03-17 13:27:42 +01:00
df7853363a
Merge pull request #7761 from owncloud/improve_documentation
...
clarify the use-case of the encryption app.
2014-03-17 13:23:35 +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
8a24e1eb96
clearify the use-case of this app
2014-03-17 12:29:17 +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
518903c6eb
[tx-robot] updated from transifex
2014-03-17 01:56:06 -04:00
7ffaf0d70a
Merge pull request #7734 from owncloud/icon-class-remove
...
remove unneeded icon class
2014-03-16 10:24:57 +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
bbbbb033f3
in case of phpunit executions calling header() and exit() is too bad
2014-03-14 18:20:33 +01:00
3527adbbe1
OC_Image::_output() - throw exception instead of falling back to png
2014-03-14 18:19:16 +01:00
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
Thomas Müller
Thomas Tanghus
Vincent Petry
Robin Appelman
Robin McCorkell
icewind1991
Lukas Reschke
Frank Karlitschek
Morris Jobke
Georg Ehrke
Jan-Christoph Borchardt
Raghu Nayyar
Björn Schießle