5c98e0c7c7
Merge pull request #7328 from owncloud/McNetic-zipstreamer
...
McNetic zipstreamer
2014-02-26 10:19:12 +01:00
2b423e5a44
coding style fixes, cut long lines, comments not on same lines, curly braces
2014-02-26 10:16:54 +01:00
1a561fced0
fix for coding style
2014-02-26 09:32:20 +01:00
e32acf933d
Highlight the selected app in app-settings
2014-02-26 04:03:41 +01:00
574883c47a
introduce new theme function to allow full creation of documentation links: buildDocLinkToKey()
2014-02-25 23:06:23 +01:00
e3f676e009
fix path in sharing results if it is a file in the Shared folder
2014-02-25 17:27:23 +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
9b4af31bac
Merge pull request #7371 from owncloud/core-storagemovedeleteall
...
Replace deleteAll call with unlink call on rename
2014-02-25 14:52:21 +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
432a42d846
Fix case where port is missing
...
Forward port of 6d3b5b24fd
2014-02-25 11:40:05 +01:00
d28fd8f64d
Remove necessity of icon class
...
Only the icon specific class is needed
2014-02-24 22:37:19 +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
ddb8cf32e9
Merge pull request #7344 from owncloud/add-js-config-vars
...
Allow apps to add/modify config js output via hook.
2014-02-24 13:29:54 +01:00
7c4f81bd78
rename url parameter
2014-02-24 13:24:10 +01:00
0d78d9c180
Merge branch 'master' into McNetic-zipstreamer
...
Conflicts:
3rdparty
2014-02-24 12:53:55 +01:00
a23ef25010
Removed unused deleteAll method on Common storage class
...
The "deleteAll" method on the Common storage class isn't used anywhere.
Also, it isn't defined on the Storage interface so this fix removes it
completely.
2014-02-24 12:21:48 +01:00
c465835e85
Replace deleteAll call with unlink call
...
The method deleteAll() doesn't officially exist on the Storage class as
it's not defined on the interface, which means it fails on the Quota
storage wrapper and might fail on some external storage classes.
Also, this here is the only use case for that one method.
2014-02-24 12:20:11 +01:00
539ea0882b
Fixed mount config path
2014-02-24 10:35:24 +01:00
80c61d480c
Added oc_defaults stub in specHelper.js
...
This is needed for JS Unit tests to run properly as they are expecting
the new "oc_default" map to exist.
2014-02-24 09:45:02 +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
c9ab11a9bd
Merge pull request #7259 from owncloud/overwritehost-always
...
Add overwritehost config on setup and upgrade
2014-02-22 07:35:56 +01:00
079d64ce75
Merge pull request #7310 from owncloud/no-css-js-delivery-via-php
...
No css js delivery via php
2014-02-21 20:37:10 +01:00
e549977d0e
update 3rdparty submodule to current master
2014-02-21 17:31:24 +01:00
300b1131b4
replace spaces with tabs
...
use true instead of 1
2014-02-21 17:09:36 +01:00
a2000a15f8
Merge pull request #7358 from owncloud/xmlfix-3rdparty
...
Updated submodule to include XML processing fixes
2014-02-21 17:01:00 +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
df35929ed2
Merge branch 'master' into add-js-config-vars
2014-02-21 16:07:21 +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
fa7fa4a6d3
Merge pull request #7088 from owncloud/sharing-userspathbug
...
Fix usersPath bug
2014-02-21 15:39:09 +01:00
3487a95eab
Remove fileid parameter for getFolderContent
2014-02-21 15:36:24 +01:00
dd98e6333f
Split getFolderContentById
2014-02-21 15:35:12 +01:00
a5c70f16d2
Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs
...
fix thumbnail generation for subdirectories in the conflicts dialog
2014-02-21 15:33:13 +01:00
3980a7d9c6
Merge branch 'master' into folderid-reuse
2014-02-21 15:33:12 +01:00
fe44ac264b
Add overwritehost config on setup and upgrade
2014-02-21 15:19:01 +01:00
aa0bcf7ba4
Merge pull request #7336 from owncloud/IE-wipho-viewport
...
fix viewport size on windows phone
2014-02-21 15:13:20 +01:00
c0a6af8219
Updated submodule to include XML processing fixes
2014-02-21 15:12:15 +01:00
6bde602c09
Merge pull request #7292 from owncloud/sharing_tests
...
fix sharing unit tests
2014-02-21 14:24:51 +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
d9e333c0da
use directory from original instead of current dir
2014-02-21 14:01:38 +01:00
27ad69eea5
Merge branch 'master' into no-css-js-delivery-via-php
2014-02-21 14:01:24 +01:00
3f52eb073d
Merge branch 'master' into mimeicons-svg
2014-02-21 14:00:17 +01:00
29c43ddb91
Merge pull request #7350 from owncloud/config-gitignore
...
ignore optional additional config files
2014-02-21 13:58:23 +01:00
a40cedf507
Merge branch 'master' into McNetic-zipstreamer
2014-02-21 13:57:18 +01:00
Vincent Petry
Jan-Christoph Borchardt
kondou
Thomas Müller
Bjoern Schiessle
VicDeo
Vincent Petry
jbtbnl
Morris Jobke
icewind1991
Robin Appelman
Lukas Reschke
root
Jörn Friedrich Dreyer