16151 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lukas Reschke	c19cacb29f	Check whether the app is set	2014-02-18 14:12:49 +01:00
Lukas Reschke	1352c63dca	Check whether the Key is set	2014-02-18 12:47:05 +01:00
Lukas Reschke	dc6f1d875d	An admin should not be able to add remote and public services on its own. This should only be possible programmatically. ... This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.	2014-02-18 12:32:57 +01:00
Thomas Müller	92560c5b86	Merge pull request #7243 from owncloud/core-sessionlifetimedefault ... Now using PHP session lifetime as default value for the JS config	2014-02-18 10:30:25 +01:00
Thomas Müller	5d3fc03750	Merge pull request #7239 from owncloud/cbr-filetype-icon ... add cbr/cbz file type icon, fix #6953	2014-02-18 10:23:54 +01:00
Vincent Petry	f9763e1fc5	Now using PHP session lifetime as default value for the JS config ... This will fix the heartbeat when the session_lifetime config parameter hasn't been set explicitly.	2014-02-17 21:33:04 +01:00
Jan-Christoph Borchardt	323cc1166b	Merge pull request #7235 from DavidVentura/master ... small change for compatibility	2014-02-17 21:16:39 +01:00
icewind1991	617cbfed54	Merge pull request #7240 from owncloud/mimetype-fallback ... use file icon as fallback instead of application icon, fix #7237	2014-02-17 21:06:15 +01:00
Vincent Petry	5a80339b51	Merge pull request #7211 from mattcaron/master ... Fit shared videos to viewer, just like images. Issue #1648	2014-02-17 20:59:29 +01:00
Jörn Friedrich Dreyer	798dc2c39a	Merge pull request #7231 from owncloud/proper-content-type ... Use the proper content-type	2014-02-17 20:58:52 +01:00
Jan-Christoph Borchardt	c2adf033f2	use file icon as fallback instead of application icon, fix #7237	2014-02-17 20:58:33 +01:00
Jörn Friedrich Dreyer	7e94d98b57	Merge pull request #7233 from owncloud/fix_5567 ... LDAP: improve wizard strings, fixes #5567	2014-02-17 20:57:56 +01:00
Jan-Christoph Borchardt	0f434038a7	add cbr/cbz file type icon, fix #6953	2014-02-17 20:48:32 +01:00
Matthew Caron	aa1a50f5b3	Consolidate two sections, per code review. Issue #1648	2014-02-17 12:57:54 -05:00
David	a282afcbbb	small change for compatibility	2014-02-17 13:27:07 -03:00
Arthur Schiwon	54f9db403f	LDAP: improve wizard strings, fixes #5567	2014-02-17 17:19:48 +01:00
Lukas Reschke	8a2cd0355d	Use the proper content-type ... We should use the proper content-type `application/xml` instead of the default `text/html` here. Backport requested.	2014-02-17 16:45:22 +01:00
Jan-Christoph Borchardt	84cd6e035e	Merge pull request #7132 from owncloud/issue/6920 ... Do not select input for all text input fields	2014-02-17 15:01:03 +01:00
Lukas Reschke	fe065f5114	Merge pull request #6892 from owncloud/issuetemplate-enhancements ... Issue template enhancements	2014-02-17 14:59:00 +01:00
Vincent Petry	fe9c982081	Removed quota question	2014-02-17 14:34:15 +01:00
Björn Schießle	5a8d37023a	Merge pull request #7155 from owncloud/enc_improved_error_handling ... [encryption] improved error handling	2014-02-17 11:13:44 +01:00
Bjoern Schiessle	6778dc5a4a	don't block login forever if we are stuck in the middle of the initial encryption	2014-02-17 10:03:57 +01:00
Bjoern Schiessle	f2f5769df7	catch errors during decryption	2014-02-17 10:03:57 +01:00
Bjoern Schiessle	2ab062193a	catch errors during initial encryption	2014-02-17 09:58:46 +01:00
Thomas Müller	750ffa8231	Merge pull request #7156 from owncloud/backgroundjob-public ... Add the background job list to the public server container	2014-02-14 23:11:10 +01:00
Morris Jobke	df282d9ef8	Merge pull request #7207 from owncloud/fileinfo-serializable ... Remove the JsonSerializable interface from \OC\Files\FileInfo	2014-02-14 22:11:54 +01:00
Matthew Caron	2887fb1f48	Fit shared videos to viewer, just like images. Issue #1648	2014-02-14 16:09:51 -05:00
Thomas Müller	41f0ad2d13	Merge pull request #7204 from owncloud/groupexists-duplicate ... Remove duplicate call to groupExists	2014-02-14 21:53:03 +01:00
Robin Appelman	09502fcb36	remove the JsonSerializable interface from \OC\Files\FileInfo	2014-02-14 19:26:06 +01:00
blizzz	e2c0c0e256	Merge pull request #7206 from owncloud/fix_enc_tests ... fileinfo is no longer a array	2014-02-14 19:09:46 +01:00
Bjoern Schiessle	2933668355	fileinfo is no longer a array	2014-02-14 18:05:59 +01:00
icewind1991	2a7509ee50	Merge pull request #6748 from owncloud/fileinfo ... Add a FileInfo class which holds all info of a file ...	2014-02-14 15:16:39 +01:00
Robin Appelman	b35f679483	Fix test cases for group manager	2014-02-14 15:07:08 +01:00
Vincent Petry	d7f4547717	Merge pull request #6726 from owncloud/fix_6630 ... don't urldecode get var, php does this automatically	2014-02-14 14:34:20 +01:00
Robin Appelman	0ba0596341	remove duplicate call to groupExists	2014-02-14 14:25:45 +01:00
Thomas Müller	595b908b74	Merge pull request #7183 from owncloud/remove-force-lowercase ... remove forced lowercase from extension, fix #4747	2014-02-14 13:58:42 +01:00
Thomas Müller	4b603cd2f8	Merge pull request #7201 from owncloud/fix_error_msg_imagick_queryFormats ... suppress error msg caused by php bug	2014-02-14 12:49:52 +01:00
Vincent Petry	afe133d5d1	Merge pull request #7168 from owncloud/issue/7152 ... Send correct path on file upload when using public app	2014-02-14 12:25:20 +01:00
Georg Ehrke	f62f1658ce	suppress error msg caused by php bug	2014-02-14 11:23:39 +01:00
Thomas Müller	4b84e3a7e8	Merge pull request #4624 from owncloud/convert-oc_appconfig ... Convert OC_Appconfig to object interface	2014-02-13 15:51:40 +01:00
Robin Appelman	3b1df29318	sort expected result in tests	2014-02-13 13:56:02 +01:00
Jan-Christoph Borchardt	6e17d71a0d	remove forced lowercase from extension, fix #4747, also coding style fixes	2014-02-13 10:39:38 +01:00
Thomas Müller	30662fa7ac	Merge pull request #7178 from owncloud/issue/6277 ... External FTP Storage should request hostname instead of URL	2014-02-12 23:01:41 +01:00
Joas Schilling	658af627ce	External FTP Storage should request hostname instead of URL ... Fix issue #6277	2014-02-12 18:20:10 +01:00
Joas Schilling	9619459e37	Send correct path on file upload when using public app ... Fix issue #7152	2014-02-12 15:49:09 +01:00
icewind1991	7af456730e	Merge pull request #6964 from owncloud/storagestatistics-reuse ... Reuse the calculated free_space in buildFileStorageStatistics	2014-02-12 15:48:14 +01:00
Robin Appelman	d6576c640c	Add unit tests for JobList	2014-02-12 13:52:13 +01:00
Robin Appelman	62288971ca	Additional phpdoc	2014-02-12 13:32:16 +01:00
Robin Appelman	3aafa837b8	Remove internal methods from the public interface	2014-02-12 13:25:50 +01:00
Robin Appelman	60bd9d512d	Merge branch 'master' into backgroundjob-public	2014-02-12 13:21:47 +01:00