2b423e5a44
coding style fixes, cut long lines, comments not on same lines, curly braces
2014-02-26 10:16:54 +01:00
7f7d674c2a
Merge pull request #7335 from owncloud/fix-7333
...
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
ec9fe3f57f
Merge pull request #6299 from leo-b/ldap_nested_groups
...
Add LDAP nested groups
2014-02-25 15:41:10 +02:00
e10ca7c2e9
Merge pull request #7374 from owncloud/enc_dont_overwrite_keys
...
[encryption] don't overwrite keys if rename was done by a stream copy
2014-02-25 12:34:49 +01:00
d3a24e945b
add test case if a file gets moved out from the shared folder
2014-02-24 17:56:00 +01:00
ebd73aee8f
don't overwrite keys if rename was done by a stream copy
2014-02-24 17:24:43 +01:00
5fb1374b0f
Merge pull request #7285 from owncloud/mimeicons-svg
...
Show svg mime icons when no preview is available
2014-02-24 14:12:10 +01:00
8d17f6d675
Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1
...
Update page title when navigating through directories (local)
2014-02-24 13:34:07 +01:00
7c4f81bd78
rename url parameter
2014-02-24 13:24:10 +01:00
539ea0882b
Fixed mount config path
2014-02-24 10:35:24 +01:00
11ca014034
Merge pull request #7305 from owncloud/extstorage-configclass
...
Added extra checks for ext storage class
2014-02-22 08:10:31 +01:00
300b1131b4
replace spaces with tabs
...
use true instead of 1
2014-02-21 17:09:36 +01:00
9b9b2255b6
Merge pull request #7355 from owncloud/new-menu-svg
...
Use SVG icons in New file menu
2014-02-21 16:18:43 +01:00
59ec61dc03
Merge branch 'master' into GuillaumeAmat-patch-1
2014-02-21 16:04:31 +01:00
f1475671ab
Merge branch 'master' into extstorage-configclass
2014-02-21 15:51:41 +01:00
6f56fd99a6
fix too much distance between text and icon
2014-02-21 14:10:13 +01:00
877cfb963a
use SVG icons from icons.css for New file menu
2014-02-21 14:07:25 +01:00
4715fb12c8
Add url parameter to control whether previews should return 404 when the mimetype is unsupported
2014-02-21 14:06:15 +01:00
3f52eb073d
Merge branch 'master' into mimeicons-svg
2014-02-21 14:00:17 +01:00
0c0e4fced5
fix test so that it doesn't depend on the array order
2014-02-21 13:37:47 +01:00
6ca4d3bfde
fix usersPath and add unit tests
2014-02-21 13:37:46 +01:00
b22d82f941
code style: else on same line
2014-02-21 09:42:19 +01:00
fe24aafe7d
Merge pull request #7312 from owncloud/ldap_fix_add_test
...
LDAP: fix and extend tests
2014-02-21 00:42:43 +01:00
6cb64a4fce
Fix code to search for mount.json in custom data folders
2014-02-20 18:34:27 +01:00
f710205ee7
Make unit tests expect the svg icons
2014-02-20 16:56:09 +01:00
0624476aa1
Merge branch 'master' into mimeicons-svg
2014-02-20 16:55:18 +01:00
d1b1ad0813
Merge pull request #7290 from owncloud/issue/5463
...
Correctly redirect to settings page when not selecting cert file for upload
2014-02-20 16:24:31 +01:00
984ea7b3ff
Merge pull request #7205 from owncloud/fix_7153
...
LDAP: prevent other configuration from being deleted when deleting the f...
2014-02-20 16:22:43 +01:00
658758c3f7
fix intendation
2014-02-20 15:36:52 +01:00
44441b56d6
Fixed trashbin title
2014-02-20 15:16:45 +01:00
c869e0116b
Merge pull request #6999 from kofemann/mount-config
...
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
476444ab1a
Fixed title format
2014-02-20 14:56:28 +01:00
6cf83de60e
Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1
2014-02-20 14:49:54 +01:00
d5690a174e
LDAP: fix and extend tests
2014-02-20 14:05:45 +01:00
719f1111b6
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
...
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
b060a17b59
Added extra checks for ext storage class
2014-02-20 10:40:10 +01:00
49f2014e0c
Revert "Added extra checks for ext storage class"
...
This reverts commit 9e9a5b9ea1
2014-02-20 10:01:49 +01:00
8f22535e75
Merge pull request #7284 from owncloud/ldap_filter_compilation
...
LDAP: improve compilation of filters
2014-02-20 09:55:02 +01:00
38d6c56249
Merge pull request #7294 from owncloud/extstorage-configclass
...
Added extra checks for ext storage class
2014-02-20 09:53:52 +01:00
577559458d
Uses OC.basename instead of custom code
2014-02-19 22:50:49 +01:00
9e9a5b9ea1
Added extra checks for ext storage class
2014-02-19 19:08:28 +01:00
b2b35cd335
Fixed ext storage webdav path encoding
...
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
support/return it
- Fixed touch() to return false if the server doesn't implement
PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
lighttpd's WebDAV
2014-02-19 18:34:08 +01:00
513940f4a4
Correctly redirect to settings page when not selecting cert file for upload
...
Fix #5463
2014-02-19 17:07:29 +01:00
f33d35cd07
Fix svg icons for public shares and external/shared files
2014-02-19 15:08:05 +01:00
609a91a9b1
Show svg mime icons when no preview is available
2014-02-19 14:47:29 +01:00
952584e9c7
Merge pull request #7195 from owncloud/files-selectall
...
Do not send file list for select all on Download/delete
2014-02-19 14:33:24 +01:00
c0328b4f0f
LDAP: improve compilation of filters
2014-02-19 13:13:01 +01:00
7330f61a94
Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master
...
Concatenate string in SQL instead of PHP
2014-02-19 11:58:48 +01:00
bcad6e641a
Merge pull request #7274 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
e517e642be
Merge pull request #7257 from owncloud/filelist-fileinfo
...
use a FileInfo object of the directory when generting the filelist
2014-02-19 09:40:11 +01:00
Jan-Christoph Borchardt
Vincent Petry
VicDeo
Björn Schießle
Morris Jobke
Robin Appelman
Lukas Reschke
root
icewind1991
Thomas Müller
blizzz
Guillaume AMAT
Joas Schilling