Commit graph

3892 commits

Author SHA1 Message Date
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
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
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
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
Robin Appelman
2ed0e6e915 add tests for reusing existing data in scanner 2013-06-17 18:03:57 +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
Thomas Mueller
1ef66941a7 adding default to $hint within ctor of DatabaseSetupException 2013-06-14 15:38:09 +02:00
Robin Appelman
30c09d0c8b split of scanning the childs of a folder 2013-06-14 15:35:06 +02:00
Thomas Mueller
5c7d7549ea coding style 2013-06-14 13:54:41 +02:00
Jörn Friedrich Dreyer
471b9c055a use executeAudited in sabredav lock 2013-06-14 12:23:44 +02:00
Jörn Friedrich Dreyer
961a001af3 add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup 2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer
e5d3cd59ac use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config 2013-06-14 12:09:49 +02:00
Jörn Friedrich Dreyer
dcdabac04d oracle does not need sequence suffix, manually set database name to allow fetching db schema, don't shutdown db - we are using utf8 to connect 2013-06-14 12:06:29 +02:00
Thomas Mueller
87521f6c6e dirname('/test.txt') returns '\' on windows whereas on linux we get back '.' 2013-06-14 11:59:30 +02:00
Morris Jobke
8d62bb3aab Merge pull request #3684 from owncloud/pg_install_db_master
Try connection with specified db when postgres does not work
2013-06-14 02:50:01 -07:00
Morris Jobke
7093b0829f improve comment 2013-06-14 11:28:33 +03:00
Thomas Mueller
c8564c0795 Merge branch 'master' into move-maint-start
Conflicts:
	lib/util.php
2013-06-14 10:06:13 +02:00
Jenkins for ownCloud
6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Thomas Müller
8edb56de05 Merge pull request #3690 from owncloud/use_execute_audited_in_filecache
use executeAudited in files cache
2013-06-13 13:55:55 -07:00
Thomas Müller
2a58cf8117 Merge pull request #3686 from owncloud/minor_exception_cleanup
minor cleanup for exception handling
2013-06-13 13:50:31 -07:00
Björn Schießle
7889f2ef5c Merge pull request #3687 from owncloud/template_updates
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
Jörn Friedrich Dreyer
31f7afe56a PDOException has no previous(), oh the consistency ... 2013-06-13 13:14:00 +02:00
Thomas Müller
54f3174665 Merge pull request #3640 from infoneo/master
Folders with multiple periods problem fix
2013-06-13 03:34:36 -07:00
Thomas Mueller
84a8aea410 restore Updater functionality on non-Windows platforms 2013-06-13 00:09:52 +02:00
Jörn Friedrich Dreyer
54f9477f34 fix another double wrapped array 2013-06-12 23:01:52 +02:00
Jörn Friedrich Dreyer
6d55a062be remove additional array wrapping 2013-06-12 21:23:34 +02:00
Jörn Friedrich Dreyer
d3eadcde56 use executeAudited in files cache 2013-06-12 20:11:53 +02:00
Björn Schießle
7a575cc2d7 short explanation about OC_Defaults 2013-06-12 16:33:09 +02:00
Björn Schießle
839bce80c6 make main menu aware of the different owncloud editions 2013-06-12 16:20:23 +02:00
Björn Schießle
5c6a854489 add default doc url 2013-06-12 16:19:28 +02:00
Jörn Friedrich Dreyer
f7dc07602b minor cleanup for exception handling 2013-06-12 15:48:22 +02:00
Björn Schießle
e1e798c623 make footer and urls aware of ownCloud editions 2013-06-12 15:44:11 +02:00
Björn Schießle
b29e01d5cf keep all strings in one place to make it easier to change them 2013-06-12 15:15:08 +02:00
eMerzh
e33f68ecb6 Correct escaping 2013-06-12 14:36:28 +02:00
Brice Maron
edc255421c Try connection with specified db when postgres does not work
Conflicts:

	lib/setup.php
2013-06-12 14:36:07 +02:00
Thomas Müller
1abce78cb8 Merge pull request #3654 from owncloud/clean_up_exceptions
Introduce more robust SQL execution and exception handling
2013-06-12 04:13:12 -07:00
Jörn Friedrich Dreyer
0eed1c980d Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
fix fetchRow checks to also work with MDB2
2013-06-11 06:20:27 -07:00
Jörn Friedrich Dreyer
e238eeef6f Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-11 05:34:55 -07:00
Björn Schießle
118f2b3283 createUser() needs to return something; the user object or false 2013-06-11 13:48:17 +02:00
Thomas Mueller
74a170f2a5 [Fixing unit tests in Windows]
on windows open resources will be locked while the stream is open.
closing the resource allows deletion below
2013-06-10 19:28:55 +02:00