Jenkins for ownCloud
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
Lukas Reschke
546fb72b25
Merge pull request #2165 from owncloud/fix_2155
...
Offer download of whole shared dir only if it does not exceed zip input ...
2013-03-08 10:31:48 -08:00
Arthur Schiwon
f4a326173e
fix foldersize check to validate zip input size
2013-03-08 19:21:06 +01:00
Robin Appelman
1d3beffacf
Cache: better rename hook for cache updater
2013-03-08 19:08:07 +01:00
Björn Schießle
2d00d13a5d
use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated
2013-03-08 15:13:00 +01:00
Frank Karlitschek
f9c24a0368
5.0.0 RC3
2013-03-08 10:01:22 +01:00
Bernhard Posselt
0525bbd73c
Merge pull request #2189 from owncloud/versioning_sync_client
...
fix versioning for the sync client - distinguish between touch and write operation
2013-03-08 03:05:28 -08:00
Björn Schießle
8d26400cb5
remove some debug output; move code to the right function
2013-03-08 11:27:25 +01:00
Michael Gapczynski
6e5e8c6b46
Fix #2080 and fix #2141
2013-03-07 22:30:12 -05:00
Michael Gapczynski
4826564344
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05:00
Bernhard Posselt
d6bb627a62
Merge pull request #2173 from owncloud/fix-shared-storage
...
Fix fetching source path of shared files
2013-03-07 09:37:36 -08:00
blizzz
99914a44a5
Merge pull request #2174 from owncloud/fix_printed_brs
...
Remove <br> from error messages, because they will be escaped and the us...
2013-03-07 08:39:29 -08:00
Arthur Schiwon
47d176ae69
Remove <br> from error messages, because they will be escaped and the used template has it's own <br> already
2013-03-07 17:28:28 +01:00
Michael Gapczynski
a5cab28bea
Fix fetching source path of shared files
2013-03-07 11:12:59 -05:00
Björn Schießle
48bb53030c
distinguish between touch and write
2013-03-07 15:51:44 +01:00
Björn Schießle
ce9942331e
create a meanigful file name if files are from the root folder
2013-03-07 14:24:18 +01:00
Björn Schießle
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +01:00
Brice Maron
4994eaace1
Allow to load splited config files ref #946
2013-03-06 23:30:16 +01:00
Brice Maron
a68cbb00e0
Preserve Debug flag accross config writes
2013-03-06 21:05:13 +01:00
Arthur Schiwon
6acbadf418
return 403 when mkdir failed on webDAV, fixes #2127
2013-03-06 15:21:12 +01:00
Lukas Reschke
cfb10dc58c
Add warning about sanitization
2013-03-06 13:05:22 +01:00
Bernhard Posselt
145fb18042
Merge pull request #2120 from owncloud/clear-caches
...
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-06 02:53:16 -08:00
Björn Schießle
82990b82a6
Merge pull request #2118 from owncloud/fix_1689
...
properly implement displayNamesInGroup in Core and LDAP, fixes #1689
2013-03-06 00:38:06 -08:00
Michael Gapczynski
4dcbaa1d7b
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/appinfo/app.php
2013-03-05 21:54:32 -05:00
Michael Gapczynski
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
Jenkins for ownCloud
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
Arthur Schiwon
5da9223d1c
make getDisplayNames optional feature for Group Backends, fall back to internal names
2013-03-05 21:22:34 +01:00
Michael Gapczynski
ee0c38bb51
Fix group post_shared hook
2013-03-04 19:43:56 -05:00
Tom Needham
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
Jenkins for ownCloud
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
Bart Visscher
d800f35bf4
Disable loading of backgroundjobs js when upgrade is needed
2013-03-03 23:15:22 +01:00
Bart Visscher
a2d6b27170
Check maintenance mode before loading apps in route matcher
2013-03-03 23:15:18 +01:00
Michael Gapczynski
71bdccf347
Chunk size comment should say kB, not MB
2013-03-03 12:03:26 -05:00
Jenkins for ownCloud
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
Frank Karlitschek
927a374dbe
Merge pull request #2036 from owncloud/escape-only-in-template
...
Escape the data only in the template
2013-03-02 11:35:37 -08:00
Lukas Reschke
3e3c039292
Escape the data only in the template
2013-03-02 20:21:51 +01:00
Brice Maron
050de008b1
Avoid to display empty DisplayNames for menu and title
2013-03-02 16:09:36 +01:00
Lukas Reschke
5a9e9e0b51
Merge pull request #2026 from j-ed/master
...
do not try to extract image infos from 0- or better less than 12-byte length files.
2013-03-02 02:59:00 -08:00
j-ed
07b956c22d
Update image.php
...
don't try to extract image infos from 0- or better less than 12 byte length files. See description of `exif_imagetype` function at
`http://php.net/manual/de/function.exif-imagetype.php `.
2013-03-02 10:51:49 +01:00
Frank Karlitschek
2b7ff7273d
ownCloud 5 RC2
2013-03-02 04:06:27 +01:00
Jenkins for ownCloud
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
Michael Gapczynski
db23c885d9
Merge pull request #2096 from owncloud/cache-upgrade-id
...
Cache: also check if the file id is already in the cache during upgrade
2013-03-04 14:55:20 -08:00
Robin Appelman
9d9acf24de
Cache: more efficient detection for existing entries during upgrade
2013-03-04 23:19:55 +01:00
Robin Appelman
56ae4bb6e9
Cache: also check if the file id is already in the cache during upgrade
...
Should solve upgrade issues if only some of the configured storages were migrated previously
2013-03-04 22:26:03 +01:00
Bernhard Posselt
62dde34887
Merge pull request #2088 from owncloud/fixing-1844-again-master
...
adding test case for getDefaultEmailAddress() + fixing #1844 again
2013-03-04 12:52:35 -08:00
Thomas Mueller
6019cdd5bd
adding test case for getDefaultEmailAddress() + fixing #1844 again
2013-03-04 21:10:18 +01:00
Thomas Müller
5c061561c5
Merge pull request #2078 from owncloud/save_category_relations
...
VCategories: Don't forget to save category relations if category exists.
2013-03-04 12:04:16 -08:00
Lukas Reschke
a97006144e
Only send the standard headers
...
Fixes https://github.com/owncloud/apps/issues/675
2013-03-04 20:35:58 +01:00
Michael Gapczynski
8b09402b77
Fix #2074 by initializing as an array
2013-03-04 12:08:41 -05:00
Thomas Tanghus
c08a04bc83
VCategories: Don't forget to save category relations if category exists.
2013-03-04 17:05:08 +01:00
Jenkins for ownCloud
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
Lukas Reschke
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
Thomas Mueller
6c304fa5c0
validate the generated email address and fall back to localhost.localdomain in case it is not valid
...
fixes #1844
2013-03-01 22:24:19 +01:00
Thomas Mueller
39b9ed50d7
for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
2013-03-01 20:34:16 +01:00
Frank Karlitschek
f7cb53b103
Merge pull request #2008 from owncloud/1999-requesttoken
...
Check if requesttoken exists in session
2013-03-01 06:12:09 -08:00
Lukas Reschke
93f15215c6
Check if requesttoken exists in session
...
Ref #1999
2013-03-01 14:59:51 +01:00
Lukas Reschke
630becb95f
Style fixes
2013-03-01 14:59:24 +01:00
Frank Karlitschek
09dc15d2b1
5.0 RC 1
2013-03-01 07:53:14 +01:00
Jenkins for ownCloud
d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
Bart Visscher
84aa2c66d6
Merge pull request #1937 from owncloud/check-resharing
...
Check resharing setting
2013-02-28 11:39:11 -08:00
Lukas Reschke
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
icewind1991
a86761e1e7
Merge pull request #1988 from owncloud/permissionscache_clean
...
Clean permissions cache when deleting file
2013-02-28 10:24:20 -08:00
Björn Schießle
1cc7e6d31a
Merge pull request #1989 from owncloud/selectSanitize
...
Sanitize HTML in html_select_options
2013-02-28 08:51:07 -08:00
Lukas Reschke
cef6131ea8
Sanitize HTML in html_select_options
2013-02-28 17:19:04 +01:00
Robin Appelman
ee1eb98d4a
Cache: cleanup permissions cache when removing a file from the cache
2013-02-28 17:04:50 +01:00
Robin Appelman
f7a43391a7
Cache: add option to delete file from permissions cache for all users
2013-02-28 17:04:34 +01:00
Michael Gapczynski
b5989c933f
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-02-28 10:39:23 -05:00
Bernhard Posselt
59835a9087
add checks for xml and dom when installing
2013-02-28 15:13:18 +01:00
Jenkins for ownCloud
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
Lukas Reschke
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
Lukas Reschke
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
Bernhard Posselt
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
Bart Visscher
d7528f06df
Disable query cache for Sqlite
2013-02-27 22:32:39 +01:00
Bernhard Posselt
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
Bart Visscher
56f3917f36
Use the plain urlencoded path info for the routing matching
2013-02-27 21:38:58 +01:00
Lukas Reschke
470fc3817f
Remove the template autoescaping
...
Ref #1963
2013-02-27 20:53:52 +01:00
Michael Gapczynski
766a301a6b
Merge pull request #1031 from owncloud/external_storage_ui_feedback
...
External Storage UI Improvements
2013-02-27 10:00:22 -08:00
Bernhard Posselt
5fd8d155fd
Merge pull request #1962 from owncloud/big_upload_fix
...
timeout after a longer time
2013-02-27 07:05:19 -08:00
Bernhard Posselt
888e4f21d2
timeout after a longer time
2013-02-27 15:44:00 +01:00
Jenkins for ownCloud
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
Bart Visscher
3a7322342e
Merge pull request #1956 from owncloud/session-error-format
...
add styles before session init
2013-02-27 05:21:17 -08:00
Bart Visscher
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
Bernhard Posselt
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
Bernhard Posselt
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
Bernhard Posselt
a1afc2e34f
only add style.css to initsession
2013-02-27 11:36:05 +01:00
Bernhard Posselt
18b7a2bf21
add css and scripts before session init
2013-02-27 11:17:14 +01:00
Jenkins for ownCloud
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
Arthur Schiwon
60d4fdda57
sort users according to display name
2013-02-26 22:56:55 +01:00
Robin Appelman
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00
Bart Visscher
4a26d63867
Fix using wrong quotes for breaking long lines
...
Fixes #1925
2013-02-26 20:48:01 +01:00
Michael Gapczynski
9a2ca0ae64
Check resharing setting
2013-02-26 13:31:15 -05:00
Thomas Tanghus
ea841e5e15
Catch exceptions on malformed categories.
2013-02-26 15:01:42 +01:00
Bernhard Posselt
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
Bernhard Posselt
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
Michael Gapczynski
8983465210
Correct parent folders' ETags for all users with access to a shared file
2013-02-26 01:21:48 -05:00
Robin Appelman
52dccd4aa1
Storage: don't throw warnings when a stat fails
2013-02-26 02:53:02 +01:00
Robin Appelman
6b33a23a51
Code style
2013-02-26 02:51:57 +01:00
Jenkins for ownCloud
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
Michael Gapczynski
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
2013-02-25 17:56:40 -05:00
Bernhard Posselt
f415f3e03e
return true once one owncloud version number is bigger at any position
2013-02-25 23:06:26 +01:00
Lukas Reschke
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
Lukas Reschke
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
Lukas Reschke
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
Thomas Müller
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
Frank Karlitschek
a533bb6dcd
5 beta 2
2013-02-25 20:00:40 +01:00
Bernhard Posselt
7f7b8bc07a
use error template
2013-02-25 19:17:29 +01:00
Bernhard Posselt
aba60dba28
added simple error message for the browser
2013-02-25 18:47:34 +01:00
Bernhard Posselt
bc2fefed59
write an error log when session could not be initialized
2013-02-25 18:42:09 +01:00
Bernhard Posselt
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
Bernhard Posselt
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
Frank Karlitschek
3009b43e3d
use a 5 sec timeout for the webdav check
2013-02-25 16:30:11 +01:00
Björn Schießle
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
Bart Visscher
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
Bernhard Posselt
5bf3d286f0
created unittests and factored out version test into seperate method
2013-02-25 12:38:00 +01:00
Bernhard Posselt
ecd40f0abc
spaces to tabs
2013-02-25 11:40:55 +01:00
Bernhard Posselt
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
Frank Karlitschek
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
Thomas Mueller
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
Jenkins for ownCloud
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
Thomas Mueller
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
Bart Visscher
15f5325078
Don't use routes when displaying error page
2013-02-22 21:39:44 +01:00
Björn Schießle
eabfd9b69b
put value assignment into brackets
2013-02-22 16:45:57 +01:00
Bernhard Posselt
608ebb59dd
Merge pull request #1859 from owncloud/blacklist-fix
...
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 07:43:13 -08:00
Björn Schießle
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
Robin Appelman
62c65bc1c8
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 16:13:08 +01:00
Jörn Friedrich Dreyer
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Björn Schießle
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
Georg Ehrke
f51d8c1cd9
fix order of mount commands
2013-02-22 14:19:29 +01:00
Jörn Friedrich Dreyer
16a5f15f85
keep transparency when resizing or cropping png/gif
2013-02-22 12:42:40 +01:00
Thomas Tanghus
efe33c508e
Don't walk objects with array_walk_recursive()
2013-02-22 00:51:54 +01:00
Bart Visscher
bf0b9bac8b
Remove unneeded code for user layout template
2013-02-22 00:22:43 +01:00
Jenkins for ownCloud
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
Bart Visscher
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
Bart Visscher
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
Björn Schießle
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
Frank Karlitschek
c5e0dda887
add a safe_mode check
2013-02-21 11:09:00 +01:00
Michael Gapczynski
d29c2b0169
Reuse $freeSpace variable
2013-02-23 16:00:50 -05:00
Michael Gapczynski
a2d3333a09
Don't throw insufficient storage exception if free space is unknown
2013-02-23 15:37:44 -05:00
Bart Visscher
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
Björn Schießle
c8c0e72e73
Merge pull request #1768 from houqp/issue_1739
...
bug fix for issue 1739
2013-02-21 01:09:15 -08:00
Jenkins for ownCloud
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
Thomas Mueller
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
Frank Karlitschek
59fd9b2bd2
5.0.0 beta 1
2013-02-20 19:09:58 +01:00
Thomas Mueller
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
Michael Gapczynski
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
Frank Karlitschek
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
Jenkins for ownCloud
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
Jenkins for ownCloud
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
Qingping Hou
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
Thomas Müller
d9035d4fdc
Merge pull request #1728 from owncloud/mountconfig
...
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
Frank Karlitschek
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
Robin Appelman
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
Thomas Mueller
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
Jenkins for ownCloud
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
Thomas Müller
55d6b96348
Merge pull request #1719 from owncloud/fixing-1659-master
...
Fixing 1659 master
2013-02-17 11:47:35 -08:00
Robin Appelman
451daf3ab1
Keep user quota into account when the storage backend has unkown free space
2013-02-17 20:09:03 +01:00
Robin Appelman
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
Robin Appelman
6da2c6c83e
Create new mountconfig files in json
2013-02-16 01:50:40 +01:00
Robin Appelman
46626915ef
Use a parser to read custom mount configuration instead of including the php files
2013-02-16 01:30:44 +01:00
Jenkins for ownCloud
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
Robin Appelman
0c1ec758e8
Cache: hash long storage ids to ensure they fit in the database
2013-02-15 22:11:39 +01:00
Thomas Mueller
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
Thomas Mueller
b488800bd5
fix error in recursive search
2013-02-15 17:41:22 +01:00
Robin Appelman
b8e2454f68
Fix strict standard warning in user template
2013-02-15 16:10:06 +01:00
Thomas Müller
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
Thomas Mueller
297c50db18
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
2013-02-15 12:24:49 +01:00
Jan-Christoph Borchardt
8b09fbc150
Merge pull request #1700 from owncloud/fixing-1680-master
...
Fixing 1680 master
2013-02-15 03:21:49 -08:00
Thomas Mueller
102619ab87
we should never drop a database
2013-02-15 08:22:31 +01:00
Thomas Müller
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
Robin Appelman
ab70f9bd25
Fix quotes in OC_User::isEnabled
...
this broke login
2013-02-15 03:20:02 +01:00
Robin Appelman
0395715348
set DEBUG from xdebug session before we first use it
2013-02-15 03:15:09 +01:00
Robin Appelman
bcabdd7dd5
Don't cache errors/exceptions when debug is enabled
2013-02-15 03:14:41 +01:00
Jenkins for ownCloud
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
Thomas Mueller
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
Thomas Mueller
78a3625ddf
final adoptions for mssql connectivity
2013-02-14 21:59:24 +01:00
Bart Visscher
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
Lukas Reschke
be194c5b5b
Invalidate existing HSTS headers
2013-02-14 19:23:29 +01:00
Thomas Mueller
e96f6ffa52
filter l10n-* files
2013-02-14 17:24:06 +01:00
Thomas Mueller
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
Bart Visscher
ffae6f4b84
Style-fix: Breakup long lines
2013-02-14 08:38:37 +01:00
Bart Visscher
2d6d0a4ad4
Whitespace indent fixes
2013-02-14 08:36:26 +01:00
Bart Visscher
2679123846
Add braces around single line if statements
2013-02-14 08:36:26 +01:00
Bart Visscher
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
Jenkins for ownCloud
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
Thomas Müller
e1e77fe3be
Merge pull request #1598 from owncloud/fixing-1424-master
...
Fixing 1424 master
2013-02-13 12:59:30 -08:00
Thomas Mueller
bc43dd704f
Merge branch 'master' into fixing-1424-master
...
Conflicts:
settings/js/users.js
2013-02-13 01:18:01 +01:00
Jenkins for ownCloud
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
Thomas Mueller
a814361ca7
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 23:01:54 +01:00
Thomas Mueller
b31cc83a2d
$this->numericId should be determined based on table storages not filecache
2013-02-12 17:26:58 +01:00
Thomas Müller
251b676a06
Merge pull request #1616 from owncloud/cache_fixes_rebase
...
Cache: reuse known folder sizes when doing a shallow scan - rebase
2013-02-12 08:07:49 -08:00
Robin Appelman
b54dcd1999
Cache: fix scanner trying to use existing data when file isn't in cache
2013-02-12 16:48:21 +01:00
Thomas Mueller
f2baf1ae0e
fixing syntax error
2013-02-12 16:18:48 +01:00
Jenkins for ownCloud
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
Robin Appelman
e1fe5279dd
Cache: also preserve etags for files
2013-02-12 14:56:57 +01:00
Thomas Mueller
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
Michael Gapczynski
6eba790a75
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/dropbox.js
apps/files_external/js/google.js
apps/files_external/js/settings.js
apps/files_external/lib/amazons3.php
apps/files_external/lib/dropbox.php
apps/files_external/lib/google.php
apps/files_external/lib/smb.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
lib/filestorage.php
2013-02-11 20:27:05 -05:00
Thomas Mueller
bcbf2e667b
fixing sql server syntax for database creation
2013-02-12 01:17:01 +01:00
Thomas Mueller
98d7e0f7cd
write any database messages / non critical errors to the log - don't pollute the browser
2013-02-12 01:14:53 +01:00
Thomas Mueller
8136851010
fixing indent
2013-02-12 01:05:47 +01:00
Thomas Mueller
b2dfdacaa1
fixing undefined variables
2013-02-12 01:04:35 +01:00
Thomas Mueller
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
Thomas Müller
53111ccdc8
Merge pull request #1634 from irgsmirx/patch-6
...
Update/Bugfix lib/files/cache/legacy.php during database upgrade
2013-02-11 15:31:28 -08:00
Jenkins for ownCloud
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
Thomas Müller
04bf8c1b66
Merge pull request #1596 from owncloud/fix_470
...
webdav put improvements
2013-02-11 13:10:48 -08:00
Thomas Mueller
5731a1b01c
introduce new virtual method hasUserListings() to determine if a user backend can list it's users.
2013-02-11 22:01:52 +01:00
Thomas Mueller
037fcde133
Merge branch 'master' into fixing-1424-master
2013-02-11 21:42:27 +01:00
irgsmirx
062befd1fc
Update lib/files/cache/legacy.php
...
Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed.
Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
2013-02-11 20:28:36 +01:00
Jenkins for ownCloud
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
Thomas Müller
766fbead96
Merge pull request #1578 from owncloud/mysql_admin_fix
...
added l10n for db error messages
2013-02-11 06:35:49 -08:00
Lukas Reschke
eed48c8159
Merge pull request #1608 from owncloud/fix-shared-links
...
Fix shared links
2013-02-11 05:17:24 -08:00
Thomas Mueller
c544a631d5
fixing indent
2013-02-11 14:14:37 +01:00
Bernhard Posselt
e70aef603f
Merge pull request #1573 from owncloud/fixing-ctor-local-storage-master
...
adding dtor to Local and revert call to it within Temporary
2013-02-11 04:40:54 -08:00
Robin Appelman
2921d2fb78
Cache: don't create a new etag when the mtime hasn't changed
2013-02-11 13:33:56 +01:00
Robin Appelman
d84c3cd014
Cache: actually use parameter
2013-02-11 13:33:48 +01:00
Robin Appelman
299649b40e
Cache: reuse known folder sizes when doing a shallow scan
2013-02-11 13:33:41 +01:00
Robin Appelman
56d10e9054
Cache: simplify scanner logic a bit when handeling with unknown folder sizes
2013-02-11 13:33:34 +01:00
Bernhard Posselt
36df2fbdfe
fixed argument for translation
2013-02-11 13:11:43 +01:00
Robin Appelman
ad360296b9
Update tests and apps to the new \OC\Files\Filesystem::init signature
2013-02-11 11:06:09 +01:00
Jörn Friedrich Dreyer
99f41de7de
only check content lenght on PUT to make litmus happy
2013-02-11 10:31:01 +01:00
Jörn Friedrich Dreyer
2cb2991c04
delete partial file when file upload is aborted
2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
15ab2fd52a
check Content-Length to detect aborted uploads
2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
806522d007
also rename file when it has not been present before
2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
72a2075b1c
readd renaming and mtime handling to new directory nodes
2013-02-11 09:43:26 +01:00
Jörn Friedrich Dreyer
2644003bf1
send back 'X-OC-MTime: accepted' when X-OC-MTime was applied
2013-02-11 09:34:03 +01:00
Jörn Friedrich Dreyer
d2332f60f3
add a custom header clients can use to skip a n additional propset request
2013-02-11 09:32:28 +01:00
Michael Gapczynski
eeb409a6ec
Merge branch 'master' into fix-shared-links
2013-02-10 19:10:06 -05:00
Michael Gapczynski
8e3b8c7f47
Proper fix for shared links
2013-02-10 19:09:58 -05:00
Jenkins for ownCloud
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
Robin Appelman
3292dc3eea
Cache: allow file sizes >2GB
2013-02-10 16:44:00 +01:00
blizzz
e4c9fc1381
Merge pull request #1592 from owncloud/display_name_setting
...
add switch to enable/disable the possibility to change the display name by the user
2013-02-10 06:52:03 -08:00
Frank Karlitschek
dc12dd523e
Merge pull request #1581 from owncloud/mapper_md5
...
Mapper: use md5 hashes for database indexes
2013-02-10 06:47:44 -08:00
Frank Karlitschek
bc2bfea399
Merge pull request #1588 from owncloud/etag_quotes
...
wrap etags in quotes when doing a propfind on a folder
2013-02-10 06:44:45 -08:00
Lukas Reschke
d08a3bb46e
Merge pull request #1590 from owncloud/fix_470
...
append .part to put files
2013-02-10 06:38:31 -08:00
Lukas Reschke
32b1c7ad5d
Merge pull request #1589 from owncloud/use-sanitizeHTML
...
Use sanitizeHTML instead of stripslashes + htmlspecialchars
2013-02-10 06:23:01 -08:00
Björn Schießle
d8fee28b3b
add switch to enable/disable the possibility to change the display name by the user
2013-02-10 14:43:31 +01:00
Jörn Friedrich Dreyer
1263511a17
append .part to put files
2013-02-10 14:16:45 +01:00
Lukas Reschke
46103e62d2
Coding style
2013-02-10 14:09:49 +01:00
Administrator
4e5a3fbcaf
- Fixed indentations.
...
- Fixed a bug in legacy.php: there was an error that was not checked for if the table 'fscache' did not exist in the database.
2013-02-10 14:08:00 +01:00
Lukas Reschke
6f785e211b
Merge pull request #1030 from hkjolhede/master
...
SFTP support in files_external app
2013-02-10 05:06:00 -08:00
Lukas Reschke
1b10032556
Use sanitizeHTML instead of stripslashes + htmlspecialchars
2013-02-10 14:03:40 +01:00
Robin Appelman
121c1f2fc0
wrap etags in quotes when doing a propfind on a folder
2013-02-10 13:55:20 +01:00
Administrator
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
Tom Needham
6d74aa0d00
more code style
2013-02-10 12:46:41 +01:00
Tom Needham
28498e1af4
Code style and remove OAuth code
2013-02-10 12:44:59 +01:00
Tom Needham
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
Robin Appelman
0c05244f8b
Mapper: use md5 hashes for database indexes
...
indexing the full path exeeds the maximum index length for MySQL
2013-02-10 11:49:37 +01:00
Lukas Reschke
01fabd6c65
Merge pull request #1577 from owncloud/typo_catagory
...
Typo
2013-02-10 02:31:34 -08:00
Jenkins for ownCloud
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00