3962 commits

Author	SHA1	Message	Date
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
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
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
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	1edf01d09f	Fix usage of non existent consts	2013-06-28 11:15:25 +02:00
Thomas Mueller	de93b21505	missing $	2013-06-27 23:14:32 +02:00
Bart Visscher	fb80cbd499	Fix review points	2013-06-27 22:01:52 +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
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
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