ff6f52d5ec
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
aa103bd5b3
supress write hook for .part files
2013-03-28 12:15:27 +01:00
4a70315ad1
ignore files in scanFile instead of scan to catch all occurences.
2013-03-28 12:15:27 +01:00
78c694b6ee
Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy
2013-03-27 19:20:08 +01:00
3d29a82150
Cache: Do not overwrite ETag when file did not change
2013-03-27 19:19:40 +01:00
2a2d409733
Only prepare an SQL statement once.
2013-03-27 19:19:16 +01:00
1d676fb0e6
Add PHPDoc
2013-03-27 19:18:58 +01:00
d9e07ca60a
Adjust to Icewind's fix
2013-03-27 19:18:34 +01:00
1a874b9106
Cache: fix property path for getting legacy etag
2013-03-27 19:18:13 +01:00
19c7d9c3dc
Port Icewind's fix I
2013-03-27 19:17:49 +01:00
5fc276602a
Change LIMIT in DB query respectively remove where not necessary
2013-03-27 19:13:14 +01:00
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01:00
9d25058905
Performance: prepare queries only once
2013-03-27 19:12:04 +01:00
7839ec5093
Fix lost ETag on Cache Upgrade
2013-03-27 19:11:35 +01:00
8dd7fa8507
Use isAppVersionCompatible in app installer
2013-03-27 10:16:05 +00:00
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
93a6ed3dab
Ensure instanceid contains a letter
...
instanceid is generated by uniqid() and then used as the
session_name. Because session_name requires at least one letter
and uniqid() does not guarantee to provide that, in the case that
uniqid() generates a string of only digits, the user will be stuck
in an infinite login loop because every request will generate a
new PHP session.
2013-03-26 21:49:32 +00:00
53fd122b89
Minor typo, coding style fixes for OC_Util::getInstanceId
2013-03-26 21:48:49 +00:00
74852243e2
Merge pull request #2567 from owncloud/fix_insertIfNotExist
...
Properly prepare insertIfNotExist queries.
2013-03-26 08:59:10 -07:00
d49e8ffb5e
Merge pull request #2568 from itheiss/master
...
Implement setting custom domainname for getDefaultEmailAddress
2013-03-26 02:50:11 -07:00
d16dd1ad2a
listen to touch hook to update the mtime after sync
2013-03-26 09:42:55 +01:00
5b66b317b1
And removing an irrelevant comment ;)
2013-03-26 01:01:38 +01:00
5f53145eb0
Double quotes to backticks
2013-03-26 01:00:15 +01:00
9d618005b6
Missing backticks. Thx @Raydiation :)
2013-03-26 00:24:08 +01:00
5e81016392
D'oh, why concatenate static strings.
2013-03-26 00:21:57 +01:00
07236800a7
Quote key for SQLite.
2013-03-26 00:19:23 +01:00
1c3f5ba6ef
Properly prepare insertIfNotExist queries.
2013-03-25 23:59:34 +01:00
0e55b61169
Improve phpdoc for the filecache
2013-03-24 02:06:50 +01:00
bbeb657c03
Merge pull request #2454 from owncloud/fixing-file-mapper-ext-master
...
Fixing file mapper ext master
2013-03-23 05:34:25 -07:00
3d2acb5389
Merge pull request #2446 from owncloud/fixing-safe-mode-check-master
...
more accurate safe_mode check - refs #2258
2013-03-23 05:33:32 -07:00
6326a3a9f7
Some improvements for the Storage phpdoc
2013-03-23 00:10:30 +01:00
568c256aff
Fix #2499
...
The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.
e.g. 'mail_domain' => 'example.com'
2013-03-22 10:07:06 +01:00
e5f8acf4c0
Add phpdoc documentation to the Storage interface
2013-03-21 13:11:52 +01:00
ad2d222466
Merge pull request #2447 from owncloud/fix_namespace_in_autoloader
...
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-21 00:46:09 -07:00
033c94d076
fixed xsendfile zip generation race condition
2013-03-20 22:37:02 +01:00
3e9ea6d13b
Remove space before parethesis
2013-03-20 16:54:06 +04:00
268d4a525d
some more test cases & fix on file name generation with index
2013-03-19 16:57:54 +01:00
0fff3c9698
adding extension to slugified physical path
2013-03-19 16:53:37 +01:00
8ca01451fd
Merge pull request #2244 from owncloud/fixing-windows-datadir-master
...
remove trailing slash from data dir on windows
2013-03-19 07:38:41 -07:00
8858960a19
Merge pull request #2451 from owncloud/fix_npe_master
...
fix npe when createStorage() returns null
2013-03-19 07:28:59 -07:00
39665cfa6b
fix npe when createStorage() returns null
2013-03-19 15:02:29 +01:00
9dd3dcc5cd
Merge branch 'master' into fixing-windows-datadir-master
2013-03-19 14:43:55 +01:00
c3a64012d8
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-19 16:40:52 +03:00
86c819bbe8
more accurate safe_mode check - refs #2258
2013-03-19 14:36:52 +01:00
3cb016d478
add a searchbymime to the public api. Please all remember that access to internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-)
2013-03-19 14:27:02 +01:00
7a2396208f
using rtrim
2013-03-19 13:37:48 +01:00
57f2884efa
Add hashed version parameter to js and css. Ref #1520 and many more ;)
2013-03-19 12:35:31 +01:00
f052846914
Add indexes and primary keys.
2013-03-19 01:38:40 +01:00
935d2169c8
Revert "Add indexes and primary keys."
...
This reverts commit 3b33712dc9
2013-03-19 01:36:51 +01:00
3b33712dc9
Add indexes and primary keys.
2013-03-19 01:35:12 +01:00
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +01:00
5b1f857907
Merge pull request #2363 from owncloud/uploadsize
...
Improve behaviour when max upload size is unknown
2013-03-18 08:18:27 -07:00
63336f2acb
remove deprecated call
2013-03-17 22:05:45 +01:00
7f1ff3e9e1
Merge pull request #2204 from owncloud/chache_updater_rename
...
Cache: better rename hook for cache updater
2013-03-17 05:03:18 -07:00
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
a3db54f9b0
Merge pull request #2383 from owncloud/error-handling-upgrade
...
Add error handling to the file cache upgrade
2013-03-16 12:17:31 -07:00
c69dc3483a
Add error handling to the file cache upgrade
2013-03-16 14:28:42 -04:00
8a97afac6f
Don't show storage space warning when the free space can't be determined
2013-03-15 16:46:20 +01:00
319e3f162c
Don't block uploads if the max upload size is unknown
2013-03-15 16:40:36 +01:00
32b8fd8fb7
Improve handeling of unlimited max upload size
2013-03-15 16:31:35 +01:00
387be37427
Filter display of blacklisted files
...
Blacklisted files like ".htaccess" and ".git" should not only be
blacklisted for upload and rename, but they should also not be displayed
in the directory listings.
I needed this personally to hide ".git" folders in shared folders. Its
also a simple implementation of feature requests like
http://forum.owncloud.org/viewtopic.php?f=4&t=3279 and
http://forum.owncloud.org/viewtopic.php?f=3&t=5708
2013-03-15 12:11:42 +01:00
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
ed83597371
Return unknown freespace if the free_space call failed
...
Fixes #2312
2013-03-14 17:00:30 +01:00
abe408e934
replace \MDB with \OC_DB, approved in #2278
2013-03-14 14:59:12 +01:00
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
17fd6482d8
Fix file sharing via public link for one particular file.
...
Fix OC_Files::get() to not return the first character of the filename
if only one file is requested.
2013-03-12 20:03:54 +01:00
2e9d641337
Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-string-master
...
Fixing mssql utf8 and insert empty string master
2013-03-12 11:52:40 -07:00
84d895dc87
Merge pull request #2253 from owncloud/fixing-windows-file-mapper-master
...
Fixing windows file mapper master
2013-03-12 11:48:29 -07:00
68a7b53e03
Merge pull request #2145 from eMerzh/preserve_debug
...
Preserve Debug flag accross config writes
2013-03-12 10:26:01 -07:00
ec16853112
enable UTF-8 charset on mssql
...
disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields
2013-03-12 15:39:44 +01:00
9d4d399aa3
write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-(
2013-03-12 15:39:29 +01:00
a05820c659
fixing various filesystem/storage unit tests on windows
...
fixing copy operation on mapper
2013-03-12 15:30:10 +01:00
eedbebd40e
adding //IGNORE to iconv to prevent nasty php warnings
2013-03-12 09:26:21 +01:00
06992fec6d
slug generates uniqid in case the file/folder name contains not one single valid character
2013-03-12 09:24:58 +01:00
0900301668
indexed slug should be created based on logic path
2013-03-12 09:15:53 +01:00
2fe56b8969
fixes #2081
2013-03-12 09:14:05 +01:00
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
dfbf57207d
Merge pull request #1584 from owncloud/ocs_multiple_methods
...
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
d5da94acbc
Small perf improvement : filter before sort
2013-03-09 21:41:59 +01:00
e6c2a91781
this is now 6.0 pre alpha
2013-03-09 20:19:34 +01:00
256595e7b2
5.0.0
2013-03-09 18:51:02 +01:00
3ae70ab162
Check if username is valid and remove slashes from filename
2013-03-11 16:21:26 +01:00
1e20067c00
Merge pull request #2183 from owncloud/fix-shared-statuses-again
...
Fix #2080 and fix #2141
2013-03-11 02:43:16 -07:00
11251ec8a8
Merge pull request #2218 from owncloud/fix-mounting-all
...
Fix variable for mounting for all users, fix #357
2013-03-11 02:41:41 -07:00
049a4df259
Merge pull request #1786 from owncloud/shared-folder-etags
...
Include etags for the root of the shared folder
2013-03-11 02:38:50 -07:00
3c06020e3e
Merge pull request #2217 from owncloud/mountconfig-location
...
Store the global mount configuration file in the datadir
2013-03-10 00:25:10 -08:00
8a5946fadc
Fix variable for mounting for all users, fix #357
2013-03-09 21:09:31 -05:00
be4806d031
Store the global mount configuration file in the datadir
2013-03-10 02:25:03 +01:00
99c873ea29
fixed typo that broke xsendfile
2013-03-09 15:35:36 +01:00
988a67fc9a
remove remaining br-tags that do not belong here
2013-03-09 13:45:37 +01:00
ecb9d37b55
request.php: add type check to the not empty check of a string
...
The not equal comparison (<>) of a variable with an empty string
could lead to false positive results as the compare do not check
the type and thereby could not make sure that the checked variable
is a string. The usage of the not identical comparison operator
(!==) make sure that the variable is a string and not empty.
2013-03-09 11:53:15 +01:00
d4f98923b9
Overwrite host and webroot when forcessl is enabled
...
This patch enables the use of forcessl together with a multiple domains
reverse SSL proxy (owncloud/core#1099 ) which have different hostname
and webroot for http and https access. The code assumes that the ssl
proxy (https) hostname and webroot is configured via overwritehost and
overwritewebroot.
2013-03-09 11:00:53 +01:00
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
d7beac6d6f
Merge branch 'master' into filecache_mtime
...
Conflicts:
lib/files/view.php
lib/util.php
tests/lib/files/cache/cache.php
2013-03-08 15:28:45 -05:00
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
f4a326173e
fix foldersize check to validate zip input size
2013-03-08 19:21:06 +01:00
1d3beffacf
Cache: better rename hook for cache updater
2013-03-08 19:08:07 +01:00
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
f9c24a0368
5.0.0 RC3
2013-03-08 10:01:22 +01:00
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
8d26400cb5
remove some debug output; move code to the right function
2013-03-08 11:27:25 +01:00
6e5e8c6b46
Fix #2080 and fix #2141
2013-03-07 22:30:12 -05:00
4826564344
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05:00
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
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
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
a5cab28bea
Fix fetching source path of shared files
2013-03-07 11:12:59 -05:00
48bb53030c
distinguish between touch and write
2013-03-07 15:51:44 +01:00
ce9942331e
create a meanigful file name if files are from the root folder
2013-03-07 14:24:18 +01:00
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +01:00
4994eaace1
Allow to load splited config files ref #946
2013-03-06 23:30:16 +01:00
a68cbb00e0
Preserve Debug flag accross config writes
2013-03-06 21:05:13 +01:00
6acbadf418
return 403 when mkdir failed on webDAV, fixes #2127
2013-03-06 15:21:12 +01:00
cfb10dc58c
Add warning about sanitization
2013-03-06 13:05:22 +01:00
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
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
4dcbaa1d7b
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/appinfo/app.php
2013-03-05 21:54:32 -05:00
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
5da9223d1c
make getDisplayNames optional feature for Group Backends, fall back to internal names
2013-03-05 21:22:34 +01:00
ee0c38bb51
Fix group post_shared hook
2013-03-04 19:43:56 -05:00
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
d800f35bf4
Disable loading of backgroundjobs js when upgrade is needed
2013-03-03 23:15:22 +01:00
a2d6b27170
Check maintenance mode before loading apps in route matcher
2013-03-03 23:15:18 +01:00
71bdccf347
Chunk size comment should say kB, not MB
2013-03-03 12:03:26 -05:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
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
3e3c039292
Escape the data only in the template
2013-03-02 20:21:51 +01:00
050de008b1
Avoid to display empty DisplayNames for menu and title
2013-03-02 16:09:36 +01:00
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
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
2b7ff7273d
ownCloud 5 RC2
2013-03-02 04:06:27 +01:00
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
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
9d9acf24de
Cache: more efficient detection for existing entries during upgrade
2013-03-04 23:19:55 +01:00
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
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
6019cdd5bd
adding test case for getDefaultEmailAddress() + fixing #1844 again
2013-03-04 21:10:18 +01:00
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
a97006144e
Only send the standard headers
...
Fixes https://github.com/owncloud/apps/issues/675
2013-03-04 20:35:58 +01:00
8b09402b77
Fix #2074 by initializing as an array
2013-03-04 12:08:41 -05:00
c08a04bc83
VCategories: Don't forget to save category relations if category exists.
2013-03-04 17:05:08 +01:00
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
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
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
f7cb53b103
Merge pull request #2008 from owncloud/1999-requesttoken
...
Check if requesttoken exists in session
2013-03-01 06:12:09 -08:00
93f15215c6
Check if requesttoken exists in session
...
Ref #1999
2013-03-01 14:59:51 +01:00
630becb95f
Style fixes
2013-03-01 14:59:24 +01:00
09dc15d2b1
5.0 RC 1
2013-03-01 07:53:14 +01:00
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
b5989c933f
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-02-28 10:39:23 -05: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
8983465210
Correct parent folders' ETags for all users with access to a shared file
2013-02-26 01:21:48 -05: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
40efeb9187
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
2013-02-22 16:02:27 +01: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
2ed850e05b
merge master into filecache_mtime
2013-02-15 21:04:48 +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
5005195db0
create keypair for ownCloud with empty passphrase, will be used for public link shares
2013-02-13 17:57:45 +01:00
9356f9a6bf
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
2013-02-13 17:23:27 +01:00
4952dfe956
add post_unshare hook, also add public link shares to the list of user with access to a file
2013-02-13 14:56:39 +01: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
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
a692264fa4
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
2013-02-12 17:00:33 +01:00
b54dcd1999
Cache: fix scanner trying to use existing data when file isn't in cache
2013-02-12 16:48:21 +01:00
d1bbb30385
also find users with access to the file if a folder above the actual file was already shared
2013-02-12 16:48:04 +01:00
f2baf1ae0e
fixing syntax error
2013-02-12 16:18:48 +01:00
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
e1fe5279dd
Cache: also preserve etags for files
2013-02-12 14:56:57 +01:00
8eef919a75
take group shares into account if we retrieve the list a all recipients
2013-02-12 12:08:34 +01:00
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
Sam Tuke
Jörn Friedrich Dreyer
Arthur Schiwon
Robin Appelman
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
Jenkins for ownCloud
Thomas Tanghus
Bernhard Posselt
Björn Schießle
itheiss
Lukas Reschke
Valerio Ponte
VicDeo
Frank Karlitschek
Michael Gapczynski
Andreas Schönebeck
Olivier Tétard
Jan-Christoph Borchardt
Tom Needham
Brice Maron
herbrechtsmeier
Tom Needham
Björn Schießle
Bart Visscher
j-ed
icewind1991
Georg Ehrke
Qingping Hou