Commit graph

3781 commits

Author SHA1 Message Date
Florian Scholz
03aa86d8a6 - xframe restriction configurable now 2013-04-24 14:45:40 +02:00
Robin Appelman
b31dc10c3c Add support for the old public backgroundjob api 2013-04-24 14:40:49 +02:00
Robin Appelman
117412272e Update documentation for \OCP\BackgroundJob 2013-04-24 14:24:28 +02:00
Bernhard Posselt
a8075943c3 use variable instead of relative path to file 2013-04-24 14:17:52 +02:00
Bernhard Posselt
b98b56e4a8 check if there is a default/ folder in the theme directory if no theme exists 2013-04-24 13:45:40 +02:00
Morris Jobke
b1c9b296e8 Merge pull request #3089 from guruz/fix_ugly_config_writeability_error
Fix ugly error style on install
2013-04-24 02:24:23 -07:00
Tom Needham
7eb6cc62f8 Make class properties protected instead of private to allow subclassing 2013-04-23 23:03:39 +01:00
Thomas Mueller
d209cac2a1 lastRun is not a method 2013-04-23 23:46:56 +02:00
Florin Peter
25ff32db6b Added post proxy for getFileInfo.
This is needed for WebDAV and FileSize
@samtuke and @schiesbn you guys know a better solution?
2013-04-23 22:20:31 +02:00
Bernhard Posselt
9dde43db57 Merge pull request #3080 from owncloud/validate_redirect_mast
Disallow URLs containing a @
2013-04-23 12:21:39 -07:00
Lukas Reschke
495868497c Merge pull request #3077 from owncloud/rename-checksourcepath
Files: also check if the source path is valid when doing a rename or copy operation
2013-04-23 07:17:36 -07:00
Sam Tuke
4aa80d02be Merge branch 'master' into files_encryption 2013-04-23 14:13:40 +02:00
Markus Goetz
f1a63254fb Fix ugly error style on install
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
2013-04-23 11:06:28 +02:00
Jenkins for ownCloud
05ab9d2de7 [tx-robot] updated from transifex 2013-04-23 02:00:31 +02:00
Bernhard Posselt
edd37c779d Merge pull request #3074 from owncloud/sqlite3-raiseerror
Fix raiseError call in the MDB2 sqlite3 driver
2013-04-22 14:34:09 -07:00
Lukas Reschke
6e78c4fcc0 Disallow URLs containing a @ 2013-04-23 00:26:40 +03:00
Bernhard Posselt
4af4a5bd98 Merge pull request #3073 from owncloud/setup-error-message
Improve error message if user creation fails during setup
2013-04-22 13:28:18 -07:00
Robin Appelman
3c90625ef1 Files: also check if the source path is valid when doing a rename or copy operation 2013-04-22 21:23:12 +02:00
Bart Visscher
2314067e75 Merge pull request #3019 from owncloud/fix-3004
Test if we want a 3rdparty style/script before checking the 3rdparty root
2013-04-22 20:46:13 +02:00
Robin Appelman
7c1a4d2f57 Fix raiseError call in the MDB2 sqlite3 driver 2013-04-22 20:34:00 +02:00
Robin Appelman
5942d5aeac Improve error message if user creation fails during setup 2013-04-22 20:32:40 +02:00
Robin Appelman
e63633b5f3 Don't try to use backgroundjobs before the installtion is done 2013-04-22 20:23:23 +02:00
Björn Schießle
b5cb5dab51 fix encryption to owncloud user for public link shares 2013-04-22 14:30:10 +02:00
Björn Schießle
b24a673714 the owner uid is not interesting. We want to get all users who have access to the given item source, no matter from whom it was shared 2013-04-22 14:12:18 +02:00
Jenkins for ownCloud
f6808617b3 [tx-robot] updated from transifex 2013-04-22 02:00:20 +02:00
Robin Appelman
40de36a8f3 Try to supress pre-upgrade backgroundjob error 2013-04-21 00:58:15 +02:00
Robin Appelman
07f510692c Ensure we don't throw an exception before we can upgrade to the new backgroundjob system 2013-04-21 00:08:55 +02:00
Robin Appelman
db0ea9780b Add database table for backgroundjob 2013-04-21 00:04:58 +02:00
Robin Appelman
7948341a86 Rework background job system 2013-04-20 23:27:46 +02:00
Robin Appelman
eed5e9f804 Cache: check one folder and one file each time the backgroundwatcher runs
Because there are usually way less folders than files it walks trought the list of all folder quicker, this causes new files to be detected quicker
2013-04-20 16:57:53 +02:00
Robin Appelman
15dae6198f Cache: add a backgroundjob to check for external changes to the filesystem 2013-04-20 16:38:03 +02:00
Jenkins for ownCloud
03c7a52bc5 [tx-robot] updated from transifex 2013-04-20 02:02:09 +02:00
Bart Visscher
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
Bart Visscher
e1c5b31d65 Test if we want a 3rdparty style/script before checking the 3rdparty root 2013-04-19 16:09:39 +02:00
Robin Appelman
10be42f5b7 Cache: only look for child entires when doing a move operation when moving a folder 2013-04-19 15:06:48 +02:00
Bart Visscher
7ac49dd52a Cleaner isWebDAVWorking reason, otherwise people overlook the reason 2013-04-19 12:44:54 +02:00
Thomas Tanghus
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
Thomas Tanghus
e09c17de5b Added explanation 2013-04-18 22:29:50 +02:00
Bart Visscher
e4876c9117 Don't use empty session.cookie_path, otherwise we get multiple cookies 2013-04-18 21:11:58 +02:00
Björn Schießle
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
Thomas Tanghus
9facb67fab Let autoloader resolve paths under apps lib directory. 2013-04-18 08:30:09 +02:00
Jenkins for ownCloud
cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02:00
Brice Maron
43d0f1fabf Warn when we do an upgrade 2013-04-17 21:29:14 +02:00
Bernhard Posselt
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
Morris Jobke
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
Thomas Tanghus
44668b36a7 Remove not null constraint. Fix #2976 2013-04-17 14:08:45 +02:00
Bernhard Posselt
f7e29eabf2 fix admin log display and use a more readable format 2013-04-17 14:05:51 +02:00
Bernhard Posselt
8471340db9 use date and time instead of timestamp 2013-04-17 12:24:18 +02:00
Thomas Tanghus
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
AndreasErgenzinger
eef1cf529e additional safety checks 2013-04-17 10:41:07 +02:00
AndreasErgenzinger
7611d218df merge translations with those from theme 2013-04-17 10:34:29 +02:00
AndreasErgenzinger
6a5f5ce157 merge translations with those from theme 2013-04-17 10:29:32 +02:00
Bart Visscher
f3c06ae4e4 Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
Handle empty datafolder better.
2013-04-17 00:44:14 -07:00
Jenkins for ownCloud
37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
Robin Appelman
8a50459223 Fix OC_User::getDisplaynames when using numeric user id's
fixes #2948
2013-04-17 01:08:27 +02:00
Michael Gapczynski
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
Bart Visscher
8d1db84ed1 Merge pull request #2887 from owncloud/l10n-caching
L10N: cache the result of findLanguage
2013-04-16 09:11:33 -07:00
Jörn Friedrich Dreyer
606b672a3d always connect file cache updater hooks first 2013-04-16 13:07:55 +02:00
Jenkins for ownCloud
d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Arthur Schiwon
2fa34d6772 Make FileCache upgrade more robust, fixes #2650 2013-04-15 11:56:30 +02:00
kondou
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
Frank Karlitschek
8efd71099f Merge pull request #2909 from owncloud/addHook
allow Storages to join MountPoint initialization
2013-04-13 05:19:27 -07:00
Jenkins for ownCloud
19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Arthur Schiwon
e3b733f23d allow Storages to join MountPoint initialization 2013-04-13 00:33:21 +02:00
Jenkins for ownCloud
33ee2e2f10 [tx-robot] updated from transifex 2013-04-12 02:11:02 +02:00
Robin Appelman
2180a4c420 -L10N: cache the result of findLanguage 2013-04-12 00:58:14 +02:00
Jörn Friedrich Dreyer
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
Bernhard Posselt
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
Robin Appelman
258ad38fd3 Fix touch for creating new files 2013-04-10 13:48:24 +02:00
Jenkins for ownCloud
c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
eMerzh
8db76ef7d2 Merge pull request #2147 from eMerzh/split_config
[OC6] Allow to load splited config files
2013-04-09 09:56:16 -07:00
Bernhard Posselt
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
Bernhard Posselt
16b513e4dc added correct check for gd and check for php-intl 2013-04-09 12:22:55 +02:00
Bernhard Posselt
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
Bernhard Posselt
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
Björn Schießle
2d489a94c6 Merge pull request #2797 from owncloud/fixing-2792-master
fixes #2792 - only touch if writable
2013-04-09 01:50:05 -07:00
Bernhard Posselt
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
Bernhard Posselt
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
Jenkins for ownCloud
5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
Michael Gapczynski
d51a94161e Initialize collectionTypes variable as false 2013-04-08 17:46:52 -04:00
OpenLarry
49313b334a fixes #2679 2013-04-09 00:26:16 +03:00
Thomas Müller
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
Thomas Mueller
46722d8282 fixes #2789 - no internet connectivity check if there is non on purpose 2013-04-08 22:41:20 +02:00
Bart Visscher
a07a8794b8 Add mimetype filter to getDirectoryContent function 2013-04-08 22:40:03 +02:00
Thomas Mueller
d069ee8a8b fixes #2792 - only touch if writable 2013-04-08 22:22:49 +02:00
Thomas Tanghus
ae9548bc6e Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762 2013-04-08 14:57:43 +02:00
Jenkins for ownCloud
ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Michael Gapczynski
e704bcd96e Correct undefined variable in post_shared hook, fixes #2592 2013-04-07 20:05:54 -04:00
Bart Visscher
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
Bart Visscher
142b020d38 Remove wrong limit parameter from count query in compatibility function 2013-04-06 17:58:47 +02:00
Bart Visscher
fa8214ecc9 Use the MDB2 function to get the count result 2013-04-06 15:38:30 +02:00
Frank Karlitschek
e91e8b1170 Merge pull request #2751 from Borkason/patch-1
Fix indentation in util.php.
2013-04-06 03:01:05 -07:00
Lukas Reschke
fbffbe0170 Juse send the cookies in the ownCloud directory 2013-04-06 00:16:52 +02:00
Jenkins for ownCloud
6798b6dc34 [tx-robot] updated from transifex 2013-04-06 00:05:32 +02:00
Birk Borkason
d6253696cb Fix indentation in util.php. 2013-04-05 21:49:57 +03:00
Bart Visscher
3213c47188 Use count SQL to check for user existance 2013-04-05 17:23:36 +02:00
Bart Visscher
50fb13c861 Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Common 2013-04-05 17:20:08 +02:00
Jenkins for ownCloud
c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Lukas Reschke
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
Thomas Tanghus
d048ff719d Remove redundant line 2013-04-04 14:10:34 +02:00
Bart Visscher
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
Bart Visscher
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
Lukas Reschke
877ff9358f Don't expose the server installation time 2013-04-04 01:33:18 +03:00
Lukas Reschke
37cb79155e *gnaaarf* 2013-04-04 01:27:13 +03:00
Jenkins for ownCloud
cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Lukas Reschke
6645a54cac Use random bytes instead of time
Thanks for the heads-up @VicDeo :-)
2013-04-04 01:05:44 +03:00
Arthur Schiwon
e75406e712 PostreSQL compatibility, fixes #2666 2013-04-03 23:56:59 +02:00
Lukas Reschke
ba7c0cf548 Use a more random source... 2013-04-04 00:56:34 +03:00
Jörn Friedrich Dreyer
7eef643600 Merge pull request #2594 from owncloud/fix_part_file_ignoring
Fix part file ignoring
2013-04-03 01:38:18 -07:00
Jenkins for ownCloud
10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Jenkins for ownCloud
9e29d2845a [tx-robot] updated from transifex 2013-04-01 00:04:02 +02:00
Brice Maron
63804f4153 Change logQuery from define() to OC::Config 2013-03-30 22:36:55 +01:00
Brice Maron
2b8cf4959a Log Queries when we add a log query flag 2013-03-30 17:40:46 +01:00
Thomas Tanghus
73dd54c962 Don't try to call a an array :-P 2013-03-30 16:35:13 +01:00
Sam Tuke
3cbfacb439 Merge branch 'master' into files_encryption 2013-03-29 15:59:54 +01:00
Bernhard Posselt
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
Thomas Tanghus
a56abd3f9b Typehint and check $ids parameter. 2013-03-29 14:54:08 +01:00
Bart Visscher
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
Thomas Tanghus
d838a3b33f Allow purging multiple objects from category index table. 2013-03-29 05:51:41 +01:00
Sam Tuke
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
Jörn Friedrich Dreyer
aa103bd5b3 supress write hook for .part files 2013-03-28 12:15:27 +01:00
Jörn Friedrich Dreyer
4a70315ad1 ignore files in scanFile instead of scan to catch all occurences. 2013-03-28 12:15:27 +01:00
Arthur Schiwon
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
Arthur Schiwon
3d29a82150 Cache: Do not overwrite ETag when file did not change 2013-03-27 19:19:40 +01:00
Arthur Schiwon
2a2d409733 Only prepare an SQL statement once. 2013-03-27 19:19:16 +01:00
Arthur Schiwon
1d676fb0e6 Add PHPDoc 2013-03-27 19:18:58 +01:00
Arthur Schiwon
d9e07ca60a Adjust to Icewind's fix 2013-03-27 19:18:34 +01:00
Robin Appelman
1a874b9106 Cache: fix property path for getting legacy etag 2013-03-27 19:18:13 +01:00
Robin Appelman
19c7d9c3dc Port Icewind's fix I 2013-03-27 19:17:49 +01:00
Arthur Schiwon
5fc276602a Change LIMIT in DB query respectively remove where not necessary 2013-03-27 19:13:14 +01:00
Arthur Schiwon
e2afd0cb42 Upgrade FileCache on ownCloud upgrade for all users with files 2013-03-27 19:12:28 +01:00
Arthur Schiwon
9d25058905 Performance: prepare queries only once 2013-03-27 19:12:04 +01:00
Arthur Schiwon
7839ec5093 Fix lost ETag on Cache Upgrade 2013-03-27 19:11:35 +01:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
8dd7fa8507 Use isAppVersionCompatible in app installer 2013-03-27 10:16:05 +00:00
Jenkins for ownCloud
0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
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
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
53fd122b89 Minor typo, coding style fixes for OC_Util::getInstanceId 2013-03-26 21:48:49 +00:00
Thomas Tanghus
74852243e2 Merge pull request #2567 from owncloud/fix_insertIfNotExist
Properly prepare insertIfNotExist queries.
2013-03-26 08:59:10 -07:00
Bernhard Posselt
d49e8ffb5e Merge pull request #2568 from itheiss/master
Implement setting custom domainname for getDefaultEmailAddress
2013-03-26 02:50:11 -07:00
Björn Schießle
d16dd1ad2a listen to touch hook to update the mtime after sync 2013-03-26 09:42:55 +01:00
Thomas Tanghus
5b66b317b1 And removing an irrelevant comment ;) 2013-03-26 01:01:38 +01:00
Thomas Tanghus
5f53145eb0 Double quotes to backticks 2013-03-26 01:00:15 +01:00
Thomas Tanghus
9d618005b6 Missing backticks. Thx @Raydiation :) 2013-03-26 00:24:08 +01:00
Thomas Tanghus
5e81016392 D'oh, why concatenate static strings. 2013-03-26 00:21:57 +01:00
Thomas Tanghus
07236800a7 Quote key for SQLite. 2013-03-26 00:19:23 +01:00
Thomas Tanghus
1c3f5ba6ef Properly prepare insertIfNotExist queries. 2013-03-25 23:59:34 +01:00
Robin Appelman
0e55b61169 Improve phpdoc for the filecache 2013-03-24 02:06:50 +01:00
Bernhard Posselt
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
Bernhard Posselt
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
Robin Appelman
6326a3a9f7 Some improvements for the Storage phpdoc 2013-03-23 00:10:30 +01:00
itheiss
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
Robin Appelman
e5f8acf4c0 Add phpdoc documentation to the Storage interface 2013-03-21 13:11:52 +01:00
Lukas Reschke
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
Valerio Ponte
033c94d076 fixed xsendfile zip generation race condition 2013-03-20 22:37:02 +01:00
VicDeo
3e9ea6d13b Remove space before parethesis 2013-03-20 16:54:06 +04:00
Thomas Mueller
268d4a525d some more test cases & fix on file name generation with index 2013-03-19 16:57:54 +01:00
Thomas Mueller
0fff3c9698 adding extension to slugified physical path 2013-03-19 16:53:37 +01:00
Bernhard Posselt
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
Bernhard Posselt
8858960a19 Merge pull request #2451 from owncloud/fix_npe_master
fix npe when createStorage() returns null
2013-03-19 07:28:59 -07:00
Jörn Friedrich Dreyer
39665cfa6b fix npe when createStorage() returns null 2013-03-19 15:02:29 +01:00
Thomas Mueller
9dd3dcc5cd Merge branch 'master' into fixing-windows-datadir-master 2013-03-19 14:43:55 +01:00
VicDeo
c3a64012d8 Remove leading and trailing backslashes in classname. Ref #2310 2013-03-19 16:40:52 +03:00
Thomas Mueller
86c819bbe8 more accurate safe_mode check - refs #2258 2013-03-19 14:36:52 +01:00
Frank Karlitschek
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
Thomas Mueller
7a2396208f using rtrim 2013-03-19 13:37:48 +01:00
Thomas Tanghus
57f2884efa Add hashed version parameter to js and css. Ref #1520 and many more ;) 2013-03-19 12:35:31 +01:00
Thomas Tanghus
f052846914 Add indexes and primary keys. 2013-03-19 01:38:40 +01:00
Thomas Tanghus
935d2169c8 Revert "Add indexes and primary keys."
This reverts commit 3b33712dc9.
2013-03-19 01:36:51 +01:00
Thomas Tanghus
3b33712dc9 Add indexes and primary keys. 2013-03-19 01:35:12 +01:00
Jenkins for ownCloud
63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Bernhard Posselt
5b1f857907 Merge pull request #2363 from owncloud/uploadsize
Improve behaviour when max upload size is unknown
2013-03-18 08:18:27 -07:00
Frank Karlitschek
63336f2acb remove deprecated call 2013-03-17 22:05:45 +01:00
Frank Karlitschek
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
Jenkins for ownCloud
1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
Bernhard Posselt
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
Michael Gapczynski
c69dc3483a Add error handling to the file cache upgrade 2013-03-16 14:28:42 -04:00
Robin Appelman
8a97afac6f Don't show storage space warning when the free space can't be determined 2013-03-15 16:46:20 +01:00
Robin Appelman
319e3f162c Don't block uploads if the max upload size is unknown 2013-03-15 16:40:36 +01:00
Robin Appelman
32b8fd8fb7 Improve handeling of unlimited max upload size 2013-03-15 16:31:35 +01:00
Andreas Schönebeck
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
Jenkins for ownCloud
0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Robin Appelman
ed83597371 Return unknown freespace if the free_space call failed
Fixes #2312
2013-03-14 17:00:30 +01:00
Björn Schießle
abe408e934 replace \MDB with \OC_DB, approved in #2278 2013-03-14 14:59:12 +01:00
Jenkins for ownCloud
9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Olivier Tétard
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
Thomas Müller
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
Thomas Müller
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
Jan-Christoph Borchardt
68a7b53e03 Merge pull request #2145 from eMerzh/preserve_debug
Preserve Debug flag accross config writes
2013-03-12 10:26:01 -07:00
Thomas Mueller
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
Thomas Mueller
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
Thomas Mueller
a05820c659 fixing various filesystem/storage unit tests on windows
fixing copy operation on mapper
2013-03-12 15:30:10 +01:00
Thomas Mueller
eedbebd40e adding //IGNORE to iconv to prevent nasty php warnings 2013-03-12 09:26:21 +01:00
Thomas Mueller
06992fec6d slug generates uniqid in case the file/folder name contains not one single valid character 2013-03-12 09:24:58 +01:00
Thomas Mueller
0900301668 indexed slug should be created based on logic path 2013-03-12 09:15:53 +01:00
Thomas Mueller
2fe56b8969 fixes #2081 2013-03-12 09:14:05 +01:00
Jenkins for ownCloud
569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Tom Needham
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
Jenkins for ownCloud
6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Brice Maron
d5da94acbc Small perf improvement : filter before sort 2013-03-09 21:41:59 +01:00
Frank Karlitschek
e6c2a91781 this is now 6.0 pre alpha 2013-03-09 20:19:34 +01:00
Frank Karlitschek
256595e7b2 5.0.0 2013-03-09 18:51:02 +01:00
Lukas Reschke
3ae70ab162 Check if username is valid and remove slashes from filename 2013-03-11 16:21:26 +01:00
Bernhard Posselt
1e20067c00 Merge pull request #2183 from owncloud/fix-shared-statuses-again
Fix #2080 and fix #2141
2013-03-11 02:43:16 -07:00
Bernhard Posselt
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
Bernhard Posselt
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
Lukas Reschke
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
Michael Gapczynski
8a5946fadc Fix variable for mounting for all users, fix #357 2013-03-09 21:09:31 -05:00
Robin Appelman
be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Valerio Ponte
99c873ea29 fixed typo that broke xsendfile 2013-03-09 15:35:36 +01:00
Arthur Schiwon
988a67fc9a remove remaining br-tags that do not belong here 2013-03-09 13:45:37 +01:00
herbrechtsmeier
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
herbrechtsmeier
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
Tom Needham
e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud
0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Michael Gapczynski
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
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