Thomas Müller
|
0c32f66899
|
get the real physical folder name for anonymous upload
|
2013-07-05 12:15:47 +02:00 |
Jörn Friedrich Dreyer
|
9c855f7b3d
|
Merge pull request #3950 from owncloud/fixing-3941-master
no anonymous upload on read-only folders
|
2013-07-05 03:01:56 -07:00 |
Thomas Müller
|
0202d47f7a
|
fixing Notice: Undefined index: isPublic
|
2013-07-05 11:30:53 +02:00 |
Thomas Müller
|
27c0cc7fda
|
no anonymous upload on read-only folders
|
2013-07-05 11:23:08 +02:00 |
Thomas Müller
|
13991be5ce
|
no anonymous upload on files only folders
|
2013-07-05 10:53:59 +02:00 |
runky
|
6c868a9b5c
|
Update authenticate.php
Fix 'Undefined index: wrongpw' error
|
2013-07-05 10:37:24 +02:00 |
Björn Schießle
|
83898e87be
|
Merge https://github.com/owncloud/core/pull/3900
Squashed commit of the following:
commit a34098427720c2d0470367cd9698c184d85b8dfd
Merge: ccf849b 955646c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Fri Jul 5 09:59:29 2013 +0200
Merge branch 'master' into theme_aware_mail_footer
commit ccf849bc6f18d80cdb593e851529b87579fe072b
Merge: 8d5fb70 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:03:47 2013 +0200
Merge branch 'master' into theme_aware_mail_footer
commit 8d5fb70e6dcb2e2e34dcdf2a883680ef034afeea
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 10:38:39 2013 +0200
switch to non-static defaults.php
commit 88ab2768dcc4ced12c48872c887baa94ad938d62
Merge: e199df8 84c25f9
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 3 16:59:48 2013 +0200
Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer
Conflicts:
core/templates/altmail.php
commit e199df844b5faf80a36d8380a5b0b58025cd425f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 3 16:56:29 2013 +0200
name and slogan should be in one line
commit 84c25f9853e1bfbe4ae780371b1353aafb6b15c2
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon Jul 1 21:15:35 2013 +0200
no ?> at the end of a file
commit 3bd8d38d011f62ce78bcd0c108eb8cf2ce97eb99
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 12:58:36 2013 +0200
print url unescaped
commit d304ed18c8b7350e92e24565b9b9ba77b519d74c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 12:56:05 2013 +0200
make new mail templates aware of different ownCloud themes
|
2013-07-05 10:07:23 +02:00 |
Thomas Müller
|
11172db55b
|
handle anonymous upload to reshared folder
|
2013-07-05 09:58:41 +02:00 |
Jenkins for ownCloud
|
955646c461
|
[tx-robot] updated from transifex
|
2013-07-05 02:21:23 +02:00 |
Jan-Christoph Borchardt
|
b9be693305
|
change delete from entry forbidden sign to proper icon
|
2013-07-05 01:51:09 +02:00 |
Raghu Nayyar
|
b2afbe0e8b
|
Merge pull request #3927 from owncloud/Fix_new_user_empty_group
Do not add groups if user has no groups
|
2013-07-04 11:50:19 -07:00 |
Morris Jobke
|
47058b1904
|
Merge pull request #3932 from owncloud/fix_label_position
fix position of 'user shared the folder foldername with you' label
|
2013-07-04 11:03:42 -07:00 |
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 |