Bjoern Schiessle
|
853b106bb2
|
don't create empty versions
|
2013-07-30 16:01:27 +02:00 |
Bjoern Schiessle
|
a212c98125
|
handle error if we can't handle the given path
|
2013-07-30 15:27:59 +02:00 |
Bjoern Schiessle
|
a6ced6b53f
|
remove unused method, the right one is in util.php
|
2013-07-30 14:28:24 +02:00 |
Bjoern Schiessle
|
aca7fbe2c8
|
adapt unit tests to the modified stream wrapper
|
2013-07-30 14:18:01 +02:00 |
Bjoern Schiessle
|
6f20e081e4
|
added missing isEmpty ajax file
|
2013-07-30 12:48:41 +02:00 |
Bjoern Schiessle
|
3640c99462
|
encrypt/decrypt file versions
|
2013-07-30 12:19:04 +02:00 |
Bjoern Schiessle
|
22b8967031
|
check if app is enabled
|
2013-07-30 12:19:01 +02:00 |
Jan-Christoph Borchardt
|
1a1c100719
|
fix loading.gif size for both upload and deletion, force visiblity
|
2013-07-30 10:44:01 +02:00 |
Bjoern Schiessle
|
ba18452eda
|
only write keyfiles if it was a new file, otherwise nothing changed
|
2013-07-30 10:43:16 +02:00 |
Bjoern Schiessle
|
223d3c91d6
|
use path relative to data/
|
2013-07-30 10:14:17 +02:00 |
Bjoern Schiessle
|
a7a7ef2b3a
|
improved error handling
|
2013-07-30 09:48:30 +02:00 |
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
Victor Dubiniuk
|
33fe24dc3d
|
Replace delete icon with spinner
|
2013-07-29 19:27:11 +03:00 |
Victor Dubiniuk
|
a10a17f818
|
Rewording
|
2013-07-29 18:25:17 +03:00 |
Björn Schießle
|
7f9795cc3d
|
Merge pull request #4203 from owncloud/trashbin_improvements
Trashbin improvements
|
2013-07-29 08:15:53 -07:00 |
Bjoern Schiessle
|
4a9f5f64da
|
remove whitespaces
|
2013-07-29 17:15:20 +02:00 |
Bjoern Schiessle
|
b6fa0e4eef
|
working decrypt files method
|
2013-07-29 17:06:05 +02:00 |
Victor Dubiniuk
|
dec7b2fa40
|
Move styles from core to app
|
2013-07-29 17:36:59 +03:00 |
Victor Dubiniuk
|
97f2c393c1
|
Allow apps to have own 404 content, closes #3225
|
2013-07-29 16:54:19 +03:00 |
Björn Schießle
|
e15e394fcc
|
add ajax call to decrypt all files
Conflicts:
apps/files_encryption/lib/crypt.php
|
2013-07-29 13:39:05 +02:00 |
Björn Schießle
|
2c8e5ec84f
|
user interface to allow user to decrypt all his files once the encryption app was disabled
Conflicts:
settings/templates/personal.php
|
2013-07-29 13:36:06 +02:00 |
Jenkins for ownCloud
|
0fde473cb7
|
[tx-robot] updated from transifex
|
2013-07-29 01:57:04 -04:00 |
Jenkins for ownCloud
|
48621115c1
|
[tx-robot] updated from transifex
|
2013-07-28 01:58:28 -04:00 |
Jenkins for ownCloud
|
fa35650e0a
|
[tx-robot] updated from transifex
|
2013-07-27 02:03:03 -04:00 |
Björn Schießle
|
0a9bb8ba73
|
reduce time for auto expire to 30 days by default
|
2013-07-26 15:15:47 +02:00 |
Björn Schießle
|
efd8ad6696
|
found some more places where we can disable buttons while performing a action
|
2013-07-26 14:54:27 +02:00 |
Björn Schießle
|
9d24b9c7e8
|
Hide Delete Permanently button when Restore happens
|
2013-07-26 13:17:09 +02:00 |
Björn Schießle
|
a5d9b985c3
|
make 'restored' extension translatable
|
2013-07-26 12:01:45 +02:00 |
Björn Schießle
|
3354249691
|
fix typo
|
2013-07-26 11:51:18 +02:00 |
Björn Schießle
|
0182a503a6
|
expire trash bin if trash bin exceeds max size after a new file was added to ownCloud
|
2013-07-26 11:45:38 +02:00 |
Björn Schießle
|
a00cff7c05
|
disable "deleted files" button if trash bin is empty
|
2013-07-26 11:14:29 +02:00 |
Björn Schießle
|
96e175ffbf
|
don't move empty folders to the trash bin
|
2013-07-25 16:27:40 +02:00 |
Björn Schießle
|
bf668eb14f
|
nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored'
|
2013-07-25 16:20:06 +02:00 |
Robin Appelman
|
88cc2ccb3b
|
use renamed constants
|
2013-07-25 16:14:46 +02:00 |
Björn Schießle
|
62f84ff79c
|
css for button no longer needed
|
2013-07-25 12:29:39 +02:00 |
Björn Schießle
|
e5b0c1e78b
|
remove unused code; use jquery
|
2013-07-25 11:15:24 +02:00 |
Björn Schießle
|
16d8074d77
|
fix css
|
2013-07-25 11:15:01 +02:00 |
Björn Schießle
|
9394fc5d4a
|
new version drop down
Squashed commit of the following:
commit 0dc404a557fa8253e3a87c7babefba6de8e6dab5
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 25 10:26:48 2013 +0200
fix 'more versions' button for IE8
commit 5836e652857204d68dfdfa8b3318de8e2fe02493
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:56:46 2013 +0200
clean-up some unused code
commit ac83e53fa24073783a165796fc3016dc7beca293
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:49:03 2013 +0200
fix order of the versions, newest version should come first
commit f150a88843af316ff505728941287406f25a0751
Merge: bc713c7 b8e399b
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 16:19:36 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit bc713c7b0c3207d00d2f19b10a905a82724c0709
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 16:11:07 2013 +0200
fix position of more versions button
commit b8e399b1754ae7656c3cb8cef2c53f6976a83d61
Merge: 24825b0 7b6e39d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:04:08 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit 24825b02004efa953197e72b470b9b033030aeee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:02:53 2013 +0200
umark previous row if a new row gets selected
commit 7b6e39d2939f1b3bba4fff37ca9087dbc7795f03
Merge: 5bfb0ac 7b54644
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:37:19 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit 5bfb0ac5c102bdfd3b27a37cea8c792f69b3b803
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:37:09 2013 +0200
more style adjustments for version dropdown
commit 7b54644d3036ffba448f0525ca09f6e8898b9950
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 15:12:53 2013 +0200
remove debug output
commit a75662bcfdce34d4f14020a539172c7ef1b894d3
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:12:26 2013 +0200
reword Revert to Restore
commit e784644daeac12bc6fa6844f24214a039266ae86
Merge: d07abfd 9978c96
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 15:00:11 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit d07abfdbb49778a8be30b2a6adbe326e1b1f238f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 14:59:17 2013 +0200
if another drop-down is already open, always close it first
commit 9978c967a6ecbd2d0e5003df3cf4cdba09dab468
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:49:47 2013 +0200
more style improvements for versions
commit a13355f16e6172c02069930a60a49aba4ebfa227
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:44:13 2013 +0200
position fixes for versioning
commit 02c1d6b5eabc4075749c2a7a852c9ed7bbb3644d
Merge: c5a9462 203f544
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:31:16 2013 +0200
merge versions style changes
commit c5a946231a3d011748248db13b6b95ce51eb3e4c
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:29:56 2013 +0200
bigger clickable area for versions
commit 203f544825bd49b168f2316cf2a04caca75438c8
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 14:15:38 2013 +0200
changes visual changes, as suggested by Jan
commit 90b1e93676d235a61f318768661b25e5815a9784
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:12:23 2013 +0200
remove superfluous selector from ID
commit 9768254fe3b2469293fca23151e54cde69bd4661
Merge: c961278 b91c682
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 12:28:06 2013 +0200
Merge branch 'master' into new_versions_dropdown
commit c9612781e10a4de9e9405244f87c4e29428a0d3f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 11:05:25 2013 +0200
replace modal dialog with a OC.Notification
commit 3dc7508a4c271818247afbaed0ce0b03706a8db6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 10:33:05 2013 +0200
use image path without extension for proper svg to png fallback
commit 23ea7ad46c73fa4b86021070eb58a3b92bc8362e
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 23 17:53:58 2013 +0200
some css fixes
commit 8d01499ae17e43a7d7960841a7c2127fa6de5a56
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 23 17:40:16 2013 +0200
small fixes and improvements according to @Kondou-ger comments
commit 985b6461e81035967959659fab8ea59c733e00eb
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 23 15:58:19 2013 +0200
replace == with ===
commit bc8fc3b4a664db2d819e0a7091f31207ffcfe44a
Merge: c1da183 a94c55b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 23 13:55:45 2013 +0200
Merge branch 'master' into new_versions_dropdown
commit c1da183d13b8098eb33e708d4fdd04111bdc33a5
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 23 13:53:37 2013 +0200
translate timestamps into strings like "X minutes ago" for the versions drop-down
commit c78d2b4bfb0a6800ab8516ac115ba42268be019a
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 23 12:52:44 2013 +0200
download versions directly from the versions drop-down
commit 14aaf9907625fc76bc153cd846704b7efd15db46
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 23 11:01:21 2013 +0200
only show 'more versions' button of necessary
commit a0d8cb46b2255be3d9b3f9bd5f835a173c9665b8
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 22 17:49:17 2013 +0200
remove unneeded code
commit 47eec0679ce16ece0b7890e9b41bf28d7613b131
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 22 17:44:58 2013 +0200
add title for revert and download action
commit df87ccb24327b5c2770f7c23c97e41b143d65ec3
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 22 17:36:40 2013 +0200
add download button to versions drop-down
commit 622c87ec37c14b7b3237bc9ca980b7f35689a933
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 22 17:36:08 2013 +0200
adapt css file for the new versions drop-down
commit 300699024fe74a9f0f998c1cce4024484311f50c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Fri Jun 7 17:28:34 2013 +0200
revert on click
commit 6673ae6ed45bbda1e0d962e9b32e943afc7123c0
Author: Björn Schießle <schiessle@owncloud.com>
Date: Fri Jun 7 16:50:08 2013 +0200
new versions list, show the latest 5 with a button to retrieve more versions if needed
|
2013-07-25 10:35:19 +02:00 |
kondou
|
92af840a51
|
Merge branch 'master' into css_cleanup_kondou
Conflicts:
core/css/styles.css
settings/templates/personal.php
|
2013-07-24 20:35:00 +02:00 |
icewind1991
|
1986416248
|
Merge pull request #3898 from owncloud/sabre-objecttree
WebDAV performance improvements
|
2013-07-24 10:46:27 -07:00 |
Robin Appelman
|
79832e9382
|
use output buffering when including the irods libraries
|
2013-07-24 16:10:14 +02:00 |
Robin Appelman
|
ad266a4253
|
Merge branch 'master' into sabre-objecttree
|
2013-07-24 15:53:48 +02:00 |
Björn Schießle
|
003ae7b916
|
use OC_Defaults directly from the template
|
2013-07-24 12:04:18 +02:00 |
Björn Schießle
|
d70bb55e1b
|
Merge branch 'master' into move_defaults_to_template_constructor
|
2013-07-24 11:58:11 +02:00 |
Björn Schießle
|
75fd6d4fde
|
initialize OC_Defaults in template constructorX
|
2013-07-24 11:51:21 +02:00 |
Thomas Müller
|
9d91ceade4
|
fix php syntax
|
2013-07-24 10:49:33 +02:00 |
Thomas Müller
|
1a73e607bd
|
Merge branch 'master' into more-themable-strings
Conflicts:
lib/template.php
|
2013-07-24 09:35:33 +02:00 |
Bart Visscher
|
7ad38535e5
|
Merge pull request #3392 from owncloud/googledrive
Switch to using Google Drive SDK, closes #2047
|
2013-07-23 12:23:08 -07:00 |
Jörn Friedrich Dreyer
|
7242480049
|
use $defaults->getName() as webdav REALM
|
2013-07-23 18:14:05 +02:00 |
Michael Gapczynski
|
c904504365
|
Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing
|
2013-07-23 10:50:14 -04:00 |
Thomas Müller
|
2a42021815
|
Merge branch 'master' into delete-fix
Conflicts:
core/css/styles.css
|
2013-07-23 16:24:34 +02:00 |
Jenkins for ownCloud
|
a94c55be98
|
[tx-robot] updated from transifex
|
2013-07-23 02:03:19 -04:00 |
Thomas Müller
|
6ddad8dc49
|
Merge pull request #4126 from owncloud/parallel-autotest.sh-master
Parallel autotest.sh master
|
2013-07-22 14:48:49 -07:00 |
Thomas Müller
|
57d178274d
|
Merge pull request #3142 from owncloud/ext-fs-irods-master
Ext fs irods master
|
2013-07-22 05:16:49 -07:00 |
Thomas Müller
|
840e96cda3
|
Merge branch 'master' into disable-anon-upload-master
Conflicts:
settings/templates/admin.php
|
2013-07-22 11:55:20 +02:00 |
Thomas Müller
|
7b28f5a82c
|
Merge branch 'master' into ext-fs-irods-master
|
2013-07-22 11:40:28 +02:00 |
Thomas Müller
|
6e2418141d
|
Merge branch 'master' into parallel-autotest.sh-master
|
2013-07-22 11:39:27 +02:00 |
Thomas Müller
|
934f2e94a3
|
Merge branch 'master' into disable-anon-upload-master
|
2013-07-22 11:36:52 +02:00 |
Thomas Müller
|
a2cdf8b91e
|
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
reworking of \OC\Files\Storage\AmazonS3
|
2013-07-22 02:19:27 -07:00 |
Jan-Christoph Borchardt
|
dba4111aa0
|
fix delete button not showing in IE8
|
2013-07-22 11:18:51 +02:00 |
Björn Schießle
|
da892d69ab
|
if the file doesn't exists; create a new one. We use this to create new text files in the web interface
|
2013-07-22 09:15:19 +02:00 |
Jenkins for ownCloud
|
01f3f8e0cc
|
[tx-robot] updated from transifex
|
2013-07-22 02:03:23 -04:00 |
Bart Visscher
|
37a731bcad
|
Merge pull request #4131 from owncloud/scanner-split
Remove scanner logic from ajax file and place it in it's own class
|
2013-07-21 11:32:11 -07:00 |
Morris Jobke
|
f54f203e56
|
mark test as incomplete because I can't reproduce jenkins failure
|
2013-07-21 11:28:06 +02:00 |
Morris Jobke
|
647e0a0cba
|
Merge pull request #4118 from owncloud/remove-size-experiment
finally remove the file size obfuscation as it had more disadvantages.
|
2013-07-21 01:25:39 -07:00 |
Jenkins for ownCloud
|
9a13b687cc
|
[tx-robot] updated from transifex
|
2013-07-21 02:02:41 -04:00 |
Thomas Müller
|
ae9b60ba61
|
Merge pull request #4119 from owncloud/external-storage-status
replace external storage status images with CSS, also use form to distinguish
|
2013-07-19 13:54:19 -07:00 |
Arthur Schiwon
|
f6d133955e
|
LDAP: fix background job, resolves #3528
|
2013-07-19 18:41:29 +02:00 |
Robin Appelman
|
2b89b7c880
|
Split scanning logic from ajax file
|
2013-07-19 16:44:47 +02:00 |
Thomas Müller
|
20ee9945d1
|
don't rely on admin user but create a test user for Test_Encryption_Keymanager
|
2013-07-19 14:54:10 +02:00 |
Jenkins for ownCloud
|
ae82f7fd17
|
[tx-robot] updated from transifex
|
2013-07-19 02:03:14 -04:00 |
Andreas Fischer
|
2c38c2a70e
|
Merge pull request #3947 from runky/patch-1
* runky/patch-1:
Update authenticate.php
|
2013-07-19 02:19:14 +02:00 |
Jan-Christoph Borchardt
|
100eb2b611
|
replace external storage status images with CSS, also use form to distinguish, fix #3910
|
2013-07-18 23:00:04 +02:00 |
Jan-Christoph Borchardt
|
48948ccf5f
|
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
|
2013-07-18 22:15:26 +02:00 |
Jan-Christoph Borchardt
|
4bfd61fb7f
|
use new delete icon for deleted files as well
|
2013-07-18 18:46:37 +02:00 |
Jan-Christoph Borchardt
|
8a25d1ad06
|
remove unnecessary tipsy for Files delete
|
2013-07-18 18:41:01 +02:00 |
Jan-Christoph Borchardt
|
197c979d26
|
use background image instead of img for Files delete icon
|
2013-07-18 18:40:09 +02:00 |
Jenkins for ownCloud
|
279a71acb3
|
[tx-robot] updated from transifex
|
2013-07-18 02:02:51 -04:00 |
Jenkins for ownCloud
|
210006c4a6
|
[tx-robot] updated from transifex
|
2013-07-17 02:28:02 -04:00 |
Thomas Müller
|
5cba09e931
|
fixing / adding comments
|
2013-07-16 11:35:48 +02:00 |
Thomas Müller
|
9c0bf5c41a
|
Merge branch 'master' into ext-fs-irods-master
|
2013-07-16 11:30:56 +02:00 |
Jenkins for ownCloud
|
a8acbfdf7b
|
[tx-robot] updated from transifex
|
2013-07-16 02:06:21 -04:00 |
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 |