9a2ca0ae64
Check resharing setting
2013-02-26 13:31:15 -05:00
ea841e5e15
Catch exceptions on malformed categories.
2013-02-26 15:01:42 +01:00
b987c76d16
Merge pull request #1906 from owncloud/storage-stat-fail
...
Common storage: don't throw warning when a stat fails
2013-02-26 00:44:42 -08:00
5b250afafc
Merge pull request #1903 from owncloud/fix_version_check
...
return true once one owncloud version number is bigger at any position
2013-02-26 00:37:11 -08:00
52dccd4aa1
Storage: don't throw warnings when a stat fails
2013-02-26 02:53:02 +01:00
6b33a23a51
Code style
2013-02-26 02:51:57 +01:00
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
2013-02-25 17:56:40 -05:00
f415f3e03e
return true once one owncloud version number is bigger at any position
2013-02-25 23:06:26 +01:00
d713948d3f
Merge pull request #1898 from owncloud/session_start_fix
...
set http 500 when session could not be started to prevent serving of emp...
2013-02-25 14:00:12 -08:00
6735701c1e
Merge pull request #1837 from owncloud/fix-user-template
...
Remove unneeded code for user layout template
2013-02-25 13:41:32 -08:00
a2a1e8c2cb
Merge pull request #1839 from owncloud/no_recursive_object_walking
...
Don't walk objects with array_walk_recursive()
2013-02-25 12:53:23 -08:00
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
a533bb6dcd
5 beta 2
2013-02-25 20:00:40 +01:00
7f7b8bc07a
use error template
2013-02-25 19:17:29 +01:00
aba60dba28
added simple error message for the browser
2013-02-25 18:47:34 +01:00
bc2fefed59
write an error log when session could not be initialized
2013-02-25 18:42:09 +01:00
55c72617c6
set http 500 when session could not be started to prevent serving of empty files see #1049
2013-02-25 18:37:05 +01:00
946a064fc6
Merge pull request #1891 from owncloud/set_timeout
...
use a 5 sec timeout for the webdav check
2013-02-25 08:27:20 -08:00
3009b43e3d
use a 5 sec timeout for the webdav check
2013-02-25 16:30:11 +01:00
2954c7e97a
Merge pull request #1865 from owncloud/fix-displaying-db-errors
...
Don't use routes when displaying error page
2013-02-25 07:09:48 -08:00
9ceae51091
Merge pull request #1887 from owncloud/fixing-1843-master
...
remove the check for session data folder - causes trouble on some enviro...
2013-02-25 04:16:38 -08:00
5bf3d286f0
created unittests and factored out version test into seperate method
2013-02-25 12:38:00 +01:00
ecd40f0abc
spaces to tabs
2013-02-25 11:40:55 +01:00
736d5deaee
version checks for apps now use all three version numbers and fixed bug that would not do the version check correctly for the second version
2013-02-25 11:39:55 +01:00
9ee5069f2a
Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
...
don't use the number of written bytes as indicator if streamCopy() was successful
2013-02-25 02:04:12 -08:00
ebcb778a99
remove the check for session data folder - causes trouble on some environments
...
let's try to find another solution for =C6
2013-02-25 10:12:47 +01:00
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
15f5325078
Don't use routes when displaying error page
2013-02-22 21:39:44 +01:00
eabfd9b69b
put value assignment into brackets
2013-02-22 16:45:57 +01:00
608ebb59dd
Merge pull request #1859 from owncloud/blacklist-fix
...
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 07:43:13 -08:00
d8137fdf66
return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied
2013-02-22 16:43:11 +01:00
62c65bc1c8
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 16:13:08 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
5b94959686
using the number of writen bytes as indicator if streamCopy() was successfully. Instead check if fwrite returns the number of bytes or false
2013-02-22 14:56:50 +01:00
f51d8c1cd9
fix order of mount commands
2013-02-22 14:19:29 +01:00
16a5f15f85
keep transparency when resizing or cropping png/gif
2013-02-22 12:42:40 +01:00
efe33c508e
Don't walk objects with array_walk_recursive()
2013-02-22 00:51:54 +01:00
bf0b9bac8b
Remove unneeded code for user layout template
2013-02-22 00:22:43 +01:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
88bea55f97
Update hint by the internal version number.
...
So we don't repeat the 4.5 <=> 4.90 mixup
2013-02-21 21:30:25 +01:00
0a6e9933fc
Merge pull request #1812 from owncloud/add-logging-to-webdav-test-master
...
Enhancment to the WebDAV-Testing ...
2013-02-21 05:58:34 -08:00
c5e0dda887
add a safe_mode check
2013-02-21 11:09:00 +01:00
d29c2b0169
Reuse $freeSpace variable
2013-02-23 16:00:50 -05:00
a2d3333a09
Don't throw insufficient storage exception if free space is unknown
2013-02-23 15:37:44 -05:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
c8c0e72e73
Merge pull request #1768 from houqp/issue_1739
...
bug fix for issue 1739
2013-02-21 01:09:15 -08:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
7b7994b56b
WebDAV-Testing:
...
- write the exception to the log
- in case curl is missing we should return true as well
2013-02-20 23:11:38 +01:00
59fd9b2bd2
5.0.0 beta 1
2013-02-20 19:09:58 +01:00
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
702c27b0e6
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
2013-02-19 19:12:14 -05:00
3878203679
Merge pull request #1731 from owncloud/unknown-freespace
...
Give storage backends the option to define having no known free space
2013-02-19 15:18:12 -08:00
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
2c78c5ccab
bug fix for issue 1739, two changes included:
...
* fix typo in OC_Group_Database::DisplayNamesInGroup's SQL clause
* check array_diff return value in OC_Group::displayNamesInGroups,
when there is no difference between two arrays, it will return
NULL, so we have to take care of it.
2013-02-18 18:05:58 -05:00
d9035d4fdc
Merge pull request #1728 from owncloud/mountconfig
...
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
f554347db5
Merge pull request #1724 from owncloud/long-storage-id
...
Cache: hash long storage ids to ensure they fit in the database
2013-02-18 07:17:27 -08:00
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
55d6b96348
Merge pull request #1719 from owncloud/fixing-1659-master
...
Fixing 1659 master
2013-02-17 11:47:35 -08:00
451daf3ab1
Keep user quota into account when the storage backend has unkown free space
2013-02-17 20:09:03 +01:00
d96146a017
Give storage backends the option to define having no known free space
...
When this is the case only the configured max upload size is taking into account for uploading
2013-02-16 03:27:50 +01:00
6da2c6c83e
Create new mountconfig files in json
2013-02-16 01:50:40 +01:00
46626915ef
Use a parser to read custom mount configuration instead of including the php files
2013-02-16 01:30:44 +01:00
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
0c1ec758e8
Cache: hash long storage ids to ensure they fit in the database
2013-02-15 22:11:39 +01:00
40739350c9
class Mapper no respects an unchanged physical root which will be excluded from slugifying the path
2013-02-15 17:42:17 +01:00
b488800bd5
fix error in recursive search
2013-02-15 17:41:22 +01:00
b8e2454f68
Fix strict standard warning in user template
2013-02-15 16:10:06 +01:00
2ce398c68e
Merge pull request #1715 from owncloud/fixing-1640-master
...
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
2013-02-15 03:58:05 -08:00
297c50db18
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
2013-02-15 12:24:49 +01:00
8b09fbc150
Merge pull request #1700 from owncloud/fixing-1680-master
...
Fixing 1680 master
2013-02-15 03:21:49 -08:00
102619ab87
we should never drop a database
2013-02-15 08:22:31 +01:00
166693426d
Merge pull request #1712 from owncloud/debug-exception
...
Don't catch errors/exceptions when debug is enabled
2013-02-14 20:40:31 -08:00
ab70f9bd25
Fix quotes in OC_User::isEnabled
...
this broke login
2013-02-15 03:20:02 +01:00
0395715348
set DEBUG from xdebug session before we first use it
2013-02-15 03:15:09 +01:00
bcabdd7dd5
Don't cache errors/exceptions when debug is enabled
2013-02-15 03:14:41 +01:00
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
4b80466880
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
2013-02-14 22:54:48 +01:00
78a3625ddf
final adoptions for mssql connectivity
2013-02-14 21:59:24 +01:00
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
be194c5b5b
Invalidate existing HSTS headers
2013-02-14 19:23:29 +01:00
e96f6ffa52
filter l10n-* files
2013-02-14 17:24:06 +01:00
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
ffae6f4b84
Style-fix: Breakup long lines
2013-02-14 08:38:37 +01:00
2d6d0a4ad4
Whitespace indent fixes
2013-02-14 08:36:26 +01:00
2679123846
Add braces around single line if statements
2013-02-14 08:36:26 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
e1e77fe3be
Merge pull request #1598 from owncloud/fixing-1424-master
...
Fixing 1424 master
2013-02-13 12:59:30 -08:00
bc43dd704f
Merge branch 'master' into fixing-1424-master
...
Conflicts:
settings/js/users.js
2013-02-13 01:18:01 +01:00
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
a814361ca7
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 23:01:54 +01:00
b31cc83a2d
$this->numericId should be determined based on table storages not filecache
2013-02-12 17:26:58 +01:00
Michael Gapczynski
Thomas Tanghus
Bernhard Posselt
Robin Appelman
Jenkins for ownCloud
Lukas Reschke
Frank Karlitschek
Björn Schießle
Bart Visscher
Björn Schießle
Jörn Friedrich Dreyer
Georg Ehrke
Qingping Hou
Jan-Christoph Borchardt