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

12546 commits

This branch
This branch
All branches
Author SHA1 Message Date
Björn Schießle
3e4dcafa89 handle system wide mount points 2013-07-05 15:58:55 +02:00
Jörn Friedrich Dreyer
212ea0508d update comment 2013-07-05 15:39:57 +02:00
Bart Visscher
22c29eb64b Fix renaming using parenthesis 2013-07-05 15:38:09 +02:00
Thomas Müller
18b11f76b1 fixing === and ident 2013-07-05 15:27:14 +02:00
Robin Appelman
492a35737c fix \OC\Config test cases when debug mode is enabled 2013-07-05 15:26:39 +02:00
Robin Appelman
f29dd1c784 fix test case whitespace 2013-07-05 15:25:53 +02:00
Robin Appelman
c1cf829b9d OC_Config: handle failure of glob('*.config.php') 2013-07-05 15:07:15 +02:00
Thomas Müller
0c2ebb984e adding tipsy to the upload button showing the max upload and restoring client side upload size validation 2013-07-05 15:07:05 +02:00
Robin Appelman
3f5eb762b6 Scanner test: ensure mtime in the cache is the same as on the storage to prevent random failures 2013-07-05 14:51:22 +02:00
Jörn Friedrich Dreyer
00987feda1 fix insertIfNotExist return value, update doc and corresponding test 2013-07-05 14:05:42 +02:00
Thomas Müller
59b700a550 Merge branch 'master' into fixing-3934-master 
Conflicts:
	core/js/share.js
 2013-07-05 13:52:33 +02:00
Thomas Müller
352c1415be proper fix for getting the shared item if no user is logged in 2013-07-05 13:45:21 +02:00
Thomas Müller
d1d6885585 php 5.3 compliant now 2013-07-05 13:22:38 +02:00
Bart Visscher
424ec94680 Make buildNotExistingFileName testable and write unittests 2013-07-05 13:03:01 +02:00
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