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
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
c0b25a4375
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
2013-06-10 18:47:36 +02:00
073306eaa2
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
error logging has been added in case the given 4path is not found within self::correctFolder
2013-06-10 18:35:47 +02:00
875c18b115
fix fetchRow checks to also work with MDB2
2013-06-10 17:43:09 +02:00
988b539dd7
Let's just use '/' as we do almost everywhere - this change fixes two failing unit tests
2013-06-10 17:27:21 +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
94ca576c9a
use a getter for the storage loader to ensure the instance is created
2013-06-07 17:50:10 +02:00
2708ab09ab
storage loader needs to be accessible by apps
2013-06-07 17:40:19 +02:00
85a9b7f094
Storage wrapper: provide access to the wrapped storage
2013-06-07 17:12:45 +02:00
f35578ec54
merge master into storage-wrapper
2013-06-07 17:12:16 +02:00
bd67512409
manage creating and wrapping storages in it's own class
2013-06-07 17:07:13 +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
85abede9bf
actually return result
2013-06-07 00:22:05 +02:00
0470a5ba94
fix variable name
2013-06-07 00:17:51 +02:00
cf7321915d
seperate mimetype guessing from filename
2013-06-06 23:51:44 +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
1a4021a0fe
User: return backend result
2013-06-03 13:19:01 +02:00
fbe3213fec
User: consisten variable naming
2013-06-03 13:17:03 +02:00
00b4bfcbf5
User: remove determineDisplayName
2013-06-03 13:15:42 +02:00
b76725c1fa
Merge pull request #3560 from owncloud/init-order-session
...
initialize the session earlier
2013-06-03 03:21:05 -07:00
38bd234686
make sure the filesystem is setup before doing mount operations
2013-06-02 22:09:44 +02:00
901b1150ff
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-02 21:52:59 +02:00
b5e817d638
fix clearing mounts when filesystem isn't initialized yet
2013-06-02 21:44:24 +02:00
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
1b3c9fe5ae
Merge pull request #3454 from owncloud/fix_hasInternetConnection
...
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
2013-05-31 17:05:45 -07:00
3e00a3603c
adding PHPDoc comment to getManager()
...
adding PHPDoc comment for $user within the hooks callbacks
fixing PHPDoc comment on isLoggedIn()
2013-06-01 00:49:06 +02:00
2c69403fd6
fix namespacing error
2013-06-01 00:39:59 +02:00
82fd15706e
fix undefined variables
2013-06-01 00:39:59 +02:00
e430f442b5
use single quotes
2013-06-01 00:39:59 +02:00
dd4a07321a
fix method naming
2013-05-31 23:24:09 +02:00
94a6622bcd
Merge pull request #3459 from owncloud/fix_for_2377
...
fix problems with german "Umlaut" in folder name
2013-05-31 14:00:02 -07:00
b840de4e01
user should set into session before postLogin hook otherwise it will break not only the files_encryption app
2013-05-31 21:30:13 +02:00
cdb2f559a8
Fix postLogin hook
2013-05-31 19:58:31 +02:00
473f3c6916
fix typo
2013-05-31 18:18:13 +02:00
f00844a003
fix caching of user objects
2013-05-31 17:42:51 +02:00
b8b0b7606a
initialize the session earlier
2013-05-31 17:31:52 +02:00
a8fb803319
cache instances of \OC\User\User
2013-05-31 17:31:27 +02:00
542bcf9156
Merge branch 'master' into user
2013-05-31 16:35:51 +02:00
d636e168a6
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
...
File encryption external storage fixes
2013-05-31 03:21:46 -07:00
476747ee89
Merge pull request #3509 from owncloud/update_jquery_to_1_10
...
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
2013-05-30 06:00:52 -07:00
aa1c5a5d63
Merge pull request #3529 from owncloud/folder-permissions
...
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-30 05:54:29 -07:00
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
313631edf6
Merge branch 'master' into file_encryption_external_storage_fixes
...
Conflicts:
apps/files_encryption/hooks/hooks.php
2013-05-30 00:45:29 +02:00
dbbf195727
Only retrieve the current user's permissions
2013-05-29 18:08:18 -04:00
1337f48d64
fixes for pgsql
2013-05-29 20:41:07 +02:00
5c04b3a63a
fix wrong signature delimiter - fix #3523
2013-05-29 20:21:48 +02:00
f1b884aa5d
changed deprecated class
2013-05-29 20:15:04 +02:00
353d19d183
fixes if cache returns false
2013-05-29 20:11:13 +02:00
c8d1cd224d
fix $parent/$source typo
2013-05-29 19:58:05 +02:00
5bbc583b56
Merge pull request #3532 from owncloud/scan-update
...
Only update metadata that has changed
2013-05-29 10:23:41 -07:00
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
59655e9afd
Style fixes
2013-05-29 10:56:28 -04:00
ea55367678
Organize conditionals in a better order
2013-05-29 10:40:05 -04:00
04805d0be9
Only update metadata that has changed
2013-05-29 10:19:03 -04:00
24a401a548
Cache mimetype icons
2013-05-29 15:43:41 +02:00
ae0f37e9e2
fix indention
2013-05-29 15:37:27 +02:00
44d217c425
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-29 15:25:42 +02:00
8587f565d2
remove unnecessary variable
2013-05-29 15:14:15 +02:00
63a2bec6e5
use public API for error handling; improved while condition
2013-05-29 14:40:47 +02:00
893a1ed6f5
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists
2013-05-29 14:19:18 +02:00
672811c103
if one public link share was found, we don't have to check it for the other folders
2013-05-29 13:12:30 +02:00
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
8320f41dbe
Emit leacgy OC_User hooks
2013-05-29 01:05:49 +02:00
3e7e2c8a5c
fix setting getting active userid
2013-05-29 00:47:55 +02:00
198655f109
fix User->setHome when the backend action fails
2013-05-29 00:47:44 +02:00
4b688db612
implement old user api on top of the new one
2013-05-29 00:32:10 +02:00
955bda1842
New user management classes
2013-05-29 00:31:55 +02:00
1d799f22c1
Default to localhost, if nothing is entered.
2013-05-28 17:34:57 +02:00
57f712f8a9
implement ArrayInterface with Session
2013-05-28 16:52:40 +02:00
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
040045cc2e
provide a dummy session for CLI
2013-05-28 01:15:38 +02:00
f547b66d6b
check fix if session start is successfull
2013-05-28 01:13:36 +02:00
e73c04501e
Fix session not working error
2013-05-28 01:10:18 +02:00
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
76d13120ea
Abstract the session away in a class
2013-05-28 00:50:00 +02:00
9e65f40d1b
Add PublicEmitter class
2013-05-27 20:20:06 +02:00
3001db6b50
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
2013-05-27 20:13:13 +02:00
557cc4c1ab
make method names camelCase
2013-05-27 19:24:31 +02:00
d69b7e24d2
update comment
2013-05-27 19:20:29 +02:00
58c9175a56
move check if internet connection is disabled on purpose to a dedicated method
2013-05-27 19:19:17 +02:00
6151c0d310
Merge pull request #3412 from owncloud/fix_2013
...
Don't set Content-Length header if size is unknown
2013-05-27 07:44:35 -07:00
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +02:00
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
adcafbde34
Merge branch 'master' into fix_for_2377
2013-05-25 20:37:28 +02:00
505a300776
we should also normalize on update and search because the database layer will not do this for us
2013-05-25 20:35:12 +02:00
0fdf3a7e63
Merge pull request #3388 from roha4000/master
...
Duplicate DB entries in filecache table when renaming folder in WebUI #2
2013-05-25 11:18:20 -07:00
c870aed1b6
Merge pull request #3493 from owncloud/bumpversion
...
Bump version for files_encryption changes
2013-05-25 10:20:42 -07:00
2893bb9543
Bump version for files_encryption changes
2013-05-25 11:42:28 -04:00
0a29d2029a
Clear opcode caches after writing to the config file, fixes #3372
2013-05-25 11:25:43 -04:00
c245f5a99f
added more places where normalization is needed
2013-05-25 14:56:00 +02:00
f6bf9de6de
prevent for returning while false normalize string
2013-05-25 14:54:36 +02:00
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
946e9ccc0a
Merge branch 'master' into fix_for_2377
2013-05-24 20:54:13 +02:00
736f10039d
changed builtin normalizer to \OC_Util::normalizeUnicode
2013-05-24 20:36:20 +02:00
661b5501b0
added normalizeUnicode() method to OC_Util
2013-05-24 20:35:01 +02:00
4911305887
Merge pull request #3416 from owncloud/files_encryption
...
New files encryption app
2013-05-24 02:21:19 -07:00
3fbfe3c06a
small typo in the comments
2013-05-23 20:59:02 -04:00
a98d6c4be6
Merge pull request #3425 from owncloud/move-storages
...
Support for moving/copying folders between storages
2013-05-23 17:35:11 -07:00
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
d4b700ef4e
revert previous fix and added normalizer to cache class
2013-05-23 20:29:46 +02:00
30330b4343
Merge branch 'master' into move-storages
...
Conflicts:
tests/lib/files/view.php
2013-05-23 10:25:12 -04:00
3b6d850e59
Switch to calling deleteAll via storage to avoid emitting delete hook
2013-05-23 10:23:16 -04:00
85e0c78166
fix problems with german "Umlaut" in folder name
2013-05-23 01:21:36 +02:00
ee53bd1aa3
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 15:29:22 +02:00
1f1abe595d
cleanup codestyle
2013-05-22 13:59:08 +02:00
cbd5eb9a1a
use to_char only for oracle, whitespace
2013-05-22 13:59:07 +02:00
eceb3c8ed5
add debug output
2013-05-22 13:59:07 +02:00
1b68c0c0cd
allow install when only oracle is available
2013-05-22 13:56:57 +02:00
efb2e69230
fix return value of OC_Util::isinternetconnectionworking()
2013-05-22 12:21:11 +02:00
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
2ea2abf11e
Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users.
2013-05-22 08:18:57 +02:00
7a0c592f93
Fix undefined index for share mount point retrieval
2013-05-21 20:21:19 -04:00
28d72b822d
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 01:26:35 +02:00
e2444ec9c5
Merge pull request #3266 from owncloud/hooks
...
New hook system
2013-05-21 15:21:25 -07:00
81fd1badc3
merge master into filecache_mtime
2013-05-21 23:35:19 +02:00
fb4d8ddf0a
Merge pull request #3335 from owncloud/prevent-scan-loop
...
Prevent backgroundScan() from looping
2013-05-21 09:15:22 -07:00
c62f230ddb
Merge branch 'master' into move-maint-start
2013-05-21 11:26:56 -04:00
5cd14425f9
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
09ff46eda2
Remove user name addition to paths in deleteAll
2013-05-20 10:21:55 -04:00
c38dc36665
Remove debug output
2013-05-20 13:56:57 +02:00
b1bb899867
Add rename() method to OC_VCategories.
2013-05-20 10:16:07 +02:00
Brice Maron
Thomas Müller
Jörn Friedrich Dreyer
Björn Schießle
Morris Jobke
Björn Schießle
infoneo
Robin Appelman
Michael Gapczynski
Arthur Schiwon
icewind1991
Thomas Tanghus
Florin Peter
kondou
Georg Ehrke
Alessandro Cosentino
Georg Ehrke
Roland Hager