wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12670 commits 157 branches 562 tags 714 MiB
Commit graph

12670 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bart Visscher
ad9458e85d Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
 2013-07-04 18:23:47 +02:00
VicDeo
f67fc78531 Merge pull request #3899 from owncloud/encryption_check_php_version 
check php version, the encryption app needs php >= 5.3.3
 2013-07-04 06:53:17 -07:00
Björn Schießle
f30dd1557e more verbose error message 2013-07-04 14:50:07 +02:00
Kondou
63c83ff50b Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw 
Add a "Wrong password." message, if the password for the public share was wrong.
 2013-07-04 03:12:51 -07:00
Björn Schießle
5f2378be5b revert changes which where introduced by accident during merge 23cc69b816 2013-07-04 12:06:36 +02:00
Georg Ehrke
8d59893e90 fix position of 'user shared the folder foldername with you' label 2013-07-04 10:32:26 +02:00
Björn Schießle
3c1308fb6d eddition string should be empty by default 2013-07-04 10:12:07 +02:00
Björn Schießle
6cfa016c39 add public api 2013-07-04 10:11:55 +02:00
Björn Schießle
3c691c9ec9 move to non-static OC_Defaults 
Conflicts:

	lib/mail.php
 2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Jenkins for ownCloud
51cfacd789 [tx-robot] updated from transifex 2013-07-04 09:33:58 +02:00
Christian Berendt
92e7392852 revoking additional tests 2013-07-04 09:01:36 +02:00
Bart Visscher
20be58bfdc Merge pull request #3888 from owncloud/ocs_api_fixes 
Ocs api fixes
 2013-07-03 12:33:04 -07:00
Victor Dubiniuk
a20f7f1d67 Do not add groups if user has no groups 2013-07-03 22:06:09 +03:00
kondou
65bcedfbbe Use better wording. 2013-07-03 20:13:10 +02:00
Christian Berendt
b3d6517c62 use us-west-1 as default region for Amazon S3 2013-07-03 18:56:51 +02:00
Christian Berendt
37254744b5 remove tests from the wrong test method 2013-07-03 18:41:14 +02:00
Christian Berendt
818e2a364a test moving and copying of subdirectories 2013-07-03 18:38:34 +02:00
Christian Berendt
407753f594 move new tests into the correct test method 2013-07-03 18:34:33 +02:00
Christian Berendt
839ab7f2e6 fixing rmdir in \OC\Files\Storage\AmazonS3 2013-07-03 18:33:15 +02:00
Christian Berendt
0a5e18335e test working with files in subdirectories 2013-07-03 18:23:09 +02:00
Christian Berendt
e556b7ab55 test working with subdirectories 2013-07-03 18:16:50 +02:00
Christian Berendt
81acfc9498 test copying and moving files in subdirectories 2013-07-03 18:11:54 +02:00
Christian Berendt
21601fd784 increasing difference for modifcation time tests 
one second is sometimes not enough when using a slow storage connection,
three seconds is working better (at least when testing against S3)
 2013-07-03 18:08:19 +02:00
Christian Berendt
5a5a0e82f5 added commented new parameters 2013-07-03 18:06:27 +02:00
Christian Berendt
71ef30ea30 reworking testclass for \OC\Files\Storage\AmazonS3 2013-07-03 18:03:23 +02:00
Christian Berendt
8e5474394e reworking and extending \OC\Files\Storage\AmazonS3 2013-07-03 18:01:14 +02:00
Christian Berendt
32597c380a adding several new parameters 2013-07-03 17:58:44 +02:00
Christian Berendt
6653c2e9cb adding AWS SDK for PHP 2.4.0 2013-07-03 17:54:17 +02:00
Thomas Mueller
32d69f6889 Merge branch 'master' into convert-oc_config 2013-07-03 17:03:47 +02:00
kondou
aa7d8edd14 Suppress warning in setup if config doesn't exist 2013-07-03 16:00:23 +02:00
Michael Gapczynski
33e1ced53c Merge pull request #3911 from owncloud/fixing-unittests-master 
rename can cause mtime change - invalid assert
 2013-07-03 06:19:56 -07:00
Morris Jobke
56e91aa7b3 Merge pull request #3915 from owncloud/summary_as_last_filelist_entry 
Show a summary as the last filelist entry
 2013-07-03 04:17:17 -07:00
Björn Schießle
690323092e don't run hooks for .part files 2013-07-03 10:11:50 +02:00
Björn Schießle
04e4d9580f if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal 2013-07-03 10:11:37 +02:00
Jenkins for ownCloud
811cf02675 [tx-robot] updated from transifex 2013-07-03 02:04:16 +02:00
Victor Dubiniuk
41d37446bb Fallback to border instead of box-shadow 2013-07-02 18:47:02 +03:00
Victor Dubiniuk
16e5a1b100 Fix lazy styles loading in IE8 2013-07-02 18:44:10 +03:00
Björn Schießle
4c1820a2a1 Merge pull request #3858 from owncloud/more_ssl_error_messages 
add openssl_error_string() output to the owncloud.log
 2013-07-02 07:58:22 -07:00
Björn Schießle
4d4484fac1 Merge pull request #3870 from owncloud/reset_migration_status 
introduce pre-disable-app hook and first usage in files_encryption
 2013-07-02 07:26:48 -07:00
Jenkins for ownCloud
cec8384b1a [tx-robot] updated from transifex 2013-07-02 15:35:55 +02:00
Björn Schießle
3fc5b34247 Merge branch 'master' into encryption_check_php_version 
Conflicts:
	apps/files_encryption/files/error.php
 2013-07-02 13:54:31 +02:00
Björn Schießle
38ed00398f Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version 2013-07-02 13:49:49 +02:00
kondou
063b0a2d17 Don't escape filesize (can contain a '<') 2013-07-02 13:09:07 +02:00
Björn Schießle
40e6ede6a2 improved error message 2013-07-02 10:14:33 +02:00
Björn Schießle
29dd7eda2d improved error message 2013-07-02 10:11:42 +02:00
kondou
b1d0de95a9 Show a summary as the last filelist entry 
Fix #993
 2013-07-02 04:28:52 +02:00
kondou
2c4a9e0776 Add a "Wrong password." message, if the password 
for the public share was wrong.

Fix #2725
 2013-07-02 03:16:42 +02:00
Thomas Müller
e789e05675 on unit test use @expectedException 
some phpdoc added
 2013-07-02 00:15:42 +02:00
Thomas Müller
fbdf46b76e Merge pull request #3748 from owncloud/fixing-3740-master 
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
 2013-07-01 15:08:08 -07:00