]>
source.dussan.org Git - nextcloud-server.git/log
Vincent Petry [Thu, 9 Apr 2015 16:55:28 +0000 (18:55 +0200)]
Properly catch guzzle 503 when querying share info
Morris Jobke [Thu, 9 Apr 2015 16:41:18 +0000 (18:41 +0200)]
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
fixes #15326
Vincent Petry [Thu, 9 Apr 2015 16:10:17 +0000 (18:10 +0200)]
Merge pull request #15282 from owncloud/keepsharerelationshipondelete
Keep shares when deleting shared folders
Lukas Reschke [Thu, 9 Apr 2015 14:38:11 +0000 (16:38 +0200)]
Merge pull request #14540 from owncloud/windows-setup-check
Disallow Windows Server in Server Check
Lukas Reschke [Thu, 26 Feb 2015 13:24:40 +0000 (14:24 +0100)]
Disallow Windows Server in Server Check
Will prevent users from use ownCloud on Windows Server :see_no_evil:
Morris Jobke [Thu, 9 Apr 2015 13:46:36 +0000 (15:46 +0200)]
Merge pull request #15501 from owncloud/better-output-format-console
Add an option to get the output in plain, json or print_r syntax
Jörn Friedrich Dreyer [Thu, 9 Apr 2015 13:37:00 +0000 (15:37 +0200)]
fixes #15326
Vincent Petry [Thu, 9 Apr 2015 13:02:24 +0000 (15:02 +0200)]
Remove trashbin storage wrapper when disabling it for tests
Morris Jobke [Thu, 9 Apr 2015 12:54:57 +0000 (14:54 +0200)]
Merge pull request #15235 from owncloud/remote-share-hint
Hint for remote sharing syntax
Björn Schießle [Thu, 9 Apr 2015 12:51:15 +0000 (14:51 +0200)]
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
Dont create exclude list for generating the share target
Thomas Müller [Thu, 9 Apr 2015 12:45:40 +0000 (14:45 +0200)]
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
Check if the key exists, before trying to delete it
Joas Schilling [Thu, 9 Apr 2015 12:44:30 +0000 (14:44 +0200)]
change handling in app:list
Joas Schilling [Thu, 9 Apr 2015 12:42:44 +0000 (14:42 +0200)]
Replace print_r() with pretty json
Morris Jobke [Thu, 9 Apr 2015 12:33:55 +0000 (14:33 +0200)]
Merge pull request #15500 from owncloud/installation-hint
add link to installation documentation to setup page
Björn Schießle [Thu, 9 Apr 2015 12:32:53 +0000 (14:32 +0200)]
Merge pull request #15507 from owncloud/remove-uneeded-file
Remove unneeded file
Lukas Reschke [Thu, 9 Apr 2015 11:29:51 +0000 (13:29 +0200)]
Remove unneeded file
Thomas Müller [Thu, 9 Apr 2015 11:15:09 +0000 (13:15 +0200)]
Merge pull request #15503 from owncloud/link-standard-subscription
Help section: fix commercial support link
Vincent Petry [Thu, 9 Apr 2015 10:34:19 +0000 (12:34 +0200)]
Remove unused $toRemove
Jan-Christoph Borchardt [Thu, 9 Apr 2015 10:33:18 +0000 (12:33 +0200)]
help section: code style and wording fixes
Joas Schilling [Thu, 9 Apr 2015 10:30:18 +0000 (12:30 +0200)]
Correctly generate the doc link via go.php
Jan-Christoph Borchardt [Thu, 9 Apr 2015 10:29:44 +0000 (12:29 +0200)]
link to proper subsite for Commercial support
Joas Schilling [Thu, 9 Apr 2015 10:19:42 +0000 (12:19 +0200)]
Fix config usage
Jan-Christoph Borchardt [Thu, 9 Apr 2015 10:12:53 +0000 (12:12 +0200)]
Merge pull request #15499 from owncloud/admin-hints
add admin documentation hints to Federated Cloud Sharing and cron
Jan-Christoph Borchardt [Thu, 9 Apr 2015 10:11:42 +0000 (12:11 +0200)]
fix remote share info icon for IE8
Lukas Reschke [Thu, 9 Apr 2015 10:08:27 +0000 (12:08 +0200)]
Merge pull request #15497 from owncloud/enforce-type-security
Enforce string as passed type
Jan-Christoph Borchardt [Thu, 9 Apr 2015 08:57:15 +0000 (10:57 +0200)]
add admin documentation hints to Federated Cloud Sharing and cron
Joas Schilling [Thu, 9 Apr 2015 09:45:07 +0000 (11:45 +0200)]
Add an option to get the output in plain, json or print_r syntax
Jan-Christoph Borchardt [Thu, 9 Apr 2015 09:27:24 +0000 (11:27 +0200)]
add link to installation documentation to setup page
Jan-Christoph Borchardt [Thu, 9 Apr 2015 09:10:41 +0000 (11:10 +0200)]
fix position of SQLite warning
Jan-Christoph Borchardt [Thu, 9 Apr 2015 09:09:15 +0000 (11:09 +0200)]
code style fixes
Lukas Reschke [Thu, 9 Apr 2015 08:54:53 +0000 (10:54 +0200)]
Fix PHPDoc
Lukas Reschke [Thu, 9 Apr 2015 08:46:46 +0000 (10:46 +0200)]
Fix code style
Lukas Reschke [Thu, 9 Apr 2015 08:45:50 +0000 (10:45 +0200)]
Enforce string as passed type
Joas Schilling [Thu, 9 Apr 2015 08:28:02 +0000 (10:28 +0200)]
Check if the key exists, before trying to delete it
Vincent Petry [Fri, 27 Mar 2015 16:33:26 +0000 (17:33 +0100)]
Keep shares when deleting shared folders
The share entries will be linked with the fileid while they are kept in
the trashbin.
In the future a background just will scrape orphaned shares and delete
them.
Jan-Christoph Borchardt [Thu, 9 Apr 2015 08:16:29 +0000 (10:16 +0200)]
add more present info about remote shares, fix layout of inputs
Lukas Reschke [Thu, 9 Apr 2015 08:07:32 +0000 (10:07 +0200)]
Merge pull request #15314 from owncloud/app-categories-15274
Add different trust levels to AppStore interface
Morris Jobke [Wed, 8 Apr 2015 22:18:53 +0000 (00:18 +0200)]
Merge pull request #14676 from owncloud/deleteorphanedshares
Delete orphaned shares in a background job
Morris Jobke [Wed, 8 Apr 2015 22:18:31 +0000 (00:18 +0200)]
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
Limit file activities to favorites
Morris Jobke [Wed, 8 Apr 2015 22:07:08 +0000 (00:07 +0200)]
Merge pull request #15448 from owncloud/occ-check-server-env-master
Adding check command to validate server environment
Thomas Müller [Wed, 8 Apr 2015 20:46:35 +0000 (22:46 +0200)]
Merge pull request #15483 from owncloud/maintenance-refresh
Fix maintenance refresh interval
Lukas Reschke [Wed, 8 Apr 2015 20:08:37 +0000 (22:08 +0200)]
Add JS unit test for sorting
Morris Jobke [Wed, 8 Apr 2015 19:42:47 +0000 (21:42 +0200)]
Merge pull request #15490 from owncloud/remove-debug-logging
remove unessesary logging of methods instantiation
Lukas Reschke [Wed, 8 Apr 2015 19:26:12 +0000 (21:26 +0200)]
Reference `$(this)` instead
Lukas Reschke [Wed, 8 Apr 2015 19:24:03 +0000 (21:24 +0200)]
Fix wording
Morris Jobke [Wed, 8 Apr 2015 19:09:28 +0000 (21:09 +0200)]
Merge pull request #14120 from owncloud/dav-statcache
Stat cache for DAV storage, improves s2s performance a little bit
Morris Jobke [Wed, 8 Apr 2015 19:06:03 +0000 (21:06 +0200)]
Merge pull request #15488 from owncloud/files-navigation-icons
add icons to Files sidebar
Morris Jobke [Wed, 8 Apr 2015 19:05:31 +0000 (21:05 +0200)]
fix for IE8
Clark Tomlinson [Wed, 8 Apr 2015 18:46:01 +0000 (14:46 -0400)]
remove unessesary logging of methods instantiation
Jan-Christoph Borchardt [Wed, 8 Apr 2015 17:25:28 +0000 (19:25 +0200)]
add icons to files sidebar, fix shade, fix position of settings icon and text
Vincent Petry [Wed, 8 Apr 2015 16:50:40 +0000 (18:50 +0200)]
Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled
don't throw exception if a file gets uploaded and encryption is disabled
Morris Jobke [Wed, 8 Apr 2015 16:02:00 +0000 (18:02 +0200)]
Fix maintenance refresh interval
* fix XMLHttpRequest - send after callback is registered
* check for correct type of value - it's a boolean
* return correct content-type in status.php
Bjoern Schiessle [Wed, 8 Apr 2015 14:41:20 +0000 (16:41 +0200)]
don't throw exception if a file gets uploaded and encryption is disabled
Clark Tomlinson [Wed, 8 Apr 2015 13:38:27 +0000 (09:38 -0400)]
Merge pull request #15472 from owncloud/enc_backward_compatibility
make private key handling backward compatible
Morris Jobke [Wed, 8 Apr 2015 12:44:17 +0000 (14:44 +0200)]
Merge pull request #14987 from rullzer/ocs_password_fix2
OCS Fixes to allow setting of password without removing additional settings
Lukas Reschke [Wed, 8 Apr 2015 12:30:56 +0000 (14:30 +0200)]
Merge pull request #15469 from owncloud/fix/15463
Fix language level incompatibilties
Bjoern Schiessle [Wed, 8 Apr 2015 12:19:11 +0000 (14:19 +0200)]
read cipher from key header and always write a key header if a new private key is stored
Vincent Petry [Wed, 8 Apr 2015 12:24:42 +0000 (14:24 +0200)]
Merge pull request #15464 from owncloud/fixmasterunittests
Replace originalStorage in tests with a proper teardown
Lukas Reschke [Wed, 8 Apr 2015 11:55:10 +0000 (13:55 +0200)]
Fix language level incompatibilties
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.
Fixed https://github.com/owncloud/core/issues/15463
Vincent Petry [Wed, 8 Apr 2015 11:29:49 +0000 (13:29 +0200)]
Merge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenance
Disable OCS api when in maintenance mode
Vincent Petry [Wed, 8 Apr 2015 11:04:06 +0000 (13:04 +0200)]
Disable trashbin when testing orphaned shares deletion job
Thomas Müller [Wed, 8 Apr 2015 10:56:18 +0000 (12:56 +0200)]
Merge pull request #15443 from owncloud/encryption-user-hook-tests
adding test for user hooks
Joas Schilling [Wed, 8 Apr 2015 10:51:20 +0000 (12:51 +0200)]
Disable OCS api when in maintenance mode
Vincent Petry [Wed, 8 Apr 2015 10:03:55 +0000 (12:03 +0200)]
Replace originalStorage in tests with a proper teardown
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.
This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
Morris Jobke [Wed, 8 Apr 2015 10:35:15 +0000 (12:35 +0200)]
Merge pull request #15333 from owncloud/copy-cross-device
fix copying folder across devices
Vincent Petry [Wed, 8 Apr 2015 10:09:42 +0000 (12:09 +0200)]
Added FIXME about registering jobs in apps.php
James Anslow [Thu, 2 Apr 2015 20:19:25 +0000 (21:19 +0100)]
Fixing issue #15322 - showing Settings button next to gear icon
Morris Jobke [Wed, 8 Apr 2015 09:10:00 +0000 (11:10 +0200)]
Merge pull request #15453 from owncloud/enc2_fix
fix function call
Vincent Petry [Tue, 3 Mar 2015 16:29:12 +0000 (17:29 +0100)]
Delete orphaned shares in a background job
Bjoern Schiessle [Wed, 8 Apr 2015 07:29:35 +0000 (09:29 +0200)]
fix function call
Thomas Müller [Tue, 7 Apr 2015 22:19:23 +0000 (00:19 +0200)]
Adding check command to validate server environment - fixes #15429
Morris Jobke [Tue, 7 Apr 2015 16:16:24 +0000 (18:16 +0200)]
Merge pull request #14879 from oparoz/fix-preview-caching
Introducing the maximum size preview
Clark Tomlinson [Tue, 7 Apr 2015 15:49:45 +0000 (11:49 -0400)]
adding test for user hooks
Morris Jobke [Tue, 7 Apr 2015 15:15:17 +0000 (17:15 +0200)]
Merge pull request #15441 from owncloud/fix-file-headers-master
fixing license headers - encryption code related
Thomas Müller [Tue, 7 Apr 2015 15:02:49 +0000 (17:02 +0200)]
fixing license headers - encryption code related
Thomas Müller [Tue, 7 Apr 2015 14:46:45 +0000 (16:46 +0200)]
Merge pull request #14472 from owncloud/feature/wipencryptionapp
encryption 2.0 app
Olivier Paroz [Tue, 7 Apr 2015 14:45:16 +0000 (16:45 +0200)]
Introducing the maximum size preview
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.
One of the fixes required for #12465
Thomas Müller [Tue, 7 Apr 2015 12:30:01 +0000 (14:30 +0200)]
fixing unit test - expected value change due to different size being stored in cache table
Morris Jobke [Tue, 7 Apr 2015 12:24:01 +0000 (14:24 +0200)]
Merge pull request #15431 from owncloud/displayname-width
widen displayName input field
Thomas Müller [Tue, 7 Apr 2015 12:17:28 +0000 (14:17 +0200)]
In case of encryption exceptions we return 503 - this will allow the client to retry
Lukas Reschke [Tue, 7 Apr 2015 11:49:16 +0000 (13:49 +0200)]
Fix PHPDoc
Lukas Reschke [Tue, 7 Apr 2015 11:48:33 +0000 (13:48 +0200)]
Deduplicate code
Morris Jobke [Tue, 7 Apr 2015 11:47:35 +0000 (13:47 +0200)]
Merge pull request #15426 from owncloud/issue/15420-remove-hardcoded-docs-link
Remove hardcoded link to performance docs
Thomas Müller [Tue, 7 Apr 2015 10:46:07 +0000 (12:46 +0200)]
fixing unit test execution related to trashbin
Thomas Müller [Tue, 7 Apr 2015 08:03:44 +0000 (10:03 +0200)]
fixing unit tests
Thomas Müller [Tue, 7 Apr 2015 07:42:54 +0000 (09:42 +0200)]
respect mount option while encrypting
Clark Tomlinson [Mon, 6 Apr 2015 19:08:09 +0000 (15:08 -0400)]
adding user setup test and adding 4 tests to keymanager
Clark Tomlinson [Mon, 6 Apr 2015 15:49:18 +0000 (11:49 -0400)]
adding recoverFileTest
Clark Tomlinson [Fri, 3 Apr 2015 15:37:54 +0000 (11:37 -0400)]
adding recovery tests
Thomas Müller [Fri, 3 Apr 2015 09:42:25 +0000 (11:42 +0200)]
fixing unit test execution - test dummy module was behaving wrong
Thomas Müller [Thu, 2 Apr 2015 16:12:20 +0000 (18:12 +0200)]
fixing unit test execution
Thomas Müller [Thu, 2 Apr 2015 15:53:40 +0000 (17:53 +0200)]
PHPDoc cleanup - clean code \o/
Bjoern Schiessle [Thu, 2 Apr 2015 15:36:51 +0000 (17:36 +0200)]
userRecovery() was replaced by setRecoveryForUser()
Thomas Müller [Thu, 2 Apr 2015 15:21:47 +0000 (17:21 +0200)]
comment change as it broke unit tests
Thomas Müller [Thu, 2 Apr 2015 15:16:27 +0000 (17:16 +0200)]
Encryption storage wrapper is enabled by default - necessary to detect encrypted files even if encryption was disabled after files have been encrypted - prevents data corruption
Bjoern Schiessle [Thu, 2 Apr 2015 14:53:38 +0000 (16:53 +0200)]
fix versions tests
Bjoern Schiessle [Thu, 2 Apr 2015 14:42:28 +0000 (16:42 +0200)]
add unit tests to the keystorage
Bjoern Schiessle [Thu, 2 Apr 2015 14:25:01 +0000 (16:25 +0200)]
implement webdav copy
Thomas Müller [Thu, 2 Apr 2015 14:18:10 +0000 (16:18 +0200)]
Using stream_get_contents in file_get_contents implementation + close handle
jknockaert [Thu, 2 Apr 2015 14:17:25 +0000 (16:17 +0200)]
Adjusting count on read