]>
source.dussan.org Git - nextcloud-server.git/log
Vincent Petry [Tue, 10 Dec 2013 11:40:59 +0000 (12:40 +0100)]
Added workaround for Android content disposition
Fixes #5807
Vincent Petry [Tue, 10 Dec 2013 11:05:39 +0000 (12:05 +0100)]
Moved content disposition code+workarounds to OCP\Response
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
blizzz [Mon, 9 Dec 2013 09:41:06 +0000 (01:41 -0800)]
Merge pull request #6231 from owncloud/fix-plural-l10n
fix plural translation - fixes #6226
Jenkins for ownCloud [Sun, 8 Dec 2013 03:28:29 +0000 (22:28 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Sat, 7 Dec 2013 16:04:29 +0000 (08:04 -0800)]
Merge pull request #6202 from owncloud/fix_6032_alt
Add overlay noscript message to fix #6032
Morris Jobke [Sat, 7 Dec 2013 16:03:53 +0000 (17:03 +0100)]
fix IE8 transparent background
Morris Jobke [Sat, 7 Dec 2013 12:29:14 +0000 (13:29 +0100)]
fix wrong test data in l10n
Morris Jobke [Sat, 7 Dec 2013 10:38:01 +0000 (11:38 +0100)]
fix plural translation - fixes #6226
blizzz [Fri, 6 Dec 2013 19:56:53 +0000 (11:56 -0800)]
Merge pull request #6150 from owncloud/backgroundjob-log-exception
Remove background jobs that are giving errors
Vincent Petry [Fri, 6 Dec 2013 18:13:14 +0000 (10:13 -0800)]
Merge pull request #6201 from owncloud/backgroundscan-reuse-etag
reuse etags when doing a background scan
Björn Schießle [Fri, 6 Dec 2013 18:00:04 +0000 (10:00 -0800)]
Merge pull request #6220 from owncloud/debug_oracle_errors
cherry-picks from #5884, just for debugging purpose
Robin Appelman [Fri, 6 Dec 2013 17:27:46 +0000 (18:27 +0100)]
Merge branch 'master' into backgroundscan-reuse-etag
Robin Appelman [Fri, 6 Dec 2013 17:26:38 +0000 (18:26 +0100)]
get rid of failing test that don't cause additional downloads
Bart Visscher [Thu, 14 Nov 2013 07:46:15 +0000 (08:46 +0100)]
XSendfile and encryption don't work together
The file on disk is encrypted, and not readable on client systems
blizzz [Fri, 6 Dec 2013 16:54:29 +0000 (08:54 -0800)]
Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode
correctly propagate the return value of ldap_set_option
Björn Schießle [Fri, 6 Dec 2013 16:06:22 +0000 (08:06 -0800)]
Merge pull request #6222 from owncloud/enc_reset_enc_file_size
set unencrypted_size to 0 after decryption
Bart Visscher [Thu, 14 Nov 2013 07:44:14 +0000 (08:44 +0100)]
Don't try to encrypt a file when the temp file isn't created
Bjoern Schiessle [Fri, 6 Dec 2013 15:11:41 +0000 (16:11 +0100)]
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
Bart Visscher [Thu, 14 Nov 2013 07:48:06 +0000 (08:48 +0100)]
Users of getFolderContent are mostly interested in the unecrypted file size
Vincent Petry [Fri, 6 Dec 2013 14:46:34 +0000 (06:46 -0800)]
Merge pull request #6213 from owncloud/fix-full-name-edit
Fix full name edit for repetitive edit
Björn Schießle [Fri, 6 Dec 2013 13:41:08 +0000 (05:41 -0800)]
Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
Sharing etag propagation on expire
Morris Jobke [Fri, 6 Dec 2013 12:59:24 +0000 (04:59 -0800)]
Merge pull request #6211 from owncloud/fix-5865
Multiselect too slow patched
Morris Jobke [Fri, 6 Dec 2013 12:53:01 +0000 (13:53 +0100)]
parent().parent() -> closest()
Robin Appelman [Fri, 6 Dec 2013 12:00:58 +0000 (13:00 +0100)]
extend test case for etag preservation
Bjoern Schiessle [Thu, 5 Dec 2013 16:41:19 +0000 (17:41 +0100)]
it is not possible to unshare files
Bjoern Schiessle [Thu, 5 Dec 2013 19:02:41 +0000 (20:02 +0100)]
fix typo
Bjoern Schiessle [Thu, 5 Dec 2013 17:51:30 +0000 (18:51 +0100)]
only create new key on password change if a recovery key exists or if the user don't have any private/public keys
Bjoern Schiessle [Thu, 5 Dec 2013 17:50:52 +0000 (18:50 +0100)]
show change password form if key couldn't be decrypted
Bjoern Schiessle [Thu, 5 Dec 2013 17:49:55 +0000 (18:49 +0100)]
add method to check if users private/public key exists
root [Fri, 6 Dec 2013 11:04:17 +0000 (12:04 +0100)]
correctly propagate the return value of ldap_set_option
otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn
active directory paging will stop working
(Operations error on ldap_control_paged_result_response)
Jenkins for ownCloud [Fri, 6 Dec 2013 03:24:39 +0000 (22:24 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 5 Dec 2013 22:44:59 +0000 (23:44 +0100)]
Fix full name edit for repetive edit
fixes #6212
fixes the data attributes after edit
fixes markup to successfully re-edit display name
ringmaster [Thu, 5 Dec 2013 22:01:51 +0000 (17:01 -0500)]
Remove reference to ownCloud.
unknown [Thu, 5 Dec 2013 20:46:13 +0000 (15:46 -0500)]
Slide duration set to 200ms for multiselect (same duration as user menu)
Morris Jobke [Thu, 5 Dec 2013 20:03:17 +0000 (21:03 +0100)]
Revert "Merge pull request #6210 from owncloud/fix-5865"
This reverts commit
f12363d90b31e03a9f2e95911dda54af728a2df6 , reversing
changes made to
eba35d28cd974507f9e81e15430d3d33dbbd9973 .
Morris Jobke [Thu, 5 Dec 2013 19:53:11 +0000 (20:53 +0100)]
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
This reverts commit
eba35d28cd974507f9e81e15430d3d33dbbd9973 .
pdessauw [Thu, 5 Dec 2013 19:19:06 +0000 (11:19 -0800)]
Merge pull request #6210 from owncloud/fix-5865
#5865 Multiselect animation is too slow patch
unknown [Thu, 5 Dec 2013 18:15:52 +0000 (13:15 -0500)]
Changed duration of slideDown, slideUp and fadeOut to 200ms
ringmaster [Thu, 5 Dec 2013 17:06:20 +0000 (12:06 -0500)]
Link to enable-javascript.com
Bjoern Schiessle [Thu, 5 Dec 2013 16:26:30 +0000 (17:26 +0100)]
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
Bjoern Schiessle [Thu, 5 Dec 2013 16:25:01 +0000 (17:25 +0100)]
get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user
Morris Jobke [Thu, 5 Dec 2013 15:12:46 +0000 (16:12 +0100)]
Revert "Fix user's displayName being overwritten by (old) cookie"
This reverts commit
2a7380cc21e56ce12b1a0e1460fabc978a83090b .
ringmaster [Thu, 5 Dec 2013 14:52:13 +0000 (09:52 -0500)]
Make noscript message translatable
ringmaster [Thu, 5 Dec 2013 14:48:20 +0000 (09:48 -0500)]
Move message up 10%
Morris Jobke [Thu, 5 Dec 2013 14:32:20 +0000 (06:32 -0800)]
Merge pull request #6199 from nicokaiser/fix-5306-master
Fix user's displayName being overwritten by (old) cookie. #3694
Morris Jobke [Thu, 5 Dec 2013 14:25:48 +0000 (06:25 -0800)]
Merge pull request #6196 from owncloud/installation-error-css
fix appearance of error message - .errors is outdated
Robin Appelman [Thu, 5 Dec 2013 14:23:34 +0000 (15:23 +0100)]
reuse etags when doing a background scan
ringmaster [Thu, 5 Dec 2013 14:19:46 +0000 (09:19 -0500)]
Add overlay noscript message to fix #6032
Nico Kaiser [Thu, 5 Dec 2013 13:18:32 +0000 (14:18 +0100)]
Fix user's displayName being overwritten by (old) cookie
Robin Appelman [Thu, 5 Dec 2013 12:29:35 +0000 (13:29 +0100)]
add test case for removing background jobs that are throwing exceptions
Morris Jobke [Thu, 5 Dec 2013 10:23:30 +0000 (11:23 +0100)]
fix appearance of error message - .errors is outdated
Frank Karlitschek [Thu, 5 Dec 2013 09:35:19 +0000 (10:35 +0100)]
master is ownCloud 7 pre alpha now
Jenkins for ownCloud [Wed, 4 Dec 2013 23:14:17 +0000 (18:14 -0500)]
[tx-robot] updated from transifex
Arthur Schiwon [Tue, 3 Dec 2013 19:50:46 +0000 (20:50 +0100)]
LDAP Wizard: don't generate filter when not allowed
Arthur Schiwon [Tue, 3 Dec 2013 19:45:05 +0000 (20:45 +0100)]
some equals are more equal than other equals
Arthur Schiwon [Tue, 3 Dec 2013 15:37:11 +0000 (16:37 +0100)]
LDAP Wizard: return correct var
Arthur Schiwon [Tue, 3 Dec 2013 12:27:45 +0000 (13:27 +0100)]
LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions.
Arthur Schiwon [Tue, 3 Dec 2013 12:21:55 +0000 (13:21 +0100)]
LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly
Arthur Schiwon [Tue, 3 Dec 2013 11:11:43 +0000 (12:11 +0100)]
LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work
Arthur Schiwon [Mon, 2 Dec 2013 20:11:20 +0000 (21:11 +0100)]
LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner
Arthur Schiwon [Wed, 4 Dec 2013 13:01:31 +0000 (14:01 +0100)]
LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page
Arthur Schiwon [Wed, 4 Dec 2013 12:14:05 +0000 (13:14 +0100)]
LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143
Björn Schießle [Wed, 4 Dec 2013 15:44:02 +0000 (07:44 -0800)]
Merge pull request #6181 from owncloud/auto_expire_trash
config switch to disable auto expire for the trash bin
Robin Appelman [Wed, 4 Dec 2013 15:28:27 +0000 (16:28 +0100)]
Dont use exceptions for the backgroundjob test cases
Bjoern Schiessle [Wed, 4 Dec 2013 13:20:29 +0000 (14:20 +0100)]
config switch to disable auto expire for the trash bin
Morris Jobke [Wed, 4 Dec 2013 12:27:38 +0000 (13:27 +0100)]
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
This reverts commit
efbf18652c6eef42e2ca2fda3572d74d2be022dd .
Morris Jobke [Wed, 4 Dec 2013 09:49:54 +0000 (01:49 -0800)]
Merge pull request #6169 from owncloud/php_version_warning
PHP version warning
Frank Karlitschek [Tue, 3 Dec 2013 13:30:32 +0000 (14:30 +0100)]
lower required php version to 5.3.3
Frank Karlitschek [Tue, 3 Dec 2013 19:00:49 +0000 (11:00 -0800)]
Merge pull request #6168 from owncloud/extstorage-testtestmethod
Added unit test for the test() method of ext storage
Thomas Müller [Tue, 3 Dec 2013 16:21:45 +0000 (08:21 -0800)]
Merge pull request #6076 from owncloud/fix-6073-master
Correct property name. It's just 'tableprefix', without the 'db' prefix.
Vincent Petry [Tue, 3 Dec 2013 15:26:00 +0000 (07:26 -0800)]
Merge pull request #5946 from owncloud/public-page-details
Public page details
Thomas Müller [Tue, 3 Dec 2013 15:23:04 +0000 (07:23 -0800)]
Merge pull request #5931 from owncloud/fix-time-field-properly
fix time input field properly, details
Vincent Petry [Tue, 3 Dec 2013 14:51:25 +0000 (06:51 -0800)]
Merge pull request #6153 from owncloud/extstorage-s3
Fixed Amazon S3 ext storage config UI
zombiehugs [Tue, 3 Dec 2013 14:23:13 +0000 (08:23 -0600)]
Revert "[fix] Center Share Dropdown & Versions Dropdown"
This reverts commit
1dbbfcf3dcd4de7f31344244b9f22217e4bfba72 .
zombiehugs [Tue, 3 Dec 2013 14:09:58 +0000 (08:09 -0600)]
[fix] Center Share Dropdown & Versions Dropdown
Center Share Dropdown & Versions Dropdown
Frank Karlitschek [Tue, 3 Dec 2013 14:06:36 +0000 (15:06 +0100)]
request a bit more data for bug reports
Vincent Petry [Tue, 3 Dec 2013 13:35:53 +0000 (14:35 +0100)]
Added unit test for the test() method
This is to make sure that method isn't broken
Morris Jobke [Tue, 3 Dec 2013 12:46:58 +0000 (13:46 +0100)]
fix public page - gallery view issues
Vincent Petry [Mon, 2 Dec 2013 17:32:32 +0000 (18:32 +0100)]
Fixed test function for S3
Fixes #5752
Vincent Petry [Mon, 2 Dec 2013 15:55:43 +0000 (16:55 +0100)]
Fixed Amazon S3 ext storage config UI
Optional parameters are now really optional
Fixes #5861
Vincent Petry [Mon, 2 Dec 2013 17:49:34 +0000 (18:49 +0100)]
Fixed placeholder after page reload
The placeholder somehow had too many characters stripping from it...
Morris Jobke [Tue, 3 Dec 2013 09:59:22 +0000 (10:59 +0100)]
fix trashbin and pbulic page controls
Morris Jobke [Wed, 27 Nov 2013 20:21:29 +0000 (21:21 +0100)]
fix and cleanup CSS for public page
Jan-Christoph Borchardt [Thu, 21 Nov 2013 12:33:04 +0000 (13:33 +0100)]
change different shades of grey for public share page to white
Jan-Christoph Borchardt [Wed, 20 Nov 2013 14:05:08 +0000 (15:05 +0100)]
remove app specific code
Jan-Christoph Borchardt [Tue, 19 Nov 2013 14:54:27 +0000 (15:54 +0100)]
fix details for buttons in header and controls bar
Jan-Christoph Borchardt [Tue, 19 Nov 2013 14:53:49 +0000 (15:53 +0100)]
account for shift of controls bar due to app navigation, do not shift on public page
Frank Karlitschek [Tue, 3 Dec 2013 09:14:35 +0000 (01:14 -0800)]
Merge pull request #5929 from owncloud/code_check_on
switch code checker on by default. apps are not allowed to access
Thomas Müller [Mon, 2 Dec 2013 23:14:41 +0000 (15:14 -0800)]
Merge pull request #6158 from owncloud/rmdir-check
check if a directory exists before we try to remove it
Jenkins for ownCloud [Mon, 2 Dec 2013 22:28:29 +0000 (17:28 -0500)]
[tx-robot] updated from transifex
Robin Appelman [Mon, 2 Dec 2013 21:43:58 +0000 (22:43 +0100)]
check if a directory exists before we try to remove it
Björn Schießle [Mon, 2 Dec 2013 21:22:28 +0000 (13:22 -0800)]
Merge pull request #6151 from owncloud/trash_fix_select
trash, make it possible to select folders
Bjoern Schiessle [Mon, 2 Dec 2013 14:27:40 +0000 (15:27 +0100)]
make it possible to select folders
Robin Appelman [Mon, 2 Dec 2013 12:43:26 +0000 (13:43 +0100)]
remove background jobs if they are failing
Robin Appelman [Mon, 2 Dec 2013 12:41:47 +0000 (13:41 +0100)]
Catch exceptions from background jobs and log them
Vincent Petry [Mon, 2 Dec 2013 12:33:37 +0000 (04:33 -0800)]
Merge pull request #6148 from owncloud/fix_trash_restore
Fix restore anbd delete operations in trash bin
Bjoern Schiessle [Mon, 2 Dec 2013 11:13:32 +0000 (12:13 +0100)]
check explicitely all possible dir values
Bjoern Schiessle [Mon, 2 Dec 2013 10:59:09 +0000 (11:59 +0100)]
set delete all to true if a complete folder was deleted
Bjoern Schiessle [Mon, 2 Dec 2013 10:39:53 +0000 (11:39 +0100)]
fix delete files from trash bin
Thomas Mueller [Mon, 2 Dec 2013 07:42:28 +0000 (08:42 +0100)]
fixing PHPDoc and spelling