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
7093b0829f
improve comment
2013-06-14 11:28:33 +03:00
c8564c0795
Merge branch 'master' into move-maint-start
...
Conflicts:
lib/util.php
2013-06-14 10:06:13 +02:00
6c534c8165
[tx-robot] updated from transifex
2013-06-14 02:52:34 +02:00
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
2a58cf8117
Merge pull request #3686 from owncloud/minor_exception_cleanup
...
minor cleanup for exception handling
2013-06-13 13:50:31 -07:00
7889f2ef5c
Merge pull request #3687 from owncloud/template_updates
...
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
31f7afe56a
PDOException has no previous(), oh the consistency ...
2013-06-13 13:14:00 +02:00
54f3174665
Merge pull request #3640 from infoneo/master
...
Folders with multiple periods problem fix
2013-06-13 03:34:36 -07:00
54f9477f34
fix another double wrapped array
2013-06-12 23:01:52 +02:00
6d55a062be
remove additional array wrapping
2013-06-12 21:23:34 +02:00
d3eadcde56
use executeAudited in files cache
2013-06-12 20:11:53 +02:00
7a575cc2d7
short explanation about OC_Defaults
2013-06-12 16:33:09 +02:00
839bce80c6
make main menu aware of the different owncloud editions
2013-06-12 16:20:23 +02:00
5c6a854489
add default doc url
2013-06-12 16:19:28 +02:00
f7dc07602b
minor cleanup for exception handling
2013-06-12 15:48:22 +02:00
e1e798c623
make footer and urls aware of ownCloud editions
2013-06-12 15:44:11 +02:00
b29e01d5cf
keep all strings in one place to make it easier to change them
2013-06-12 15:15:08 +02:00
e33f68ecb6
Correct escaping
2013-06-12 14:36:28 +02:00
edc255421c
Try connection with specified db when postgres does not work
...
Conflicts:
lib/setup.php
2013-06-12 14:36:07 +02:00
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
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
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
118f2b3283
createUser() needs to return something; the user object or false
2013-06-11 13:48:17 +02:00
875c18b115
fix fetchRow checks to also work with MDB2
2013-06-10 17:43:09 +02:00
1da112750e
Merge pull request #3647 from owncloud/missing_backticks
...
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
86c5243be5
remove duplicate logging from db.php, now happens in entrypoints
2013-06-10 14:03:12 +02:00
8dc6bdd96b
clean up usage of DatabaseSetupException and catch Exceptions in entrypoints
2013-06-10 13:45:19 +02:00
c0bdbd9d81
introduce and use executeAudited in db.php
2013-06-10 12:56:45 +02:00
d264d0a79d
Merge pull request #3648 from owncloud/sql_limit_as_param
...
convert LIMIT to parameter
2013-06-10 02:48:15 -07:00
db06b906e5
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
...
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
5ec13742b3
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-10 10:33:02 +02:00
307f1626e8
convert LIMIT to parameter
2013-06-10 10:04:52 +02:00
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
b39113ae3e
Update mapper.php
...
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
2013-06-08 18:39:25 +03:00
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
9ef989f917
Merge pull request #2919 from owncloud/hook-improvements
...
Hook improvements
2013-06-07 06:35:50 -07:00
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
fdaab7372e
always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not
2013-06-06 13:30:18 +02:00
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
cb9fe475c4
Merge branch 'master' into hook-improvements
...
Conflicts:
lib/files/view.php
2013-06-04 18:19:08 -04:00
c8a2beccb0
Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374
2013-06-03 22:36:36 +02:00
96b1e54d4a
Merge pull request #3444 from owncloud/share-fix
...
Fix undefined index for share mount point retrieval
2013-06-03 11:35:06 -07:00
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
2572c9a6b7
Merge pull request #3578 from owncloud/ocdialog
...
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-03 06:37:27 -07:00
0ce2b2708c
also clear cached users when removing a single backend
2013-06-03 14:19:17 +02:00
2a82964830
use caching for userExists
2013-06-03 13:46:05 +02:00
83fbdc903f
cast result to bool
2013-06-03 13:39:34 +02:00
eb2a1e0f8a
move phpdoc comments
2013-06-03 13:33:56 +02:00
Morris Jobke
Thomas Mueller
Björn Schießle
Jörn Friedrich Dreyer
Björn Schießle
eMerzh
infoneo
Michael Gapczynski
Arthur Schiwon
icewind1991
Thomas Tanghus
Robin Appelman