Thomas Müller
|
79d23463f8
|
No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
|
2013-07-14 21:58:08 +02:00 |
|
Jenkins for ownCloud
|
29d8ae2f95
|
[tx-robot] updated from transifex
|
2013-07-14 02:10:41 +02:00 |
|
Michael Gapczynski
|
00e2b46017
|
Fix 'most' Google Drive tests
|
2013-07-13 11:02:07 -04:00 |
|
Frank Karlitschek
|
ccb3c5b428
|
Removed the preview warning. This is only a simple text change
|
2013-07-13 13:31:55 +02:00 |
|
Jenkins for ownCloud
|
583addaea1
|
[tx-robot] updated from transifex
|
2013-07-13 02:07:35 +02:00 |
|
Thomas Müller
|
c3e16a7388
|
fixing Undefined index: publicUploadEnabled
|
2013-07-12 17:51:01 +02:00 |
|
Thomas Müller
|
5f5700e353
|
in case the encryption app is enabled we cannot yet allow anonymous upload
|
2013-07-12 17:05:58 +02:00 |
|
Thomas Müller
|
fc2d538311
|
new admin setting added which allows to turn off anonymous uploads
|
2013-07-12 17:03:51 +02:00 |
|
Thomas Müller
|
d1c0564711
|
Merge branch 'master' into ext-fs-irods-master
|
2013-07-12 15:30:01 +02:00 |
|
Thomas Müller
|
ca16c08ba1
|
update copy right
|
2013-07-12 15:28:01 +02:00 |
|
Thomas Müller
|
01378e1907
|
incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp
|
2013-07-12 15:08:13 +02:00 |
|
Kondou
|
8ae2066b20
|
Merge pull request #4037 from owncloud/add_new_file_above_summary
add new file above summary if it is the first file in the list
|
2013-07-12 03:45:45 -07:00 |
|
Björn Schießle
|
b16c5a6df7
|
fix array access and change variable names according to the coding style
|
2013-07-12 11:25:40 +02:00 |
|
Björn Schießle
|
15f7bb296c
|
continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota
|
2013-07-12 11:25:31 +02:00 |
|
Björn Schießle
|
fbf34f3bf6
|
fix some var names according to our style guide
|
2013-07-12 11:25:23 +02:00 |
|
Björn Schießle
|
2f0d88cae4
|
adjust comments
|
2013-07-12 11:25:12 +02:00 |
|
Björn Schießle
|
e7959d3da0
|
fix typo in comment
|
2013-07-12 11:25:04 +02:00 |
|
Björn Schießle
|
e8760d7284
|
also expire versions on rename, to update the history more regularly
|
2013-07-12 11:24:52 +02:00 |
|
Björn Schießle
|
d6c1e5490d
|
it is enough to call the expire function once
|
2013-07-12 11:24:31 +02:00 |
|
Björn Schießle
|
e159143165
|
call expire function before writing the new version to make sure to have enough free space
|
2013-07-12 11:24:19 +02:00 |
|
Björn Schießle
|
cb81ceb31d
|
add new file above summary if it is the first file in the list
|
2013-07-12 10:40:24 +02:00 |
|
Thomas Müller
|
481bb831bb
|
Merge branch 'master' into ext-fs-irods-master
|
2013-07-12 09:54:39 +02:00 |
|
Thomas Müller
|
24b4806af4
|
Merge branch 'master' into googledrive
|
2013-07-12 09:43:04 +02:00 |
|
Jenkins for ownCloud
|
3fbf7ab189
|
[tx-robot] updated from transifex
|
2013-07-12 02:12:25 +02:00 |
|
Jan-Christoph Borchardt
|
83b2411b81
|
reword LDAP config and use themable strings, fix rest of #3791
|
2013-07-11 17:45:13 +02:00 |
|
Jan-Christoph Borchardt
|
30ab6580f6
|
reword WebDAV auth to not have 'ownCloud' anymore
|
2013-07-11 17:42:16 +02:00 |
|
Jan-Christoph Borchardt
|
aacca494c5
|
introduce shortname themable string and split from title, use for image alt text
|
2013-07-11 16:38:07 +02:00 |
|
Jenkins for ownCloud
|
f74659f3f6
|
[tx-robot] updated from transifex
|
2013-07-11 02:26:22 +02:00 |
|
Jan-Christoph Borchardt
|
a9072056a0
|
Merge pull request #3990 from owncloud/size-mb
add MB indicator to size heading, fix #3987
|
2013-07-10 08:42:05 -07:00 |
|
Christian Berendt
|
c772a6479d
|
stripping services from AWS SDK
|
2013-07-10 16:38:34 +02:00 |
|
Christian Berendt
|
9965eb0295
|
fixing style issues
|
2013-07-10 16:12:48 +02:00 |
|
Christian Berendt
|
4fdf279395
|
use === instead of ==
|
2013-07-10 16:09:22 +02:00 |
|
Christian Berendt
|
a8b2aa34a4
|
remove uneeded calls to touch
|
2013-07-10 16:07:41 +02:00 |
|
Jan-Christoph Borchardt
|
3fb3a7baa8
|
add MB indicator to size heading, fix #3987
|
2013-07-10 13:52:55 +02:00 |
|
Arthur Schiwon
|
5387e5c354
|
LDAP: even better check for emptiness, fixes #3815
|
2013-07-10 11:39:47 +02:00 |
|
Christian Berendt
|
203df66c00
|
rewrote initialisation, added testing workaround
|
2013-07-10 07:47:15 +02:00 |
|
kondou
|
70b4f85911
|
Use isIgnoredDir()
|
2013-07-10 02:36:43 +02:00 |
|
kondou
|
2f11f56d32
|
Use !== and === in files_trashbin-app
|
2013-07-10 02:34:00 +02:00 |
|
Jenkins for ownCloud
|
7ec6f3bde9
|
[tx-robot] updated from transifex
|
2013-07-10 02:20:59 +02:00 |
|
Victor Dubiniuk
|
257096f1d4
|
Encode current trashbin directory
|
2013-07-09 17:46:11 +03:00 |
|
Victor Dubiniuk
|
582631323a
|
Migrate to encodePath
|
2013-07-09 17:46:11 +03:00 |
|
kondou
|
4818e0062e
|
General CSS cleanup
|
2013-07-09 16:08:32 +02:00 |
|
Jenkins for ownCloud
|
439cad07b5
|
[tx-robot] updated from transifex
|
2013-07-09 02:12:22 +02:00 |
|
Christian Berendt
|
020803aa7e
|
minimize waiting time
|
2013-07-08 16:06:08 +02:00 |
|
Christian Berendt
|
deda583fad
|
wait methods are probably not working, just wait
|
2013-07-08 15:56:56 +02:00 |
|
Jan-Christoph Borchardt
|
8d8f99fbc4
|
Merge pull request #3757 from owncloud/icon-cleanup
Icon cleanup
|
2013-07-08 06:56:29 -07:00 |
|
Christian Berendt
|
83a1fce1a3
|
make tests workable with Amazon S3
|
2013-07-08 15:25:49 +02:00 |
|
Christian Berendt
|
882d5ad728
|
added exception messages
|
2013-07-08 15:10:10 +02:00 |
|
Christian Berendt
|
fdeb21ba5b
|
wait until bucket exists after the creation
|
2013-07-08 15:00:07 +02:00 |
|
Christian Berendt
|
911e947fd7
|
check if used bucket name is valid
|
2013-07-08 14:59:09 +02:00 |
|
Christian Berendt
|
dc8ca00f1e
|
fixed syntax error
|
2013-07-08 13:26:41 +02:00 |
|
Thomas Müller
|
0365d244e0
|
Merge pull request #3946 from owncloud/fixing-3942-master
handle anonymous upload to reshared folder
|
2013-07-08 02:27:21 -07:00 |
|
Christian Berendt
|
d59291a8e7
|
remove needless check
|
2013-07-08 11:16:58 +02:00 |
|
Christian Berendt
|
0bc28dcb95
|
replaced substr with trim
|
2013-07-08 11:14:47 +02:00 |
|
Christian Berendt
|
adf0fe880c
|
removed aws.phar and added extracted zip instead
|
2013-07-08 11:11:07 +02:00 |
|
Jenkins for ownCloud
|
3cb4a72960
|
[tx-robot] updated from transifex
|
2013-07-08 02:09:41 +02:00 |
|
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
|
c956a08d22
|
fixing check if public share is a folder or not
|
2013-07-06 00:12:29 +02:00 |
|
Thomas Müller
|
dad91c156f
|
Merge branch 'master' into fixing-3942-master
Conflicts:
apps/files/ajax/upload.php
|
2013-07-06 00:02:11 +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 |
|
Thomas Müller
|
e159cbf527
|
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
|
2013-07-05 17:39:41 +02: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
|
0202d47f7a
|
fixing Notice: Undefined index: isPublic
|
2013-07-05 11:30:53 +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 |
|
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 |
|
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 |
|
Christian Berendt
|
b3d6517c62
|
use us-west-1 as default region for Amazon S3
|
2013-07-03 18:56:51 +02:00 |
|
Christian Berendt
|
839ab7f2e6
|
fixing rmdir in \OC\Files\Storage\AmazonS3
|
2013-07-03 18:33:15 +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 |
|
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 |
|
Björn Schießle
|
d5c4854708
|
cast result to bool
|
2013-07-01 17:18:16 +02:00 |
|
Robin Appelman
|
492c0571a0
|
fix detection of public upload in filelist.js
|
2013-07-01 15:47:40 +02:00 |
|
Robin Appelman
|
86342224da
|
fix uploading when ['dirtoken'] is not set
|
2013-07-01 15:39:11 +02:00 |
|
Robin Appelman
|
e55ed10b0d
|
code style
|
2013-07-01 15:37:52 +02:00 |
|
Björn Schießle
|
9512382ae0
|
fix error string
|
2013-07-01 12:24:21 +02:00 |
|
Björn Schießle
|
16a719173f
|
add correct php version
|
2013-07-01 12:23:26 +02:00 |
|
Björn Schießle
|
adcee5b695
|
check php version, the encryption app needs php >= 5.3.3
|
2013-07-01 12:16:36 +02:00 |
|
Björn Schießle
|
d97d00fe0f
|
add logo claim to defaults.php
|
2013-07-01 10:48:13 +02:00 |
|
Björn Schießle
|
aead759f47
|
logo claim added
|
2013-07-01 10:48:02 +02:00 |
|
Björn Schießle
|
23cc69b816
|
construct the foother in defaults.php so that we use always the same footer
Conflicts:
settings/templates/admin.php
|
2013-07-01 10:46:00 +02:00 |
|
Morris Jobke
|
b19033b353
|
Merge pull request #3223 from owncloud/fix-2820
if rename of file fails, the rename is undone in the view - fix 2820
|
2013-07-01 01:28:17 -07:00 |
|
Jenkins for ownCloud
|
80a8b9c995
|
[tx-robot] updated from transifex
|
2013-07-01 03:28:25 +02:00 |
|
Robin Appelman
|
1e0810e807
|
use new ObjectTree in sabredav
|
2013-06-30 18:37:47 +02:00 |
|
Jenkins for ownCloud
|
4d74e8955f
|
[tx-robot] updated from transifex
|
2013-06-30 02:13:07 +02:00 |
|
Jenkins for ownCloud
|
d2f50bc089
|
[tx-robot] updated from transifex
|
2013-06-29 02:09:10 +02:00 |
|
Thomas Müller
|
dfa6aa25c3
|
Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master
for now we disable public upload in case encryption is enabled
|
2013-06-28 13:59:33 -07:00 |
|
Bart Visscher
|
e3df2b8c87
|
Merge pull request #1044 from owncloud/fix_extra_slash
Remove duplicate / for first folder in root
|
2013-06-28 12:00:35 -07:00 |
|
Bart Visscher
|
89dc8be9f5
|
update to !==
|
2013-06-28 21:00:09 +02:00 |
|
Thomas Mueller
|
f726de3cab
|
for now we disable public upload in case encryption is enabled
|
2013-06-28 16:49:25 +02:00 |
|
Jörn Friedrich Dreyer
|
7d3490036c
|
Merge pull request #3838 from rgeber/master
Public Upload Feature
|
2013-06-28 07:30:41 -07:00 |
|
Bart Visscher
|
b1a2ddd149
|
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
Fix pdo statement wrapper numrows on modification
|
2013-06-28 07:15:38 -07:00 |
|
Thomas Mueller
|
e7d50617d7
|
Merge branch 'master' into ext-fs-irods-master
|
2013-06-28 09:22:48 +02:00 |
|
Jenkins for ownCloud
|
6127fee5aa
|
[tx-robot] updated from transifex
|
2013-06-28 02:04:58 +02:00 |
|
Björn Schießle
|
2e6ebe1ab4
|
fix function documentation
|
2013-06-27 14:14:25 +02:00 |
|
Björn Schießle
|
c4aef89278
|
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
|
2013-06-27 14:09:22 +02:00 |
|
Jenkins for ownCloud
|
29caae3491
|
[tx-robot] updated from transifex
|
2013-06-27 02:12:00 +02:00 |
|
Roman Geber
|
da0caadf4e
|
Added file-upload to GIT repo
Optimized CSS identifiers
|
2013-06-26 22:51:38 +02:00 |
|
Björn Schießle
|
5a20c8b66f
|
add openssl_error_string() output to the owncloud.log
|
2013-06-26 15:51:22 +02:00 |
|
Jenkins for ownCloud
|
afc3d9314a
|
[tx-robot] updated from transifex
|
2013-06-26 02:07:04 +02:00 |
|
Roman Geber
|
ddb0ff346d
|
Public upload feature
|
2013-06-25 12:24:14 +02:00 |
|
Jenkins for ownCloud
|
c3b8f2bf64
|
[tx-robot] updated from transifex
|
2013-06-25 02:13:40 +02:00 |
|