7adb5ae2c5
Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
...
don't write file if opening a stream to encrypt the data fails
2014-03-28 14:59:05 +01:00
b158939283
adapt description of paging size configuration
2014-03-28 14:20:01 +01:00
0d9d70b51c
change default ldap paging size to 500
2014-03-28 14:02:19 +01:00
70db348475
Merge pull request #7824 from owncloud/hash-parameter-order
...
Fix parameter order for Storage\Local::hash
2014-03-28 13:06:07 +01:00
f1b085df01
adding @method annotation to declare methods which can be called on the wrapped statement object
2014-03-28 12:57:27 +01:00
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
5068c57845
Merge pull request #7613 from owncloud/fix_urlGenerator2
...
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
2014-03-28 12:12:49 +01:00
2d592ddc8f
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
...
Squashed commit of the following:
commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943
Merge: 1e9c5behttps://github.com/kev300/core into kev300-master
commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:11:42 2013 +0100
Update util.php
commit 3f0723f054a27a506be7f26932ccb54fff6f2be9
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:09:15 2013 +0100
Update util.php
commit 512176abdcfbe5b2b060b91033abc9608912d1f8
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:02:04 2013 +0100
Update util.php
commit 6cbefd080188d287024e0b047b88dd4525d6c2c1
Author: kev300 <admin@gadeco.de>
Date: Mon Dec 16 16:44:46 2013 +0100
Update util.php
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
2014-03-28 12:09:29 +01:00
040f430f0c
Merge pull request #7829 from owncloud/cachefolderlocation
...
Cache folder is now configurable
2014-03-28 12:08:38 +01:00
b9100bc2de
don't write file if opening a stream to encrypt the data fails
2014-03-28 12:02:49 +01:00
1e9c5be33d
Merge pull request #7703 from rnveach/jstest
...
Fixing issues found with running 'autotest-js' locally
2014-03-28 11:41:21 +01:00
ef2c176eef
Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanup
...
Cleanup the fileproxy proxies on test bootstrap
2014-03-28 11:33:57 +01:00
0757f87dba
Merge pull request #7872 from owncloud/trash-disablestoragestats
...
Do not retrieve storage stats for trash bin
2014-03-28 11:22:19 +01:00
f3d6b2f3e9
Do not retrieve storage stats for trash bin
2014-03-28 11:21:33 +01:00
e806b6d9a0
Merge pull request #7842 from Xenopathic/files_external_config_optional
...
Enable the use of 'optional' on password fields for mount configuration
2014-03-28 10:02:28 +00:00
0436453353
Merge pull request #7720 from ideaship/autoconfig_fix
...
fix autoconfig
2014-03-28 10:41:46 +01:00
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
e3b951f412
Merge pull request #7724 from owncloud/mobile
...
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
2561107b4e
prevent dimmed ocdialog div from scrolling
2014-03-28 02:43:33 +01:00
d2e5dd2a15
Merge pull request #7913 from owncloud/fix-logo
...
fix SVG replacement for logo so it works in IE8, fix #7866
2014-03-28 02:29:35 +01:00
6a8e93ffa6
fix breadcrumbs for IE8
2014-03-27 23:53:19 +01:00
531f3cf1a8
Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
...
Fix swift touch operation
2014-03-27 18:10:45 +01:00
ec46a07195
convert input metrics to px
2014-03-27 17:13:36 +01:00
53b1e4a00b
remove additional radio button width declaration
2014-03-27 17:13:12 +01:00
5b2abb32a6
remove CSS rules for personalblock, remove it from core
2014-03-27 17:00:47 +01:00
25326b89da
replace personalblock fieldset with section class in core user_ apps
2014-03-27 17:00:47 +01:00
6de572c6e6
replace personalblock fieldset with section class in files apps
2014-03-27 17:00:47 +01:00
69be5bdbd8
replace personalblock fieldset with section div in admin and personal settings
2014-03-27 17:00:47 +01:00
bf77c580c1
general styles for the content area
2014-03-27 17:00:47 +01:00
832d3c954e
enable SVG->PNG fallback for 'New' menu
2014-03-27 14:48:54 +01:00
f88b24d532
enable SVG->PNG fallback for newly uploaded files and folders
2014-03-27 14:48:35 +01:00
ba82175e11
specify logo to not repeat when container is bigger
2014-03-27 14:37:41 +01:00
d2de6e7a66
fix SVG replacement for logo so it works in IE8, fix #7866
2014-03-27 14:31:24 +01:00
2a08e35d72
Fix swift touch operation
...
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.
This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
2014-03-27 12:34:30 +01:00
1f6259d9c2
Merge pull request #7875 from Xenopathic/files_external_smb_auto
...
SMB/CIFS mounts using ownCloud login, fixes #7843
2014-03-27 12:18:51 +01:00
1469ce7b38
Merge pull request #7898 from owncloud/ext-swiftmtime
...
Fixed mtime reading from OpenStack API
2014-03-27 09:31:37 +01:00
c9ccacb9ea
Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix
...
Use the correct resolve method to resolve file storage (x-sendfile)
2014-03-27 09:31:17 +01:00
ed0cba0ff4
[tx-robot] updated from transifex
2014-03-27 01:56:30 -04:00
b48510c978
Use the correct resolve method to resolve file storage
...
When detecting whether the file to be downloaded is on external storage,
the correct path needs to be used.
It turns out that \OC\Files\View is needed to resolve the path correctly
relative to the user's home.
2014-03-26 18:14:35 +01:00
fa00a18677
Fixed mtime reading from OpenStack API
...
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
2014-03-26 17:20:40 +01:00
10e62bfd68
Merge pull request #7893 from owncloud/no-routed-link-for-css-files
...
css files are not to be routed through index.php anymore
2014-03-26 16:48:54 +01:00
be78cd53f9
Merge pull request #7896 from Xenopathic/misc_text_fixes
...
Miscellaneous text fixes for core apps
2014-03-26 16:47:24 +01:00
50dba97bde
Miscellaneous text fixes for core apps
2014-03-26 15:43:03 +00:00
eeaefd84c3
change mobile breakpoint for shared view to 768px as well
2014-03-26 16:32:09 +01:00
a1dca821f9
Use braces on single line if statements
2014-03-26 15:11:09 +00:00
d57bb70b03
Merge pull request #7889 from owncloud/routing-warning
...
Fix undefined index warning in router
2014-03-26 15:52:31 +01:00
cd5ebac7c4
Fix error in $isPersonal setting
2014-03-26 14:37:29 +00:00
93b984ecf8
css files are not to be routed through index.php anymore
2014-03-26 15:36:55 +01:00
b077528087
Perform proper checking for share availability
...
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.
The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
2014-03-26 14:36:45 +00:00
Björn Schießle
Alexander Bergolth
Thomas Müller
Vincent Petry
Robin McCorkell
Jörn Friedrich Dreyer
Morris Jobke
Morris Jobke
Jan-Christoph Borchardt