5908 Commits

Author	SHA1	Message	Date
Thomas Müller	6ddad8dc49	Merge pull request #4126 from owncloud/parallel-autotest.sh-master ... Parallel autotest.sh master	2013-07-22 14:48:49 -07:00
Thomas Müller	57d178274d	Merge pull request #3142 from owncloud/ext-fs-irods-master ... Ext fs irods master	2013-07-22 05:16:49 -07:00
Thomas Müller	840e96cda3	Merge branch 'master' into disable-anon-upload-master ... Conflicts: settings/templates/admin.php	2013-07-22 11:55:20 +02:00
Thomas Müller	7b28f5a82c	Merge branch 'master' into ext-fs-irods-master	2013-07-22 11:40:28 +02:00
Thomas Müller	6e2418141d	Merge branch 'master' into parallel-autotest.sh-master	2013-07-22 11:39:27 +02:00
Thomas Müller	934f2e94a3	Merge branch 'master' into disable-anon-upload-master	2013-07-22 11:36:52 +02:00
Thomas Müller	a2cdf8b91e	Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3 ... reworking of \OC\Files\Storage\AmazonS3	2013-07-22 02:19:27 -07:00
Björn Schießle	da892d69ab	if the file doesn't exists; create a new one. We use this to create new text files in the web interface	2013-07-22 09:15:19 +02:00
Jenkins for ownCloud	01f3f8e0cc	[tx-robot] updated from transifex	2013-07-22 02:03:23 -04:00
Bart Visscher	37a731bcad	Merge pull request #4131 from owncloud/scanner-split ... Remove scanner logic from ajax file and place it in it's own class	2013-07-21 11:32:11 -07:00
Morris Jobke	f54f203e56	mark test as incomplete because I can't reproduce jenkins failure	2013-07-21 11:28:06 +02:00
Morris Jobke	647e0a0cba	Merge pull request #4118 from owncloud/remove-size-experiment ... finally remove the file size obfuscation as it had more disadvantages.	2013-07-21 01:25:39 -07:00
Jenkins for ownCloud	9a13b687cc	[tx-robot] updated from transifex	2013-07-21 02:02:41 -04:00
Thomas Müller	ae9b60ba61	Merge pull request #4119 from owncloud/external-storage-status ... replace external storage status images with CSS, also use form to distinguish	2013-07-19 13:54:19 -07:00
Arthur Schiwon	f6d133955e	LDAP: fix background job, resolves #3528	2013-07-19 18:41:29 +02:00
Robin Appelman	2b89b7c880	Split scanning logic from ajax file	2013-07-19 16:44:47 +02:00
Thomas Müller	20ee9945d1	don't rely on admin user but create a test user for Test_Encryption_Keymanager	2013-07-19 14:54:10 +02:00
Jenkins for ownCloud	ae82f7fd17	[tx-robot] updated from transifex	2013-07-19 02:03:14 -04:00
Andreas Fischer	2c38c2a70e	Merge pull request #3947 from runky/patch-1 ... * runky/patch-1: Update authenticate.php	2013-07-19 02:19:14 +02:00
Jan-Christoph Borchardt	100eb2b611	replace external storage status images with CSS, also use form to distinguish, fix #3910	2013-07-18 23:00:04 +02:00
Jan-Christoph Borchardt	48948ccf5f	finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.	2013-07-18 22:15:26 +02:00
Jenkins for ownCloud	279a71acb3	[tx-robot] updated from transifex	2013-07-18 02:02:51 -04:00
Jenkins for ownCloud	210006c4a6	[tx-robot] updated from transifex	2013-07-17 02:28:02 -04:00
Thomas Müller	5cba09e931	fixing / adding comments	2013-07-16 11:35:48 +02:00
Thomas Müller	9c0bf5c41a	Merge branch 'master' into ext-fs-irods-master	2013-07-16 11:30:56 +02:00
Jenkins for ownCloud	a8acbfdf7b	[tx-robot] updated from transifex	2013-07-16 02:06:21 -04:00
Thomas Müller	79d23463f8	No admin option to enable public upload in case encryption is enabled ... No upload on pubic page if public upload is disabled	2013-07-14 21:58:08 +02:00
Jenkins for ownCloud	29d8ae2f95	[tx-robot] updated from transifex	2013-07-14 02:10:41 +02:00
Frank Karlitschek	ccb3c5b428	Removed the preview warning. This is only a simple text change	2013-07-13 13:31:55 +02:00
Jenkins for ownCloud	583addaea1	[tx-robot] updated from transifex	2013-07-13 02:07:35 +02:00
Thomas Müller	c3e16a7388	fixing Undefined index: publicUploadEnabled	2013-07-12 17:51:01 +02:00
Thomas Müller	5f5700e353	in case the encryption app is enabled we cannot yet allow anonymous upload	2013-07-12 17:05:58 +02:00
Thomas Müller	fc2d538311	new admin setting added which allows to turn off anonymous uploads	2013-07-12 17:03:51 +02:00
Thomas Müller	d1c0564711	Merge branch 'master' into ext-fs-irods-master	2013-07-12 15:30:01 +02:00
Thomas Müller	ca16c08ba1	update copy right	2013-07-12 15:28:01 +02:00
Thomas Müller	01378e1907	incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp	2013-07-12 15:08:13 +02:00
Kondou	8ae2066b20	Merge pull request #4037 from owncloud/add_new_file_above_summary ... add new file above summary if it is the first file in the list	2013-07-12 03:45:45 -07:00
Björn Schießle	b16c5a6df7	fix array access and change variable names according to the coding style	2013-07-12 11:25:40 +02:00
Björn Schießle	15f7bb296c	continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota	2013-07-12 11:25:31 +02:00
Björn Schießle	fbf34f3bf6	fix some var names according to our style guide	2013-07-12 11:25:23 +02:00
Björn Schießle	2f0d88cae4	adjust comments	2013-07-12 11:25:12 +02:00
Björn Schießle	e7959d3da0	fix typo in comment	2013-07-12 11:25:04 +02:00
Björn Schießle	e8760d7284	also expire versions on rename, to update the history more regularly	2013-07-12 11:24:52 +02:00
Björn Schießle	d6c1e5490d	it is enough to call the expire function once	2013-07-12 11:24:31 +02:00
Björn Schießle	e159143165	call expire function before writing the new version to make sure to have enough free space	2013-07-12 11:24:19 +02:00
Björn Schießle	cb81ceb31d	add new file above summary if it is the first file in the list	2013-07-12 10:40:24 +02:00
Thomas Müller	481bb831bb	Merge branch 'master' into ext-fs-irods-master	2013-07-12 09:54:39 +02:00
Jenkins for ownCloud	3fbf7ab189	[tx-robot] updated from transifex	2013-07-12 02:12:25 +02:00
Jenkins for ownCloud	f74659f3f6	[tx-robot] updated from transifex	2013-07-11 02:26:22 +02:00
Jan-Christoph Borchardt	a9072056a0	Merge pull request #3990 from owncloud/size-mb ... add MB indicator to size heading, fix #3987	2013-07-10 08:42:05 -07:00