3828 Commits

Author	SHA1	Message	Date
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
Jörn Friedrich Dreyer	875c18b115	fix fetchRow checks to also work with MDB2	2013-06-10 17:43:09 +02:00
Morris Jobke	1da112750e	Merge pull request #3647 from owncloud/missing_backticks ... add missing backticks all over the place	2013-06-10 05:15:07 -07:00
Jörn Friedrich Dreyer	d264d0a79d	Merge pull request #3648 from owncloud/sql_limit_as_param ... convert LIMIT to parameter	2013-06-10 02:48:15 -07:00
Björn Schießle	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
Jörn Friedrich Dreyer	5ec13742b3	use to_char to allow comparing string to CLOB cloumns in oracle	2013-06-10 10:33:02 +02:00
Jörn Friedrich Dreyer	307f1626e8	convert LIMIT to parameter	2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer	124f34422c	add missing backticks all over the place	2013-06-10 09:53:29 +02:00
Jenkins for ownCloud	3c79d89492	[tx-robot] updated from transifex	2013-06-08 02:13:41 +02:00
Michael Gapczynski	9ef989f917	Merge pull request #2919 from owncloud/hook-improvements ... Hook improvements	2013-06-07 06:35:50 -07:00
Jenkins for ownCloud	67c085417c	[tx-robot] updated from transifex	2013-06-07 02:17:50 +02:00
Björn Schießle	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
Jenkins for ownCloud	81b6cab94f	[tx-robot] updated from transifex	2013-06-06 02:21:31 +02:00
Jenkins for ownCloud	666a5c1cc7	[tx-robot] updated from transifex	2013-06-05 02:01:42 +02:00
Michael Gapczynski	cb9fe475c4	Merge branch 'master' into hook-improvements ... Conflicts: lib/files/view.php	2013-06-04 18:19:08 -04:00
Arthur Schiwon	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
Jörn Friedrich Dreyer	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
icewind1991	8c991d97aa	Merge pull request #3561 from owncloud/user ... Refactor of user management	2013-06-03 08:13:40 -07:00
Thomas Tanghus	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
Robin Appelman	0ce2b2708c	also clear cached users when removing a single backend	2013-06-03 14:19:17 +02:00
Robin Appelman	2a82964830	use caching for userExists	2013-06-03 13:46:05 +02:00
Robin Appelman	83fbdc903f	cast result to bool	2013-06-03 13:39:34 +02:00
Robin Appelman	eb2a1e0f8a	move phpdoc comments	2013-06-03 13:33:56 +02:00
Robin Appelman	1a4021a0fe	User: return backend result	2013-06-03 13:19:01 +02:00
Robin Appelman	fbe3213fec	User: consisten variable naming	2013-06-03 13:17:03 +02:00
Robin Appelman	00b4bfcbf5	User: remove determineDisplayName	2013-06-03 13:15:42 +02:00
Jörn Friedrich Dreyer	b76725c1fa	Merge pull request #3560 from owncloud/init-order-session ... initialize the session earlier	2013-06-03 03:21:05 -07:00
Robin Appelman	38bd234686	make sure the filesystem is setup before doing mount operations	2013-06-02 22:09:44 +02:00
Thomas Tanghus	901b1150ff	Replacement for jquery.dialog to fit better with ownCloud design.	2013-06-02 21:52:59 +02:00
Robin Appelman	b5e817d638	fix clearing mounts when filesystem isn't initialized yet	2013-06-02 21:44:24 +02:00
Robin Appelman	251527c6e6	merge master into backgroundjob	2013-06-02 20:12:44 +02:00
Thomas Müller	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
Thomas Mueller	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
Robin Appelman	2c69403fd6	fix namespacing error	2013-06-01 00:39:59 +02:00
Robin Appelman	82fd15706e	fix undefined variables	2013-06-01 00:39:59 +02:00
Robin Appelman	e430f442b5	use single quotes	2013-06-01 00:39:59 +02:00
Thomas Mueller	dd4a07321a	fix method naming	2013-05-31 23:24:09 +02:00
icewind1991	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
Florin Peter	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
Robin Appelman	cdb2f559a8	Fix postLogin hook	2013-05-31 19:58:31 +02:00
Robin Appelman	473f3c6916	fix typo	2013-05-31 18:18:13 +02:00
Robin Appelman	f00844a003	fix caching of user objects	2013-05-31 17:42:51 +02:00
Robin Appelman	b8b0b7606a	initialize the session earlier	2013-05-31 17:31:52 +02:00
Robin Appelman	a8fb803319	cache instances of \OC\User\User	2013-05-31 17:31:27 +02:00
Robin Appelman	542bcf9156	Merge branch 'master' into user	2013-05-31 16:35:51 +02:00
FlorinPeter	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
Jörn Friedrich Dreyer	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
icewind1991	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