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

5805 commits

Author SHA1 Message Date
Jenkins for ownCloud
096d7674fc [tx-robot] updated from transifex 2013-07-07 02:06:06 +02:00
Jenkins for ownCloud
c8ad3df1fa [tx-robot] updated from transifex 2013-07-06 02:08:38 +02:00
Thomas Müller
bc1c776642 Merge pull request #3951 from owncloud/fixing-3936-master 
get the real physical folder name for anonymous upload
 2013-07-05 14:43:47 -07:00
Thomas Müller
d14c5a3fa7 Merge pull request #3958 from owncloud/fixing-3933-master 
adding tipsy to the upload button showing the max upload and restoring c...
 2013-07-05 08:45:12 -07:00
Bart Visscher
c8d700c713 Merge pull request #3948 from owncloud/fixing-3934-master 
no anonymous upload on files only folders
 2013-07-05 08:21:45 -07:00
Björn Schießle
87063918f2 remove wrong closing bracket 2013-07-05 16:05:05 +02:00
Björn Schießle
9575c2f37c added helper function to escape glob pattern 
Conflicts:

	apps/files_encryption/lib/helper.php
 2013-07-05 16:03:20 +02:00
Björn Schießle
ec6350079f fix getUidAndFilename() test 2013-07-05 16:00:43 +02:00
Björn Schießle
15cb8e4efd only check for external mount points if the external storage app is enabled 2013-07-05 16:00:34 +02:00
Björn Schießle
ae30eb48f2 make trash bin aware of system wide mounts with respect to encryption keys 2013-07-05 16:00:25 +02:00
Björn Schießle
f9c337dd21 only escape glob pattern 2013-07-05 16:00:17 +02:00
Björn Schießle
93730a090b del share keys from correct location 2013-07-05 16:00:08 +02:00
Björn Schießle
af2cd6f541 always return normalized path 2013-07-05 15:59:57 +02:00
Björn Schießle
3043dbfb95 delete file keys from the correct location 2013-07-05 15:59:46 +02:00
Björn Schießle
abc2ee2e07 handle rename correctly for system wide mounts 2013-07-05 15:59:38 +02:00
Björn Schießle
eb2587a08f move isSystemWideMountPoint() to util.php 2013-07-05 15:59:29 +02:00
Björn Schießle
f2de4cb342 some performance improvements, check for system wide mounts only once while writing share keys 2013-07-05 15:59:19 +02:00
Björn Schießle
2e56f0e2f8 fix path to OC_Mount_Config 2013-07-05 15:59:06 +02:00
Björn Schießle
3e4dcafa89 handle system wide mount points 2013-07-05 15:58:55 +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
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
Thomas Müller
0c32f66899 get the real physical folder name for anonymous upload 2013-07-05 12:15:47 +02:00
Thomas Müller
13991be5ce no anonymous upload on files only folders 2013-07-05 10:53:59 +02:00
Jenkins for ownCloud
955646c461 [tx-robot] updated from transifex 2013-07-05 02:21:23 +02: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
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
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
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
kondou
65bcedfbbe Use better wording. 2013-07-03 20:13:10 +02: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
Jenkins for ownCloud
811cf02675 [tx-robot] updated from transifex 2013-07-03 02:04:16 +02: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
5fff4e0d08 Merge pull request #3903 from owncloud/nonpublic-uploading 
Fix upload regressions
 2013-07-01 12:35:32 -07:00
Thomas Müller
3b1018ec00 no ?> at the end of a file 
missing .
 2013-07-01 21:13:04 +02:00
Thomas Müller
a7f2563990 typo 2013-07-01 21:12:21 +02:00