86ab1cf476
typos fixed
...
PHPDoc comments added
2014-04-01 22:17:31 +02:00
5b64a27df9
Undo 3rdparty update.
2014-03-31 21:09:54 +02:00
01141e1520
Type hinting.
2014-03-31 21:07:48 +02:00
b39a74ff6c
Some more colors.
2014-03-31 20:51:30 +02:00
f9853b253c
Deduplicate connection handling code into \OC\DB\ConnectionFactory
2014-03-31 20:09:07 +02:00
a585cec530
Remove unnecessary and incorrect comments.
2014-03-31 19:27:18 +02:00
e67cf99cef
\InvalidArgumentException is in root namespace.
2014-03-31 18:20:24 +02:00
5dbbe6d08b
Doc blocks for properties do not repeat the property name.
2014-03-31 18:20:04 +02:00
b002f11771
Use question color.
2014-03-31 17:06:06 +02:00
e768ead820
Remove whitespace at end of lines.
2014-03-31 17:06:02 +02:00
2d69c4c2d3
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
...
* owncloud/master: (663 commits)
[tx-robot] updated from transifex
[tx-robot] updated from transifex
Sub-dir was prepended twice
Sub-dir was prepended twice
[tx-robot] updated from transifex
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
Emit event after setting a new expiration for a share
adding @method annotation to declare methods which can be called on the wrapped statement object
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
don't write file if opening a stream to encrypt the data fails
Do not retrieve storage stats for trash bin
[tx-robot] updated from transifex
prevent dimmed ocdialog div from scrolling
fix breadcrumbs for IE8
enable SVG->PNG fallback for 'New' menu
enable SVG->PNG fallback for newly uploaded files and folders
specify logo to not repeat when container is bigger
fix SVG replacement for logo so it works in IE8, fix #7866
Fix swift touch operation
[tx-robot] updated from transifex
...
Conflicts:
3rdparty
2014-03-31 15:33:01 +02:00
65e3f63400
Merge pull request #7939 from owncloud/wring_redirect_on_login
...
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-31 10:50:05 +02:00
5b552c84da
[tx-robot] updated from transifex
2014-03-31 01:55:43 -04:00
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
7278f2f567
Sub-dir was prepended twice
2014-03-29 20:40:49 +01:00
3a7829f784
Sub-dir was prepended twice
2014-03-29 20:39:55 +01:00
915fa3da74
[tx-robot] updated from transifex
2014-03-29 01:55:44 -04:00
80c6f883a8
Merge pull request #7845 from duritong/fix_submodule_url
...
use https as submodule url
2014-03-28 21:54:50 +01:00
73c81ae709
Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master
...
adding @method annotation to declare methods which can be called on the ...
2014-03-28 21:20:09 +01:00
c14107550d
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-28 18:05:48 +01:00
0ae9ed4244
Merge pull request #7934 from owncloud/addEventToExpirationDate
...
Emit event after setting a new expiration for a share
2014-03-28 17:35:20 +01:00
841069e8cb
Merge pull request #7770 from jamesryanbell/master
...
SVG support detection
2014-03-28 15:14:12 +01:00
e4069e1553
Emit event after setting a new expiration for a share
...
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
2014-03-28 15:00:13 +01:00
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
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
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
Thomas Müller
Andreas Fischer
Vincent Petry
Thomas Tanghus
Morris Jobke
Morris Jobke
Björn Schießle
Robin McCorkell
Jörn Friedrich Dreyer
Jan-Christoph Borchardt