Arthur Schiwon
057c2638e4
LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530
2014-03-20 13:58:08 +01:00
Morris Jobke
5747e0e3f9
remove executable flag for file-upload.js
2014-03-20 13:26:21 +01:00
Morris Jobke
95a13e2690
Merge pull request #7814 from oskholl/master
...
Fix: 'Upload button tooltip doesn't disappear'
2014-03-20 13:25:21 +01:00
Vincent Petry
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
Morris Jobke
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
Thomas Müller
8a81df0f2c
Merge pull request #7651 from owncloud/close-session-faster-master
...
Close session faster
2014-03-20 11:07:21 +01:00
Thomas Tanghus
51fe3b8ccd
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 10:23:40 +01:00
Jenkins for ownCloud
3aa8647634
[tx-robot] updated from transifex
2014-03-20 01:56:42 -04:00
Morris Jobke
d76fd16abc
Merge pull request #7804 from jbtbnl/master
...
Remove cursor:pointer CSS from li element
2014-03-19 23:56:58 +01:00
Oskar Hollmann
90839b784f
Comment moved to prevent 'Line is too long' warning.
2014-03-19 23:05:03 +01:00
Oskar Hollmann
fa28c089fa
Fix: 'Upload button tooltip doesn't disappear'
...
Fixes issue #7461 . Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
2014-03-19 22:09:09 +01:00
Lukas Reschke
01e9e40d83
Merge pull request #7806 from owncloud/add-matroska-video
...
Add mimetype for MKV videos
2014-03-19 18:32:53 +01:00
Lukas Reschke
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
jbtbnl
57cfff7d51
Fix #7758
2014-03-19 16:45:10 +01:00
Vincent Petry
6252c248c2
Merge pull request #7557 from owncloud/issue/7297
...
Do not allow setting an expiration date in the past
2014-03-19 15:53:08 +01:00
icewind1991
4f95adfb76
Merge pull request #7800 from owncloud/filesort-performance
...
Improve sorting performance of large lists of files
2014-03-19 15:38:15 +01:00
Robin Appelman
214357ca68
Improve sorting performance of large lists of files
2014-03-19 13:53:59 +01:00
Joas Schilling
7ab2632085
Use tipsy to display error when selecting a date in the past
2014-03-19 12:11:14 +01:00
Thomas Müller
c216c4777b
Merge branch 'master' into close-session-faster-master
...
Conflicts:
apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
Thomas Müller
b9fc240b83
Merge pull request #7777 from owncloud/fix/7776
...
updating 3rdparty submodule
2014-03-19 11:36:00 +01:00
Thomas Müller
33e96597d1
Merge pull request #7790 from owncloud/fix/7788
...
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
Vincent Petry
ff5b79edeb
Merge pull request #7792 from owncloud/extstorage-fixpersonalstorage
...
Fix validation of allowed personal backend
2014-03-19 10:00:12 +01:00
Jenkins for ownCloud
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
Morris Jobke
2aa563b89c
Merge pull request #7791 from owncloud/app-setting-auto-scroll
...
Set overflow-y to auto
2014-03-19 01:07:26 +01:00
Robin McCorkell
340cd2734b
Merge pull request #7766 from Xenopathic/master
...
Fix smb4php to work with home shares
2014-03-18 19:42:04 +00:00
Vincent Petry
1f79f368ef
Added unit tests for when adding ext storage mount points
...
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
doing an actual check/connection (note: this is necessary because the
static class OC_Mount_Config cannot be mocked)
2014-03-18 18:29:08 +01:00
Thomas Tanghus
13f1f105c8
Set overflow-y to auto
2014-03-18 18:25:30 +01:00
Vincent Petry
8ababef4cd
Fix validation of allowed personal backend
2014-03-18 17:54:14 +01:00
Thomas Müller
6b9ae27b90
drop file cache migration OC5 -> OC6
2014-03-18 17:14:38 +01:00
Morris Jobke
f6c3667efa
Merge pull request #7784 from owncloud/enc-adminpageallowupload
...
Display admin option for public upload with encryption enabled
2014-03-18 12:49:38 +01:00
Thomas Müller
effea790c7
redefine reopen() in class \OC\Session\Internal to avoid accidental calls in productive code
2014-03-18 11:44:22 +01:00
Vincent Petry
b75ca9fb50
Display admin option for public upload with encryption enabled
...
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
2014-03-18 11:28:56 +01:00
Jenkins for ownCloud
d744e2c176
[tx-robot] updated from transifex
2014-03-18 01:55:31 -04:00
Thomas Müller
a4a185cc71
updating 3rdparty submodule
2014-03-17 22:22:16 +01:00
Thomas Müller
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
Thomas Müller
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
Thomas Müller
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
Vincent Petry
082c4cda50
Increase version to trigger upgrade related to .ocdata
2014-03-17 17:58:19 +01:00
Robin McCorkell
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
icewind1991
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
icewind1991
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
Vincent Petry
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
icewind1991
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
Vincent Petry
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
Vincent Petry
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
Robin Appelman
166dfbf58b
use a non-recursive chmod on the datadir
2014-03-17 12:53:55 +01:00
Frank Karlitschek
8a24e1eb96
clearify the use-case of this app
2014-03-17 12:29:17 +01:00
Vincent Petry
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
Thomas Müller
cd038604d3
unit tests for specific image type output added
2014-03-17 08:40:59 +01:00
Thomas Müller
79ba930ef9
fixing PHPDoc
2014-03-17 08:17:56 +01:00