d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
84aa2c66d6
Merge pull request #1937 from owncloud/check-resharing
...
Check resharing setting
2013-02-28 11:39:11 -08:00
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
a86761e1e7
Merge pull request #1988 from owncloud/permissionscache_clean
...
Clean permissions cache when deleting file
2013-02-28 10:24:20 -08:00
1cc7e6d31a
Merge pull request #1989 from owncloud/selectSanitize
...
Sanitize HTML in html_select_options
2013-02-28 08:51:07 -08:00
cef6131ea8
Sanitize HTML in html_select_options
2013-02-28 17:19:04 +01:00
ee1eb98d4a
Cache: cleanup permissions cache when removing a file from the cache
2013-02-28 17:04:50 +01:00
f7a43391a7
Cache: add option to delete file from permissions cache for all users
2013-02-28 17:04:34 +01:00
59835a9087
add checks for xml and dom when installing
2013-02-28 15:13:18 +01:00
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
2f036bcc54
Merge pull request #1972 from owncloud/raw-pathinfo
...
Use the plain urlencoded path info for the routing matching
2013-02-27 13:43:47 -08:00
d7528f06df
Disable query cache for Sqlite
2013-02-27 22:32:39 +01:00
9508a58c79
Merge pull request #1944 from owncloud/query-caching-upgrade
...
Disable prepared query caching while doing an upgrade
2013-02-27 12:48:42 -08:00
56f3917f36
Use the plain urlencoded path info for the routing matching
2013-02-27 21:38:58 +01:00
470fc3817f
Remove the template autoescaping
...
Ref #1963
2013-02-27 20:53:52 +01:00
766a301a6b
Merge pull request #1031 from owncloud/external_storage_ui_feedback
...
External Storage UI Improvements
2013-02-27 10:00:22 -08:00
5fd8d155fd
Merge pull request #1962 from owncloud/big_upload_fix
...
timeout after a longer time
2013-02-27 07:05:19 -08:00
888e4f21d2
timeout after a longer time
2013-02-27 15:44:00 +01:00
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
3a7322342e
Merge pull request #1956 from owncloud/session-error-format
...
add styles before session init
2013-02-27 05:21:17 -08:00
a708b63402
Merge pull request #1961 from owncloud/trans_fix
...
fixed bug that would cause a failure because of undefined variable inst...
2013-02-27 05:17:30 -08:00
49a0f42e3b
fixed bug that would cause a failure because of undefined variable instead of %s in a translation string
2013-02-27 14:13:07 +01:00
a54be4acc4
Merge pull request #1948 from owncloud/improve_user_sorting
...
Sort after display name + LDAP server side sorting
2013-02-27 02:39:22 -08:00
a1afc2e34f
only add style.css to initsession
2013-02-27 11:36:05 +01:00
18b7a2bf21
add css and scripts before session init
2013-02-27 11:17:14 +01:00
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
60d4fdda57
sort users according to display name
2013-02-26 22:56:55 +01:00
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00
4a26d63867
Fix using wrong quotes for breaking long lines
...
Fixes #1925
2013-02-26 20:48:01 +01:00
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
Jenkins for ownCloud
Bart Visscher
Lukas Reschke
icewind1991
Björn Schießle
Robin Appelman
Bernhard Posselt
Michael Gapczynski
Arthur Schiwon
Thomas Tanghus
Frank Karlitschek
Björn Schießle
Jörn Friedrich Dreyer
Georg Ehrke
Qingping Hou