Thomas Müller
3c6b205e37
Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master
...
fixing UNIX_TIMESTAMP() for mssql
2013-07-17 13:57:43 -07:00
Markus Goetz
3fd4ff79ee
Merge pull request #4042 from guruz/webdav_auth_check_existing
...
WebDAV Auth Connector: Check if already logged in
2013-07-17 05:00:59 -07:00
Markus Goetz
bf7514f76a
WebDAV Auth Connector: Check if already logged in
2013-07-17 13:51:15 +02:00
Thomas Mueller
24283425a6
fixing UNIX_TIMESTAMP() for mssql
2013-07-17 13:18:46 +02:00
Bart Visscher
5b60fad467
Display the exception error backtrace preformatted
2013-07-16 22:42:09 +02:00
Bart Visscher
971a3fd124
Early errors (in base.php) don't have session available
2013-07-16 22:37:32 +02:00
Bart Visscher
49fca86f3c
Cleanup error generation in base.php
2013-07-16 22:36:39 +02:00
Bart Visscher
7d86e262e1
Use autoloader for Patchwork/PHP/Shim/Normalizer
2013-07-16 22:32:04 +02:00
Jakob Sack
fb97600091
Fix an error jenkins found
2013-07-16 22:27:55 +02:00
icewind1991
e09ffb6f57
Merge pull request #2395 from owncloud/cache
...
Seperate the memory based cache and file based cache in OC_Cache
2013-07-16 13:25:07 -07:00
Jakob Sack
bb0c5bff5f
Add multiple plural forms to the php part
2013-07-16 22:16:53 +02:00
Bart Visscher
285f288cf3
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
...
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
Robin Appelman
dc1a17b6f4
memcache: also switch factory to prefix
2013-07-16 16:08:37 +02:00
Robin Appelman
504089940d
mamcache: implement the ArrayAccess interface
2013-07-16 16:06:00 +02:00
Robin Appelman
69048ab71f
memchache: use prefix string instead of global flag
2013-07-16 15:42:40 +02:00
Robin Appelman
d82c1dfcab
split out memcache factory from base class
2013-07-16 15:34:22 +02:00
Robin Appelman
0ae8eb4f5e
Merge branch 'master' into cache
2013-07-16 15:22:47 +02:00
VicDeo
feb01847e7
Merge pull request #4076 from owncloud/fix_typos_kondou
...
Fix some typos
2013-07-16 01:23:16 -07:00
kondou
d9c697534d
Fix some typos
2013-07-16 06:01:26 +02:00
Bart Visscher
1a2db491af
Merge pull request #3962 from owncloud/move-error-handlers
...
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-15 09:23:37 -07:00
Georg Ehrke
63791e2d8d
return empty array instead of 0
2013-07-15 16:58:30 +02:00
Thomas Müller
6f5b0af67f
Merge pull request #3487 from owncloud/basic_auth_hack
...
Basic Auth is broken - again...
2013-07-14 14:56:45 -07:00
kondou
0d604a6c9a
Include $defaults
2013-07-13 18:44:36 +02:00
Bart Visscher
5549c77ec5
Merge branch 'master' into doctrine
...
Conflicts:
3rdparty
lib/db.php
lib/setup.php
tests/lib/db.php
tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
Thomas Müller
24b4806af4
Merge branch 'master' into googledrive
2013-07-12 09:43:04 +02:00
icewind1991
3abe68176f
Merge pull request #3270 from owncloud/convert-oc_config
...
Convert OC_Config to object so it can be used for DI
2013-07-11 18:21:08 -07:00
Jan-Christoph Borchardt
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
Thomas Müller
d18bd17eb7
- eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
...
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
2013-07-11 00:27:21 +02:00
icewind1991
d134ba9a82
Merge pull request #3978 from owncloud/forwarding-emitter
...
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
Morris Jobke
e2a5af4b9e
Merge pull request #3985 from owncloud/cookie-past2
...
apply @LukasReschke's cookie changes, hopefully finally fix #854
2013-07-10 09:08:01 -07:00
Robin Appelman
63df8f3500
reneme id to gid
2013-07-10 17:52:34 +02:00
Jörn Friedrich Dreyer
6a50848a6e
Merge pull request #3994 from owncloud/fix_oracle_setup
...
General setup fixes for Oracle
2013-07-10 01:02:52 -07:00
Jenkins for ownCloud
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
Robin Appelman
065bc96b02
more consistent naming
2013-07-10 02:17:24 +02:00
Robin Appelman
db14775536
consistent naming
2013-07-10 02:09:42 +02:00
Robin Appelman
4de5e292e5
search parameter is not optional
2013-07-10 02:01:34 +02:00
Robin Appelman
cc2818ba13
more consitency in hook names
2013-07-10 01:59:59 +02:00
Robin Appelman
c2bff656ff
cant use private members from closure in php <5.4
2013-07-10 01:55:38 +02:00
Robin Appelman
912b151561
use new group api as backend for the old api
2013-07-10 00:07:46 +02:00
Robin Appelman
a735105a22
update group management
2013-07-10 00:06:22 +02:00
Victor Dubiniuk
194ab11322
General fixes
2013-07-10 00:49:05 +03:00
mvn23
40879c6327
Merge pull request #3787 from mvn23/patch-1
...
Thanks @bartv2 and @bantu, merged and closed.
2013-07-09 08:21:07 -07:00
Thomas Tanghus
9e9c323acd
Set path in cookie.
2013-07-09 16:46:35 +02:00
Victor Dubiniuk
5a3fce12a4
Implement encodePath
2013-07-09 17:46:11 +03:00
Jan-Christoph Borchardt
d70d4f435e
apply @LukasReschke's cookie changes, hopefully finally fix #854
2013-07-09 15:00:36 +02:00
Michael Gapczynski
4feff3456b
Only emit permissions hook for files and and include path
2013-07-08 17:28:18 -04:00
icewind1991
af1c3dd4ce
Merge pull request #3963 from owncloud/update-logic-split
...
Move the upgrade logic to \OC\Updater
2013-07-08 12:38:39 -07:00
Robin Appelman
a0d5ba1167
fix typo
2013-07-08 21:13:31 +02:00
Bart Visscher
e7b882a4fc
stupid namespace
2013-07-08 18:29:43 +02:00
Bart Visscher
4a6803ef9d
Check if logger is set, also no need to return true
2013-07-08 18:26:11 +02:00
Bart Visscher
abe9abab99
Add constructor documentation
2013-07-08 18:01:32 +02:00
Bart Visscher
52553c64ed
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-08 17:59:50 +02:00
Michael Gapczynski
5c2a0325ba
Add update permissions hook to sharing
2013-07-08 11:40:10 -04:00
Robin Appelman
4a4e139c83
forward previously registerd hooks
2013-07-08 16:54:26 +02:00
Robin Appelman
925d09cb0e
add forwarding emitter for agregating multiple emitters
2013-07-08 16:45:19 +02:00
Thomas Müller
02d2e41e04
Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
...
fix insertIfNotExist return value, update doc and corresponding test
2013-07-08 07:17:45 -07:00
Thomas Müller
0365d244e0
Merge pull request #3946 from owncloud/fixing-3942-master
...
handle anonymous upload to reshared folder
2013-07-08 02:27:21 -07:00
Björn Schießle
9b9ea7cd8e
Merge https://github.com/owncloud/core/pull/3827
...
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
2013-07-08 10:07:57 +02:00
Jenkins for ownCloud
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
Jakob Sack
560839195e
make l10n libs capable of handling plural translations
2013-07-07 20:06:14 +02:00
Robin Appelman
9cd7ecd502
Updater: pass update url as argument to update check
2013-07-06 17:05:38 +02:00
Robin Appelman
58f473d734
split upgrade logic from ajax file
2013-07-06 17:00:00 +02:00
Jenkins for ownCloud
c8ad3df1fa
[tx-robot] updated from transifex
2013-07-06 02:08:38 +02:00
Thomas Müller
98da4bf704
removing unused getSharedItem()
2013-07-06 00:04:01 +02:00
Thomas Müller
dad91c156f
Merge branch 'master' into fixing-3942-master
...
Conflicts:
apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
Thomas Müller
bc1c776642
Merge pull request #3951 from owncloud/fixing-3936-master
...
get the real physical folder name for anonymous upload
2013-07-05 14:43:47 -07:00
Bart Visscher
ab2037ab5d
Only change integer type when the length is set
2013-07-05 22:05:16 +02:00
Bart Visscher
b8a7e97301
Add comment to column definition
2013-07-05 21:42:37 +02:00
Bart Visscher
2db839c4d3
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-05 19:28:10 +02:00
Thomas Müller
e159cbf527
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
2013-07-05 17:39:41 +02:00
Thomas Müller
f8dae11a23
Merge pull request #3957 from owncloud/config-glob-fail
...
OC_Config: handle failure of glob('*.config.php')
2013-07-05 07:38:04 -07:00
Jörn Friedrich Dreyer
212ea0508d
update comment
2013-07-05 15:39:57 +02:00
Bart Visscher
22c29eb64b
Fix renaming using parenthesis
2013-07-05 15:38:09 +02:00
Robin Appelman
c1cf829b9d
OC_Config: handle failure of glob('*.config.php')
2013-07-05 15:07:15 +02:00
Jörn Friedrich Dreyer
00987feda1
fix insertIfNotExist return value, update doc and corresponding test
2013-07-05 14:05:42 +02:00
Thomas Müller
352c1415be
proper fix for getting the shared item if no user is logged in
2013-07-05 13:45:21 +02:00
Bart Visscher
424ec94680
Make buildNotExistingFileName testable and write unittests
2013-07-05 13:03:01 +02:00
Jenkins for ownCloud
955646c461
[tx-robot] updated from transifex
2013-07-05 02:21:23 +02:00
Bart Visscher
ad9458e85d
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-04 18:23:47 +02:00
Björn Schießle
3c1308fb6d
eddition string should be empty by default
2013-07-04 10:12:07 +02:00
Björn Schießle
6cfa016c39
add public api
2013-07-04 10:11:55 +02:00
Björn Schießle
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
Bart Visscher
20be58bfdc
Merge pull request #3888 from owncloud/ocs_api_fixes
...
Ocs api fixes
2013-07-03 12:33:04 -07:00
Thomas Mueller
32d69f6889
Merge branch 'master' into convert-oc_config
2013-07-03 17:03:47 +02:00
kondou
aa7d8edd14
Suppress warning in setup if config doesn't exist
2013-07-03 16:00:23 +02:00
Björn Schießle
690323092e
don't run hooks for .part files
2013-07-03 10:11:50 +02:00
Björn Schießle
04e4d9580f
if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal
2013-07-03 10:11:37 +02:00
Björn Schießle
4d4484fac1
Merge pull request #3870 from owncloud/reset_migration_status
...
introduce pre-disable-app hook and first usage in files_encryption
2013-07-02 07:26:48 -07:00
Thomas Müller
e789e05675
on unit test use @expectedException
...
some phpdoc added
2013-07-02 00:15:42 +02:00
Thomas Müller
fbdf46b76e
Merge pull request #3748 from owncloud/fixing-3740-master
...
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
2013-07-01 15:08:08 -07:00
Thomas Müller
7d7a2ce317
use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
2013-07-01 23:51:43 +02:00
Thomas Müller
bb07dde988
Merge branch 'master' into convert-oc_config
2013-07-01 23:43:00 +02:00
Thomas Müller
c777026506
Merge pull request #3775 from owncloud/test_fixes_for_dbschema
...
use executeAudited, add table name to assert message, skip schema changi...
2013-07-01 14:38:28 -07:00
Thomas Müller
bf901eb52f
Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
...
remove unnecessary try catch blocks
2013-07-01 14:37:09 -07:00
Björn Schießle
cb5811bcf5
backport from pull request #3863
2013-07-01 11:12:18 +02:00
Björn Schießle
d8b3aee24e
set default logo claim to ''
2013-07-01 10:48:26 +02:00
Björn Schießle
d97d00fe0f
add logo claim to defaults.php
2013-07-01 10:48:13 +02:00
Björn Schießle
f622f35a1a
make mail footer aware of different themes
...
Conflicts:
lib/mail.php
2013-07-01 10:47:44 +02:00
Björn Schießle
68369ebb86
remove unneeded if condition
2013-07-01 10:46:49 +02:00
Björn Schießle
996b1e80c6
lib/defaults.php should only contain the default strings and read the other strings directly from the theme
2013-07-01 10:46:27 +02:00
Björn Schießle
23cc69b816
construct the foother in defaults.php so that we use always the same footer
...
Conflicts:
settings/templates/admin.php
2013-07-01 10:46:00 +02:00
Thomas Müller
121d3904c9
Merge pull request #3852 from owncloud/fixing-3830-master
...
session life time is now configurable and set to the same value
2013-06-30 14:41:51 -07:00
Robin Appelman
93750d2658
improved copy operation for objecttree
2013-06-30 19:41:38 +02:00
Robin Appelman
fe0de5fc10
improved move operation for sabre's objecttree
2013-06-30 18:37:47 +02:00
Robin Appelman
4e55d0ef9b
make use of the fact that rmdir is already recursive
2013-06-30 18:37:47 +02:00
Robin Appelman
2d1c6ae726
overwrite Sabre_DAV_ObjectTree with a faster getNodeForPath
2013-06-30 18:37:46 +02:00
Thomas Müller
8beec2015a
Merge pull request #3763 from owncloud/recursive-rmdir
...
Make rmdir recursive for local storage
2013-06-30 09:16:32 -07:00
Robin Appelman
d051d6f925
make rmdir recursive for mappellocal storage backend
2013-06-30 17:44:49 +02:00
Jenkins for ownCloud
4d74e8955f
[tx-robot] updated from transifex
2013-06-30 02:13:07 +02:00
Bart Visscher
60eb63e35a
Fix review items
2013-06-29 21:15:06 +02:00
Bart Visscher
e93ce26f27
Fix found errors
2013-06-29 21:15:06 +02:00
Bart Visscher
42c44d5165
Fix OCI setupDatabase parameter
2013-06-29 21:15:06 +02:00
Bart Visscher
bf30e03048
Remove unsued parameter
2013-06-29 21:15:05 +02:00
Bart Visscher
6831b78597
Use db setup class for option validation
2013-06-29 21:15:05 +02:00
Bart Visscher
2faccaee0d
Change database creation to use array to select db setup class
2013-06-29 21:07:11 +02:00
Bart Visscher
e232907698
Convert database setup code to objects
2013-06-29 21:07:11 +02:00
Bart Visscher
a6d07cd512
Split database specific install/setup code to their own class
2013-06-29 21:07:11 +02:00
Bart Visscher
414b5f150e
Merge pull request #2914 from Kondou-ger/label_overlapping_value
...
Fix textfield label overlapping value.
2013-06-29 04:09:50 -07:00
Bart Visscher
bd3e266408
Merge pull request #3688 from roha4000/fix_upload_max_filesize
...
upload_max_filesize = 0 not possible if post_max_size is not 0
2013-06-29 04:07:34 -07:00
Bart Visscher
d699ee9845
Merge pull request #3635 from owncloud/storage-wrapper
...
Give apps the option to wrap storage backends
2013-06-29 04:00:03 -07:00
Bart Visscher
68c0d54568
Merge pull request #3268 from owncloud/convert-oc_log
...
Convert OC_Log to object so it can be used for DI
2013-06-29 03:38:56 -07:00
icewind1991
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
Thomas Mueller
66e1eaac93
isError should detect a PEAR_Error even if the backend is PDO.
...
This can happen on errors during schema migration - which is always done with MDB2
2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer
e62eb2e8d1
correctly handle error results of PDO and MDB2 backends
2013-06-28 20:16:01 +02:00
Robin Appelman
dc0ebe9007
fix is_file and is_dir for the static streamwrapper
2013-06-28 19:54:16 +02:00
Robin Appelman
156e72a0c4
add option to clear the files in the static streamwrapper
2013-06-28 19:41:28 +02:00
Jörn Friedrich Dreyer
f3c4a37a78
Merge pull request #3832 from owncloud/oracle_sql_fixes
...
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
Robin Appelman
a7c70915d5
fix storage wrapper namespaces
2013-06-28 18:18:12 +02:00
Bart Visscher
8ca0a957ad
Allow setting defaults and requirements for the api route
2013-06-28 17:25:10 +02:00
Jörn Friedrich Dreyer
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
Bart Visscher
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Thomas Müller
3bedb09753
Merge pull request #3843 from owncloud/sabre-exceptions
...
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-28 07:05:09 -07:00
Bart Visscher
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
Robin Appelman
125f9f4221
move storage wrappers to their own namespace
2013-06-28 15:34:25 +02:00
Bart Visscher
6ddfe2029c
Merge pull request #3865 from owncloud/fix_test_for_oracle
...
Fix sharing test for oracle
2013-06-28 06:18:56 -07:00
Thomas Mueller
3b91ce695f
session_life_time -> session_lifetime
...
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
2013-06-28 15:17:54 +02:00
Bart Visscher
df9e56efd0
Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
...
manually calculate unix_timestamp for oracle
2013-06-28 06:11:28 -07:00
Bart Visscher
b04e09a901
Move DoctrineStatementWrapper to its own file
2013-06-28 11:48:38 +02:00
Bart Visscher
6145e61718
Remove deadcode
2013-06-28 11:42:23 +02:00
Bart Visscher
1edf01d09f
Fix usage of non existent consts
2013-06-28 11:15:25 +02:00
Thomas Mueller
10951f9bd5
adding PHPDoc
2013-06-27 23:34:36 +02:00
Thomas Mueller
de93b21505
missing $
2013-06-27 23:14:32 +02:00
Bart Visscher
12976fb2e1
Set debugMode after reading the config file
2013-06-27 22:50:28 +02:00
Bart Visscher
194b61b4c5
Revert "Can't determine if debug mode is defined until we read the config"
...
This reverts commit 969e43c87b
.
2013-06-27 22:24:17 +02:00
Bart Visscher
ae2b3732de
Use file_exists to fix the unittests
2013-06-27 22:23:53 +02:00
Bart Visscher
fb80cbd499
Fix review points
2013-06-27 22:01:52 +02:00
Bart Visscher
64f16f1db1
Fix stupid namespace separator
2013-06-27 21:57:59 +02:00
Bart Visscher
2eaad58922
Make the object drive the logging backend
...
This is the other way around then it was.
2013-06-27 20:10:54 +02:00
Bart Visscher
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
Jörn Friedrich Dreyer
77dc3964f8
check item id is set
2013-06-27 17:39:44 +02:00
Björn Schießle
c4aef89278
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
2013-06-27 14:09:22 +02:00
Jörn Friedrich Dreyer
45c897acf3
one if less
2013-06-27 13:13:49 +02:00
Jenkins for ownCloud
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
Bart Visscher
3b31afb2a7
Oracle doesn't know & as bitwise AND
2013-06-26 21:40:31 +02:00
Bart Visscher
a9ee15cf40
Use Doctrine platform to add limit and offset to query
2013-06-26 20:48:01 +02:00
Jörn Friedrich Dreyer
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
Thomas Mueller
794c189650
session life time is now configurable and set to the same value
2013-06-26 09:21:38 +02:00
Robin Appelman
6208780332
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-25 17:04:25 +02:00
Thomas Müller
39cca72964
Merge pull request #3750 from owncloud/dummy_session_for_errors
...
Init dummy session to render error pages
2013-06-25 03:34:49 -07:00
Roman Geber
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
Jörn Friedrich Dreyer
7273b43cd5
manuall calculate unix_timestamp for oracle
2013-06-25 09:52:04 +02:00
Jenkins for ownCloud
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
Jörn Friedrich Dreyer
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
Bart Visscher
fae3cf1a87
Always quote db identifiers in OC_DB_MDB2SchemaReader
2013-06-24 22:38:19 +02:00
Bart Visscher
144a8eb01f
Quote tablenames
2013-06-24 22:38:19 +02:00
Bart Visscher
9fa4b78ba4
Use Doctrines Oracle sequence suffix
2013-06-24 22:38:19 +02:00
Bart Visscher
159efa8bd4
OCI doesn't have a queryString
2013-06-24 22:38:19 +02:00
Bart Visscher
6300b95896
UNIX_TIMESTAMP replace for Oracle
2013-06-24 22:38:19 +02:00
Bart Visscher
dca8c1cbc1
Fixes connecting to Oracle without port set
2013-06-24 22:38:19 +02:00
Bart Visscher
d1b76f1b88
Fix not null with empty default
2013-06-24 22:37:07 +02:00
Jörn Friedrich Dreyer
c223bee6df
fix numRows usage in core lib
2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer
643c8d3088
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
2013-06-24 16:29:58 +02:00
Jörn Friedrich Dreyer
3e3b66bd0d
use to_char when comparing clob to string on oracle, use execute audited
2013-06-24 16:12:21 +02:00
Bart Visscher
377e9a8677
Merge branch 'master' into doctrine
2013-06-24 08:27:25 +02:00
Roland Hager
a06d901e37
Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.
...
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
2013-06-21 09:33:06 +02:00
mvn23
59fa3055e1
Reviewed code for X-Sendfile2
...
Made some small changes which might have caused a segfault on ci.tmit.eu earlier.
2013-06-20 17:46:36 +03:00
Thomas Müller
4232ccbc6d
Merge pull request #3792 from owncloud/scanfolder-remove
...
remove deleted files when re-scanning a folder
2013-06-20 04:02:10 -07:00
blizzz
c41f11a821
Merge pull request #3779 from shkdee/patch-1
...
Update user.php
2013-06-20 02:37:12 -07:00
mvn23
3f20a080fe
Revert most changes for testing
2013-06-20 12:23:25 +03:00
Jörn Friedrich Dreyer
372f261fe3
remove unnecessary exception handling
2013-06-20 10:50:53 +02:00
Jörn Friedrich Dreyer
91c0b81130
add missing backticks
...
guys, please ...
2013-06-20 10:18:29 +02:00
Jenkins for ownCloud
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
Robin Appelman
ff7e903f82
remove deleted files when re-scanning a folder
2013-06-20 00:42:34 +02:00
mvn23
a25bfa9291
Update files.php
2013-06-19 23:44:45 +02:00
mvn23
46f97f4c38
Implement X-Sendfile2 for resume support in LigHTTPd
...
LigHTTPd does not support HTTP Range headers with the X-Sendfile header in the way Apache does. Instead, it needs to be handled in the backend. This commit does exactly that, using the X-Sendfile2 header to send ranges of files.
To accomplish this without breaking web servers that don't support X-Sendfile2, a new variable MOD_X_SENDFILE2_ENABLED was introduced to separate this method from X-Sendfile and X-Accel-Redirect.
2013-06-19 15:36:48 +02:00
icewind1991
cb41b88520
Merge pull request #3764 from owncloud/scanfolder-existing
...
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
Björn Schießle
8406d3f7b1
also use the default theme if the theme is set to an empty string in the config.php
2013-06-19 11:58:29 +02:00
Jörn Friedrich Dreyer
904227a0e4
Merge pull request #3661 from owncloud/fixing-windows-server-master
...
Fixing windows server master
2013-06-19 02:42:18 -07:00
shkdee
4a480e4f53
Update user.php
...
Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times.
2013-06-18 21:47:47 +03:00
Jörn Friedrich Dreyer
78678be2b6
remove dangling AND in SQL statement
2013-06-18 16:18:19 +02:00
Victor Dubiniuk
fbbb6ef8ef
Init dummy session first
2013-06-17 23:41:07 +03:00
Robin Appelman
2ed0e6e915
add tests for reusing existing data in scanner
2013-06-17 18:03:57 +02:00
Robin Appelman
63c898c064
Make rmdir recursive for local storage
2013-06-17 17:34:09 +02:00
Thomas Mueller
383e4c62b5
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing
2013-06-17 00:02:42 +02:00
Thomas Müller
e013e7adea
Merge pull request #3621 from owncloud/path-mimetype
...
seperate mimetype guessing from filename
2013-06-16 13:14:16 -07:00
Thomas Müller
0ac7c5712a
Merge pull request #3721 from owncloud/oracle_setup_fixes
...
Oracle setup fixes
2013-06-14 11:21:02 -07:00
Robin Appelman
f10a4db889
scanner: give more percision about what data is reused during scanning
2013-06-14 16:58:14 +02:00
Jörn Friedrich Dreyer
9498cf959f
remove default tablespace in parameter
2013-06-14 15:54:45 +02:00