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
|
4e04a710b6
|
Merge pull request #3955 from owncloud/cache-scanner-test
Scanner test: ensure mtime in the cache is the same as on the storage to...
|
2013-07-05 10:11:58 -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 |
Thomas Müller
|
f8dae11a23
|
Merge pull request #3957 from owncloud/config-glob-fail
OC_Config: handle failure of glob('*.config.php')
|
2013-07-05 07:38:04 -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
|
18b11f76b1
|
fixing === and ident
|
2013-07-05 15:27:14 +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 |
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 |
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
|
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 |
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 |
Jenkins for ownCloud
|
955646c461
|
[tx-robot] updated from transifex
|
2013-07-05 02:21:23 +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 |
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 |
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 |
kondou
|
aa7d8edd14
|
Suppress warning in setup if config doesn't exist
|
2013-07-03 16:00:23 +02:00 |