]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Thu, 20 Nov 2014 15:24:37 +0000 (16:24 +0100)]
Merge pull request #12299 from owncloud/clean-lib-base-config
replace all static calls to OC_Config and OC_Preferences to calls to OCP...
Lukas Reschke [Thu, 20 Nov 2014 15:12:49 +0000 (16:12 +0100)]
Merge pull request #12325 from owncloud/removeunneccessarylang
cleanup languages. closes #11274
Thomas Müller [Thu, 20 Nov 2014 13:59:59 +0000 (14:59 +0100)]
Merge pull request #12226 from owncloud/remove-phpass
Remove phpass and migrate to new Hasher interface
Morris Jobke [Thu, 20 Nov 2014 13:53:18 +0000 (14:53 +0100)]
Merge pull request #12297 from owncloud/issue/10991-all-testcase
Issue/10991 all testcase
Volkan Gezer [Thu, 20 Nov 2014 13:46:17 +0000 (14:46 +0100)]
cleanup languages. closes #11274
Morris Jobke [Thu, 20 Nov 2014 12:32:07 +0000 (13:32 +0100)]
Merge pull request #12305 from owncloud/sharelist-nodelete
Remove delete button in shared with others list
Vincent Petry [Thu, 20 Nov 2014 11:47:27 +0000 (12:47 +0100)]
Merge pull request #12253 from owncloud/port-12154
Port 12154
Vincent Petry [Thu, 20 Nov 2014 09:53:46 +0000 (10:53 +0100)]
Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs
Added function to load translations from JS
Jenkins for ownCloud [Thu, 20 Nov 2014 06:55:06 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Vincent Petry [Wed, 19 Nov 2014 16:44:05 +0000 (17:44 +0100)]
JSHint fixes in sharedfilelistSpec unit test file
Vincent Petry [Wed, 19 Nov 2014 16:42:57 +0000 (17:42 +0100)]
Remove delete button in shared with others list
Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.
This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
Vincent Petry [Wed, 19 Nov 2014 16:02:17 +0000 (17:02 +0100)]
Fix l10n promises
Joas Schilling [Mon, 10 Nov 2014 22:30:38 +0000 (23:30 +0100)]
Make remaining files extend the test base
Joas Schilling [Mon, 10 Nov 2014 21:59:50 +0000 (22:59 +0100)]
Make root tests extend the \Test\TestCase
Joas Schilling [Mon, 10 Nov 2014 21:28:12 +0000 (22:28 +0100)]
Make apps/ extend the \Test\TestCase and fix overwritten methods
Joas Schilling [Fri, 7 Nov 2014 14:23:15 +0000 (15:23 +0100)]
Use base class to reset the file mapper
Vincent Petry [Wed, 19 Nov 2014 13:49:15 +0000 (14:49 +0100)]
Better use of promise in OC.L10N.load()
Lukas Reschke [Wed, 19 Nov 2014 13:27:32 +0000 (14:27 +0100)]
Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
Show warning when invalid user was passed
Morris Jobke [Wed, 19 Nov 2014 12:15:04 +0000 (13:15 +0100)]
replace double quotes with single quotes
Morris Jobke [Wed, 19 Nov 2014 12:06:22 +0000 (13:06 +0100)]
replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig
Lukas Reschke [Wed, 19 Nov 2014 12:05:02 +0000 (13:05 +0100)]
Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
Warn for password reset when files_encryption is enabled
Morris Jobke [Wed, 19 Nov 2014 10:42:19 +0000 (11:42 +0100)]
Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled
Only show undelete capability if files_trashbin is enabled
Vincent Petry [Wed, 19 Nov 2014 09:59:38 +0000 (10:59 +0100)]
Remove stray generateUrl
Jenkins for ownCloud [Wed, 19 Nov 2014 06:54:59 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Lukas Reschke [Tue, 18 Nov 2014 22:06:39 +0000 (23:06 +0100)]
Only show undelete capability if files_trashbin is enabled
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
Thomas Müller [Tue, 18 Nov 2014 21:50:05 +0000 (22:50 +0100)]
Merge pull request #12270 from owncloud/fix-search-label
User management search just searches users - adjust label of input field...
Thomas Müller [Tue, 18 Nov 2014 21:39:48 +0000 (22:39 +0100)]
Merge pull request #12272 from owncloud/drop-var_dump
drop unneeded var_dump - fixes #9997
Morris Jobke [Tue, 18 Nov 2014 21:36:42 +0000 (22:36 +0100)]
drop unneeded var_dump - fixes #9997
Morris Jobke [Tue, 18 Nov 2014 21:12:14 +0000 (22:12 +0100)]
User management search just searches users - adjust label of input field - fixes #10229
Morris Jobke [Tue, 18 Nov 2014 17:59:34 +0000 (18:59 +0100)]
Merge pull request #12261 from oparoz/patch-1
Replace deprecated switches
Lukas Reschke [Tue, 18 Nov 2014 17:11:31 +0000 (18:11 +0100)]
Merge pull request #12264 from owncloud/use-full-path-for-filesize-calculation
Use full path instead of only the filename
Björn Schießle [Tue, 18 Nov 2014 16:26:02 +0000 (17:26 +0100)]
Merge pull request #12224 from owncloud/fix_12211
make sure that we don't find the wrong shares if a user and a group have the same ID
Lukas Reschke [Tue, 18 Nov 2014 16:14:26 +0000 (17:14 +0100)]
$file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned.
This feature only exists on master.
Olivier Paroz [Tue, 18 Nov 2014 14:04:01 +0000 (15:04 +0100)]
Replace deprecated switches
Warning: -convert-to is deprecated. Use --convert-to instead.
Warning: -outdir is deprecated. Use --outdir instead.
Lukas Reschke [Tue, 18 Nov 2014 12:56:40 +0000 (13:56 +0100)]
Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager
Fix type hinting for app manager
Lukas Reschke [Tue, 18 Nov 2014 11:37:16 +0000 (12:37 +0100)]
Merge pull request #12242 from owncloud/fix-undefined-size
Check if the size field is available
Lukas Reschke [Thu, 13 Nov 2014 12:34:11 +0000 (13:34 +0100)]
Add repair steps for legacy config files
Remove all ports from the trusted domains
Conflicts:
lib/private/repair.php
lib/repair/repairconfig.php
Lukas Reschke [Thu, 13 Nov 2014 10:15:47 +0000 (11:15 +0100)]
Ignore port for trusted domains
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)
Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.
Conflicts:
lib/private/request.php
Robin Appelman [Tue, 18 Nov 2014 11:22:13 +0000 (12:22 +0100)]
Fix type hinting for app manager
Vincent Petry [Tue, 18 Nov 2014 11:13:44 +0000 (12:13 +0100)]
Added function to load translations from JS
For apps that support async translation loading, a new function
OC.L10N.load() can be used to asynchronously load the translations
for a given app.
Bjoern Schiessle [Tue, 18 Nov 2014 10:41:45 +0000 (11:41 +0100)]
only users can have a display name different from the id
Bjoern Schiessle [Tue, 18 Nov 2014 10:08:01 +0000 (11:08 +0100)]
use the new base class for unit tests
Bjoern Schiessle [Mon, 17 Nov 2014 17:05:12 +0000 (18:05 +0100)]
make sure that we only find the shares from the correct share type if users and groups with the same ID exists
Bjoern Schiessle [Mon, 17 Nov 2014 12:09:13 +0000 (13:09 +0100)]
make sure that we don't find the wrong shares if a user and a group have the same ID
Morris Jobke [Tue, 18 Nov 2014 09:36:32 +0000 (10:36 +0100)]
Merge pull request #12220 from owncloud/remove-unused-code
Remove unused code
Morris Jobke [Tue, 18 Nov 2014 09:30:17 +0000 (10:30 +0100)]
Merge pull request #12237 from owncloud/fix-12236
Make declaration compatible
Morris Jobke [Tue, 18 Nov 2014 09:25:16 +0000 (10:25 +0100)]
center spinner
Lukas Reschke [Tue, 18 Nov 2014 09:24:46 +0000 (10:24 +0100)]
Merge pull request #12234 from owncloud/normalizepath-absolute-tests
Add tests for normalizePath() with absolute paths on windows
Lukas Reschke [Tue, 18 Nov 2014 09:08:20 +0000 (10:08 +0100)]
Merge pull request #9962 from owncloud/app-group-enable-remote
Fix remote.php routes for apps that are enabled for specific groups
Jenkins for ownCloud [Tue, 18 Nov 2014 06:54:31 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Lukas Reschke [Mon, 17 Nov 2014 21:39:40 +0000 (22:39 +0100)]
Check if the size field is available
In some cases the 'size' field is not available resulting in some PHP errors such as:
```json
{"reqId":"
03548fd9e3d3aca15a5796b3b35d7b9d ","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"}
```
This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
Lukas Reschke [Mon, 17 Nov 2014 17:34:55 +0000 (18:34 +0100)]
Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse
Move CSRF check
Lukas Reschke [Mon, 17 Nov 2014 17:30:17 +0000 (18:30 +0100)]
Make declaration compatible
Fixes #12236
Lukas Reschke [Mon, 17 Nov 2014 16:49:58 +0000 (17:49 +0100)]
Show spinner
Morris Jobke [Tue, 11 Nov 2014 14:14:04 +0000 (15:14 +0100)]
fix unreadable label in warning box
Lukas Reschke [Wed, 29 Oct 2014 12:26:24 +0000 (13:26 +0100)]
Hide submit button after password change
Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel.
Bjoern Schiessle [Wed, 29 Oct 2014 11:45:13 +0000 (12:45 +0100)]
listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user
Bjoern Schiessle [Wed, 29 Oct 2014 11:44:15 +0000 (12:44 +0100)]
add password as parameter to the signal so that the encryption can create a new key-pair
Lukas Reschke [Fri, 24 Oct 2014 11:41:44 +0000 (13:41 +0200)]
Add "postPasswordReset" hook
Lukas Reschke [Fri, 24 Oct 2014 09:45:30 +0000 (11:45 +0200)]
Use correct route instead
THX @schiesbn
(I should setup a mail server on my local system...)
Lukas Reschke [Wed, 22 Oct 2014 08:29:26 +0000 (10:29 +0200)]
Remove uneeded import
Lukas Reschke [Tue, 21 Oct 2014 16:31:41 +0000 (18:31 +0200)]
Fix scrutinizer issues
Lukas Reschke [Mon, 20 Oct 2014 17:05:48 +0000 (19:05 +0200)]
Warn for password reset when files_encryption is enabled
This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password.
Furthermore I updated the code to use our new classes and added some unit tests for it :dancers:
Fixes https://github.com/owncloud/core/issues/11438
Joas Schilling [Mon, 17 Nov 2014 15:57:15 +0000 (16:57 +0100)]
Add tests for absolute paths on windows
Joas Schilling [Mon, 17 Nov 2014 15:52:45 +0000 (16:52 +0100)]
Refactor tests to use a dataProvider method
Vincent Petry [Mon, 17 Nov 2014 15:45:54 +0000 (16:45 +0100)]
Merge pull request #11741 from owncloud/delete_all_children_preview_2
delete all children's previews when deleting a folder
Morris Jobke [Mon, 17 Nov 2014 15:44:45 +0000 (16:44 +0100)]
Merge pull request #12218 from owncloud/issue/10991-fixes
Issue/10991 Make unit tests pass on windows
Robin Appelman [Thu, 4 Sep 2014 13:23:55 +0000 (15:23 +0200)]
Add sabredav plugin to check if a user has access to an app
Robin Appelman [Mon, 17 Nov 2014 14:49:15 +0000 (15:49 +0100)]
Merge pull request #12031 from owncloud/app-manager
Add \OC\App\Manager to handle enabling/disabling apps
Lukas Reschke [Mon, 17 Nov 2014 14:10:47 +0000 (15:10 +0100)]
Move CSRF check
Because we're closing the session now before controllers are executed there are cases where we cannot write the session.
Lukas Reschke [Mon, 17 Nov 2014 10:11:19 +0000 (11:11 +0100)]
Remove unused code
We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
Lukas Reschke [Mon, 17 Nov 2014 12:10:15 +0000 (13:10 +0100)]
Remove phpass and migrate to new Hasher interface
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
Joas Schilling [Wed, 12 Nov 2014 14:54:41 +0000 (15:54 +0100)]
Correctly restore previous root mount point after testing
Joas Schilling [Fri, 14 Nov 2014 11:51:59 +0000 (12:51 +0100)]
Correctly refresh the apps list after removing the mock
Joas Schilling [Mon, 10 Nov 2014 10:38:14 +0000 (11:38 +0100)]
Fix Files\Storage\Home::testRoot()
Joas Schilling [Fri, 7 Nov 2014 09:52:37 +0000 (10:52 +0100)]
Make it possible to cleanPath() absolute Windows paths
Joas Schilling [Fri, 7 Nov 2014 08:46:37 +0000 (09:46 +0100)]
Correctly close handle of directory when listing certificates
Joas Schilling [Thu, 6 Nov 2014 15:53:35 +0000 (16:53 +0100)]
Fix single run of encryption tests and usages of uniqid() and fopen()
Joas Schilling [Mon, 10 Nov 2014 10:01:43 +0000 (11:01 +0100)]
Skip some more tests on Windows which just can not work at all
Jenkins for ownCloud [Mon, 17 Nov 2014 06:54:33 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 16 Nov 2014 06:55:00 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Sat, 15 Nov 2014 15:50:15 +0000 (16:50 +0100)]
Merge pull request #12186 from owncloud/fix-12182
eliminate OC_Template::printErrorPage in database classes, fixes #12182
Morris Jobke [Sat, 15 Nov 2014 12:38:18 +0000 (13:38 +0100)]
Merge pull request #12189 from owncloud/checkIfAppIsEnabled
Check if app is enabled for user
Lukas Reschke [Fri, 14 Nov 2014 16:20:51 +0000 (17:20 +0100)]
Check if app is enabled for user
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
Jenkins for ownCloud [Sat, 15 Nov 2014 06:54:28 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Clark Tomlinson [Fri, 14 Nov 2014 19:44:34 +0000 (14:44 -0500)]
Merge pull request #11029 from owncloud/fix-share-download
Fix share download
Arthur Schiwon [Fri, 14 Nov 2014 16:13:51 +0000 (17:13 +0100)]
do not output DB information, and do not set header
Arthur Schiwon [Fri, 14 Nov 2014 15:59:54 +0000 (16:59 +0100)]
errors are already logged
Vincent Petry [Fri, 14 Nov 2014 11:45:36 +0000 (12:45 +0100)]
Show warning when invalid user was passed
Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.
Vincent Cloutier [Thu, 16 Oct 2014 00:59:07 +0000 (20:59 -0400)]
Added download size on public sharing
Lukas Reschke [Wed, 15 Oct 2014 09:58:44 +0000 (11:58 +0200)]
Refactor file sharing public link handling
fixes download issue introduced by #10755
Conflicts:
apps/files_sharing/public.php
Arthur Schiwon [Fri, 14 Nov 2014 14:48:55 +0000 (15:48 +0100)]
eliminate OC_Template::printErrorPage in database classes, fixes #12182
Thomas Müller [Fri, 14 Nov 2014 13:38:13 +0000 (14:38 +0100)]
Merge pull request #12181 from owncloud/resubmit-second-fail
Fail...
Lukas Reschke [Fri, 14 Nov 2014 12:42:13 +0000 (13:42 +0100)]
Fail...
Thomas Müller [Fri, 14 Nov 2014 12:24:15 +0000 (13:24 +0100)]
Merge pull request #12177 from owncloud/skip-mail-test-for
Mark skipped until #12085 is merged
Lukas Reschke [Fri, 14 Nov 2014 12:19:02 +0000 (13:19 +0100)]
Mark skipped until #12085 is merged
See https://github.com/owncloud/core/pull/12175#issuecomment-
63054620
Jörn Friedrich Dreyer [Fri, 14 Nov 2014 09:37:10 +0000 (10:37 +0100)]
Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename
Do not remove dir entry if it has the same name as the parent
Jenkins for ownCloud [Fri, 14 Nov 2014 06:54:47 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 13 Nov 2014 21:39:40 +0000 (22:39 +0100)]
Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup
cleanup group admin(s) on deleteGroup
Vincent Petry [Thu, 13 Nov 2014 16:37:56 +0000 (17:37 +0100)]
Do not remove dir entry if it has the same name as the parent
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.