15dae6198f
Cache: add a backgroundjob to check for external changes to the filesystem
2013-04-20 16:38:03 +02:00
03c7a52bc5
[tx-robot] updated from transifex
2013-04-20 02:02:09 +02:00
0701d0019b
Merge pull request #3020 from owncloud/cleaner-webdav-reason
...
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
2013-04-19 07:56:41 -07:00
e1c5b31d65
Test if we want a 3rdparty style/script before checking the 3rdparty root
2013-04-19 16:09:39 +02:00
10be42f5b7
Cache: only look for child entires when doing a move operation when moving a folder
2013-04-19 15:06:48 +02:00
7ac49dd52a
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
2013-04-19 12:44:54 +02:00
4ccc9d896a
Merge pull request #3010 from owncloud/fix-cookie_path
...
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-19 01:17:35 -07:00
e09c17de5b
Added explanation
2013-04-18 22:29:50 +02:00
e4876c9117
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-18 21:11:58 +02:00
fe58e4b1a6
we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again
2013-04-18 17:48:16 +02:00
9facb67fab
Let autoloader resolve paths under apps lib directory.
2013-04-18 08:30:09 +02:00
cbd8b792d9
[tx-robot] updated from transifex
2013-04-18 02:09:28 +02:00
43d0f1fabf
Warn when we do an upgrade
2013-04-17 21:29:14 +02:00
3b2a0523f8
Merge pull request #2978 from owncloud/displayname_can_be_null
...
Remove not null constraint. Fix #2976
2013-04-17 07:47:17 -07:00
867a527148
Merge pull request #2975 from owncloud/log-date
...
use date and time instead of timestamp in log
2013-04-17 06:49:46 -07:00
44668b36a7
Remove not null constraint. Fix #2976
2013-04-17 14:08:45 +02:00
f7e29eabf2
fix admin log display and use a more readable format
2013-04-17 14:05:51 +02:00
8471340db9
use date and time instead of timestamp
2013-04-17 12:24:18 +02:00
ec280e6f9f
Merge pull request #2746 from owncloud/use-count-userexists
...
Use count SQL to check for user existance
2013-04-17 03:06:50 -07:00
eef1cf529e
additional safety checks
2013-04-17 10:41:07 +02:00
7611d218df
merge translations with those from theme
2013-04-17 10:34:29 +02:00
6a5f5ce157
merge translations with those from theme
2013-04-17 10:29:32 +02:00
f3c06ae4e4
Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
...
Handle empty datafolder better.
2013-04-17 00:44:14 -07:00
37868818ff
[tx-robot] updated from transifex
2013-04-17 02:29:17 +02:00
8a50459223
Fix OC_User::getDisplaynames when using numeric user id's
...
fixes #2948
2013-04-17 01:08:27 +02:00
2040f0af78
Merge pull request #2943 from owncloud/always_load_cache_hooks_first
...
always connect file cache updater hooks first
2013-04-16 12:21:09 -07:00
8d1db84ed1
Merge pull request #2887 from owncloud/l10n-caching
...
L10N: cache the result of findLanguage
2013-04-16 09:11:33 -07:00
606b672a3d
always connect file cache updater hooks first
2013-04-16 13:07:55 +02:00
d0b3e8aceb
[tx-robot] updated from transifex
2013-04-16 02:17:30 +02:00
2fa34d6772
Make FileCache upgrade more robust, fixes #2650
2013-04-15 11:56:30 +02:00
d759dca203
Handle empty datafolder better.
...
If datafolder is erased, the default value will be shown as a placeholder.
If installation is submitted without a datafolder the default value will be used.
2013-04-13 15:56:01 +02:00
8efd71099f
Merge pull request #2909 from owncloud/addHook
...
allow Storages to join MountPoint initialization
2013-04-13 05:19:27 -07:00
19afc216cf
[tx-robot] updated from transifex
2013-04-13 02:15:54 +02:00
e3b733f23d
allow Storages to join MountPoint initialization
2013-04-13 00:33:21 +02:00
33ee2e2f10
[tx-robot] updated from transifex
2013-04-12 02:11:02 +02:00
2180a4c420
-L10N: cache the result of findLanguage
2013-04-12 00:58:14 +02:00
121c8bd303
Merge pull request #2747 from owncloud/cache-contructed-cache-objects
...
Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Com...
2013-04-10 08:09:09 -07:00
526076f2e0
Merge pull request #2781 from owncloud/fix-2592
...
Correct undefined variable in post_shared hook, fixes #2592
2013-04-10 05:53:50 -07:00
258ad38fd3
Fix touch for creating new files
2013-04-10 13:48:24 +02:00
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
8db76ef7d2
Merge pull request #2147 from eMerzh/split_config
...
[OC6] Allow to load splited config files
2013-04-09 09:56:16 -07:00
352af6005f
Merge pull request #2801 from OpenLarry/patch-1
...
fixes #2679 - 5.0.3 Renaming -> Nothing happens
2013-04-09 03:40:40 -07:00
16b513e4dc
added correct check for gd and check for php-intl
2013-04-09 12:22:55 +02:00
6fc0319e1b
Merge pull request #2754 from owncloud/cookie-path
...
Just send the cookies in the ownCloud directory
2013-04-09 02:36:20 -07:00
8cd4cadb22
Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycontent
...
Add mimetype filter to getDirectoryContent function
2013-04-09 02:25:40 -07:00
2d489a94c6
Merge pull request #2797 from owncloud/fixing-2792-master
...
fixes #2792 - only touch if writable
2013-04-09 01:50:05 -07:00
5bb248efd6
Merge pull request #2764 from owncloud/remove-limit-from-count-query
...
Remove wrong limit parameter from count query in compatibility function
2013-04-09 00:19:09 -07:00
74f90eabe4
Merge pull request #2798 from owncloud/fixing-2789-master
...
fixes #2789 - no internet connectivity check if there is non on purpose
2013-04-09 00:18:13 -07:00
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
d51a94161e
Initialize collectionTypes variable as false
2013-04-08 17:46:52 -04:00
49313b334a
fixes #2679
2013-04-09 00:26:16 +03:00
89818e279b
Merge pull request #2785 from owncloud/vobject_stringproperty
...
Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
2013-04-08 14:23:38 -07:00
46722d8282
fixes #2789 - no internet connectivity check if there is non on purpose
2013-04-08 22:41:20 +02:00
a07a8794b8
Add mimetype filter to getDirectoryContent function
2013-04-08 22:40:03 +02:00
d069ee8a8b
fixes #2792 - only touch if writable
2013-04-08 22:22:49 +02:00
ae9548bc6e
Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
2013-04-08 14:57:43 +02:00
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
e704bcd96e
Correct undefined variable in post_shared hook, fixes #2592
2013-04-07 20:05:54 -04:00
a8b366e612
Merge pull request #2610 from owncloud/vcategories_purge_multi
...
Allow purging multiple objects from category index table.
2013-04-06 09:48:03 -07:00
142b020d38
Remove wrong limit parameter from count query in compatibility function
2013-04-06 17:58:47 +02:00
fa8214ecc9
Use the MDB2 function to get the count result
2013-04-06 15:38:30 +02:00
e91e8b1170
Merge pull request #2751 from Borkason/patch-1
...
Fix indentation in util.php.
2013-04-06 03:01:05 -07:00
fbffbe0170
Juse send the cookies in the ownCloud directory
2013-04-06 00:16:52 +02:00
6798b6dc34
[tx-robot] updated from transifex
2013-04-06 00:05:32 +02:00
d6253696cb
Fix indentation in util.php.
2013-04-05 21:49:57 +03:00
3213c47188
Use count SQL to check for user existance
2013-04-05 17:23:36 +02:00
50fb13c861
Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Common
2013-04-05 17:20:08 +02:00
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
f944ac9cba
Add a name to the version parameter
...
Without an additional name it's nearly impossible to write positive security model based rules since the parameter name isn't defined.
2013-04-05 00:33:05 +03:00
d048ff719d
Remove redundant line
2013-04-04 14:10:34 +02:00
52fba43297
Merge pull request #2708 from owncloud/dont_expose_installatio
...
Don't expose the server installation time
2013-04-04 00:48:55 -07:00
2f19629407
Merge pull request #2706 from owncloud/random_is_random_and_not_time
...
Use a more random source...
2013-04-04 00:48:21 -07:00
877ff9358f
Don't expose the server installation time
2013-04-04 01:33:18 +03:00
37cb79155e
*gnaaarf*
2013-04-04 01:27:13 +03:00
cbece8b12f
[tx-robot] updated from transifex
2013-04-04 00:06:51 +02:00
6645a54cac
Use random bytes instead of time
...
Thanks for the heads-up @VicDeo :-)
2013-04-04 01:05:44 +03:00
e75406e712
PostreSQL compatibility, fixes #2666
2013-04-03 23:56:59 +02:00
ba7c0cf548
Use a more random source...
2013-04-04 00:56:34 +03:00
7eef643600
Merge pull request #2594 from owncloud/fix_part_file_ignoring
...
Fix part file ignoring
2013-04-03 01:38:18 -07:00
10e37e1553
[tx-robot] updated from transifex
2013-04-03 00:04:02 +02:00
9e29d2845a
[tx-robot] updated from transifex
2013-04-01 00:04:02 +02:00
63804f4153
Change logQuery from define() to OC::Config
2013-03-30 22:36:55 +01:00
2b8cf4959a
Log Queries when we add a log query flag
2013-03-30 17:40:46 +01:00
73dd54c962
Don't try to call a an array :-P
2013-03-30 16:35:13 +01:00
3cbfacb439
Merge branch 'master' into files_encryption
2013-03-29 15:59:54 +01:00
66d7cc4c74
Merge pull request #2584 from mrtorrent/fix_instanceid_format
...
Fix instanceid format to prevent session loop
2013-03-29 07:26:07 -07:00
a56abd3f9b
Typehint and check $ids parameter.
2013-03-29 14:54:08 +01:00
ec980a8a25
Merge pull request #2585 from mrtorrent/fix_install_app_version_check
...
Fix install app version check
2013-03-29 05:38:58 -07:00
d838a3b33f
Allow purging multiple objects from category index table.
2013-03-29 05:51:41 +01:00
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
Robin Appelman
Jenkins for ownCloud
Bart Visscher
Thomas Tanghus
Björn Schießle
Brice Maron
Bernhard Posselt
Morris Jobke
AndreasErgenzinger
Michael Gapczynski
Jörn Friedrich Dreyer
Arthur Schiwon
kondou
Frank Karlitschek
Björn Schießle
OpenLarry
Lukas Reschke
Birk Borkason
Sam Tuke
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
itheiss
Valerio Ponte
VicDeo
Andreas Schönebeck
Olivier Tétard
Jan-Christoph Borchardt
Tom Needham
herbrechtsmeier
Tom Needham
j-ed
icewind1991