]>
source.dussan.org Git - nextcloud-server.git/log
Joas Schilling [Tue, 28 Mar 2017 18:39:36 +0000 (20:39 +0200)]
Allow to reset the password with the email as an input
Signed-off-by: Joas Schilling <coding@schilljs.com>
Robin Appelman [Tue, 28 Mar 2017 15:51:18 +0000 (17:51 +0200)]
Merge pull request #4112 from nextcloud/swift-config
Better error messages for objectsack swift configuration
Robin Appelman [Tue, 28 Mar 2017 09:39:25 +0000 (11:39 +0200)]
better error messages for invalid regions, urltypes and service names
Signed-off-by: Robin Appelman <robin@icewind.nl>
Morris Jobke [Tue, 28 Mar 2017 14:57:09 +0000 (08:57 -0600)]
Merge pull request #4101 from nextcloud/header-detail
show active indicator on current app even when hovering other icons
Robin Appelman [Tue, 28 Mar 2017 09:02:18 +0000 (11:02 +0200)]
better error messages when swift authentication fails
Signed-off-by: Robin Appelman <robin@icewind.nl>
John Molakvoæ [Tue, 28 Mar 2017 07:47:48 +0000 (09:47 +0200)]
Merge pull request #4082 from nextcloud/fix-menu
Fix pop over menu opacity
Nextcloud bot [Tue, 28 Mar 2017 00:07:53 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 27 Mar 2017 23:45:40 +0000 (17:45 -0600)]
Merge pull request #4107 from nextcloud/users-settings-label
add Settings label to users settings for consistency
Jan-Christoph Borchardt [Mon, 27 Mar 2017 23:18:16 +0000 (01:18 +0200)]
add Settings label to users settings for consistency
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Morris Jobke [Mon, 27 Mar 2017 21:53:08 +0000 (15:53 -0600)]
Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-items
Don't spam the log with "Undefined index showInHeader"
Jan-Christoph Borchardt [Mon, 27 Mar 2017 17:36:11 +0000 (19:36 +0200)]
show active indicator on current app even when hovering other icons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Morris Jobke [Mon, 27 Mar 2017 16:06:54 +0000 (10:06 -0600)]
Merge pull request #4083 from nextcloud/update-strengthify
Update strengthify and fix password strength
Morris Jobke [Sun, 26 Mar 2017 21:10:04 +0000 (15:10 -0600)]
Update strengthify and fix password strength
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Mon, 27 Mar 2017 15:52:02 +0000 (09:52 -0600)]
Merge pull request #4094 from nextcloud/ldap-description
Fix LDAP description
Morris Jobke [Mon, 27 Mar 2017 15:50:21 +0000 (09:50 -0600)]
Merge pull request #4092 from nextcloud/theme-favicon-mask-color
use theming colors for favicon on macOS
Morris Jobke [Mon, 27 Mar 2017 15:46:10 +0000 (09:46 -0600)]
Merge pull request #4096 from nextcloud/touch-floor
round the mtime in touch
Robin Appelman [Mon, 27 Mar 2017 15:04:55 +0000 (17:04 +0200)]
round the mtime in touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
Marius Blüm [Mon, 27 Mar 2017 14:32:45 +0000 (16:32 +0200)]
Merge branch 'master' of https://github.com/nextcloud/server
Marius Blüm [Mon, 27 Mar 2017 14:30:29 +0000 (16:30 +0200)]
Fix LDAP description
Signed-off-by: Marius Blüm <marius@lineone.io>
Robin Appelman [Mon, 27 Mar 2017 14:21:24 +0000 (16:21 +0200)]
Merge pull request #4027 from nextcloud/better-spreed-call-urls
Better spreed call urls
Jan-Christoph Borchardt [Mon, 27 Mar 2017 13:45:56 +0000 (15:45 +0200)]
use theming colors for favicon on macOS
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Georg Ehrke [Mon, 27 Mar 2017 13:05:22 +0000 (15:05 +0200)]
Merge pull request #4072 from nextcloud/move-x-frame-options-into-php
Move X-Frame-Options into PHP
Roeland Jago Douma [Mon, 27 Mar 2017 12:39:32 +0000 (14:39 +0200)]
Merge pull request #4073 from nextcloud/secure-drop
Rename File drop to Secure drop
Roeland Jago Douma [Mon, 27 Mar 2017 12:10:54 +0000 (14:10 +0200)]
Merge pull request #4064 from nextcloud/update-moment
Update momentjs
Jan-Christoph Borchardt [Mon, 27 Mar 2017 09:23:33 +0000 (11:23 +0200)]
highlight active entry in personal info menu again
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Joas Schilling [Mon, 27 Mar 2017 08:24:10 +0000 (10:24 +0200)]
Don't spam the log with "Undefined index showInHeader"
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Mon, 27 Mar 2017 00:07:55 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Olivier Paroz [Sun, 26 Mar 2017 15:53:18 +0000 (17:53 +0200)]
Rename File drop to Secure drop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Sun, 26 Mar 2017 21:48:19 +0000 (15:48 -0600)]
Merge pull request #4077 from nextcloud/better-navigation-management
Register the app management in the normal way
Morris Jobke [Sun, 26 Mar 2017 21:13:03 +0000 (15:13 -0600)]
Merge pull request #4068 from nextcloud/use-eval-instead-of-get-script
Use eval instead of $.script
Joas Schilling [Sun, 26 Mar 2017 21:07:54 +0000 (23:07 +0200)]
Allow to specify the id
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Sun, 26 Mar 2017 21:03:19 +0000 (15:03 -0600)]
Merge pull request #4065 from nextcloud/bump_scss
[3rdparty] Bump SCSSphp
Roeland Jago Douma [Sun, 26 Mar 2017 08:53:33 +0000 (10:53 +0200)]
[3rdparty] Bump SCSSphp
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Joas Schilling [Sun, 26 Mar 2017 20:32:12 +0000 (22:32 +0200)]
Make sure help is always after users
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Sun, 26 Mar 2017 20:31:57 +0000 (22:31 +0200)]
Merge pull request #4075 from nextcloud/search-hover-feedback
add hover feedback for search, and opacity on use
Morris Jobke [Sun, 26 Mar 2017 20:30:21 +0000 (14:30 -0600)]
Fix order as @jancborchardt requested
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Sun, 26 Mar 2017 20:09:22 +0000 (14:09 -0600)]
Fix pop over menu opacity
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Joas Schilling [Sun, 26 Mar 2017 19:26:45 +0000 (21:26 +0200)]
Fix the tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Sun, 26 Mar 2017 19:23:18 +0000 (21:23 +0200)]
Don't use the dropdown for one item only
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Sun, 26 Mar 2017 19:15:25 +0000 (21:15 +0200)]
Allow multiple navigation links from info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Sun, 26 Mar 2017 19:02:47 +0000 (13:02 -0600)]
Merge pull request #4074 from nextcloud/replace-name-with-icon
replace name in top right with icon for less noise
Morris Jobke [Sun, 26 Mar 2017 18:59:58 +0000 (12:59 -0600)]
Merge pull request #4069 from nextcloud/fix-emptycontent-font-color
fix emptycontent font color lightness
Joas Schilling [Sun, 26 Mar 2017 18:37:39 +0000 (20:37 +0200)]
Allow apps to register a setting via info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Sun, 26 Mar 2017 18:26:05 +0000 (20:26 +0200)]
Move app management to the settings menu
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Sun, 26 Mar 2017 17:45:36 +0000 (19:45 +0200)]
Cleanup code as suggested by @icewind1991
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Joas Schilling [Sun, 26 Mar 2017 17:40:41 +0000 (19:40 +0200)]
Manage the right side menu via the navigation manager as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Sun, 26 Mar 2017 16:40:56 +0000 (18:40 +0200)]
Register the app management in the normal way
Signed-off-by: Joas Schilling <coding@schilljs.com>
Christoph Wurst [Sun, 26 Mar 2017 16:35:14 +0000 (18:35 +0200)]
Merge pull request #4063 from nextcloud/bump_dompurify
Bump dompurify
Jan-Christoph Borchardt [Sun, 26 Mar 2017 16:31:55 +0000 (18:31 +0200)]
add hover feedback for search, and opacity on use
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Jan-Christoph Borchardt [Sun, 26 Mar 2017 15:57:05 +0000 (17:57 +0200)]
replace name in top right with icon for less noise
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Lukas Reschke [Sun, 26 Mar 2017 15:24:50 +0000 (17:24 +0200)]
Move X-Frame-Options into PHP
The public calendar view should be embeddable and we can't do that if the .htaccess sets a global X-Frame-Options.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Sun, 26 Mar 2017 13:26:10 +0000 (15:26 +0200)]
Make async
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Jan-Christoph Borchardt [Sun, 26 Mar 2017 13:19:41 +0000 (15:19 +0200)]
fix emptycontent font color lightness
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Lukas Reschke [Sun, 26 Mar 2017 12:17:01 +0000 (14:17 +0200)]
Fix callback
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Sun, 26 Mar 2017 12:11:58 +0000 (14:11 +0200)]
Use eval instead of $.script
Fixes https://github.com/nextcloud/server/issues/4067
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Roeland Jago Douma [Sun, 26 Mar 2017 10:10:09 +0000 (12:10 +0200)]
Merge pull request #3895 from nextcloud/create-notification-when-update-server-not-reachable
Create a notification when the update server couldn't be reached for …
Joas Schilling [Mon, 20 Mar 2017 11:31:15 +0000 (12:31 +0100)]
Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Fri, 17 Mar 2017 20:40:39 +0000 (14:40 -0600)]
Also remove failure notification if no update is available
* error happened and vanished the notification should also
vanish even if no update is available
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Joas Schilling [Fri, 17 Mar 2017 11:47:26 +0000 (12:47 +0100)]
Create a notification when the update server couldn't be reached for some days
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Sun, 26 Mar 2017 07:51:23 +0000 (09:51 +0200)]
use moments.js min in core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sun, 26 Mar 2017 07:52:22 +0000 (09:52 +0200)]
[js] Bump momentjs
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sun, 26 Mar 2017 07:35:08 +0000 (09:35 +0200)]
Update bundled core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sun, 26 Mar 2017 07:34:32 +0000 (09:34 +0200)]
[js] Bump DOMPurify
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Morris Jobke [Sun, 26 Mar 2017 06:04:40 +0000 (00:04 -0600)]
Merge pull request #4053 from nextcloud/bump-zxcvbn
[3rdparty] Bump zxcvbn
Nextcloud bot [Sun, 26 Mar 2017 01:07:03 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Sat, 25 Mar 2017 19:56:20 +0000 (20:56 +0100)]
[3rdparty] Bump zxcvbn
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sat, 25 Mar 2017 18:22:38 +0000 (19:22 +0100)]
Merge pull request #4049 from nextcloud/fix-installation-again
Don't run JSCombiner when not installed
Lukas Reschke [Sat, 25 Mar 2017 14:25:06 +0000 (15:25 +0100)]
Don't run JSCombiner when not installed
When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Nextcloud bot [Sat, 25 Mar 2017 01:07:45 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 24 Mar 2017 23:30:24 +0000 (17:30 -0600)]
Merge pull request #4037 from nextcloud/downstream-27421
Use authType BASIC for Sabre client in integration tests
Morris Jobke [Fri, 24 Mar 2017 21:42:08 +0000 (15:42 -0600)]
Merge pull request #4043 from nextcloud/merge-js-for-template-prepend
Merge JS for template prepend
Morris Jobke [Fri, 24 Mar 2017 21:38:29 +0000 (15:38 -0600)]
Merge pull request #4044 from nextcloud/merge-login-js
Merge login JS
Lukas Reschke [Fri, 24 Mar 2017 20:18:24 +0000 (21:18 +0100)]
Merge login JS
Removes 2 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Fri, 24 Mar 2017 20:12:42 +0000 (21:12 +0100)]
Merge pull request #4041 from nextcloud/merge-systemtags-js
Merge systemtags JS
Lukas Reschke [Fri, 24 Mar 2017 20:11:58 +0000 (21:11 +0100)]
Merge pull request #4040 from nextcloud/merge-js-for-versions
Merge JS for files_versions
Lukas Reschke [Fri, 24 Mar 2017 20:11:42 +0000 (21:11 +0100)]
Merge pull request #4042 from nextcloud/merge-js-forsharing-code
Merge sharing backend JS
Lukas Reschke [Fri, 24 Mar 2017 19:36:19 +0000 (20:36 +0100)]
Merge JS for template prepend
Shaves off 14 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Fri, 24 Mar 2017 19:17:38 +0000 (20:17 +0100)]
Merge sharing backend JS
Removes 8 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Morris Jobke [Fri, 24 Mar 2017 19:17:06 +0000 (13:17 -0600)]
Merge pull request #4038 from nextcloud/merge-js-for-fileview
Merge file view JS files
Morris Jobke [Fri, 24 Mar 2017 19:16:38 +0000 (13:16 -0600)]
Merge pull request #4039 from nextcloud/merge-js-for-comments
Merge JS for comments
Lukas Reschke [Fri, 24 Mar 2017 19:08:27 +0000 (20:08 +0100)]
Merge systemtags JS
Shaves off 7 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Fri, 24 Mar 2017 18:57:19 +0000 (19:57 +0100)]
Merge JS for files_versions
Shaves off 3 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Fri, 24 Mar 2017 18:49:43 +0000 (19:49 +0100)]
Merge JS for comments
Shaves off 6 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Fri, 24 Mar 2017 18:41:49 +0000 (19:41 +0100)]
Merge file view JS files
Removes 26 requests on the file list loading
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Vincent Petry [Mon, 20 Mar 2017 11:41:56 +0000 (12:41 +0100)]
Use authType BASIC for Sabre client in integration tests
This helps massively reduce the numerous useless 401 exceptions that
appears in the test log. These appear only because Sabre first connects
without any auth type to receive the challenge and then sends the
authentication data.
With this change it will directly use basic auth.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Lukas Reschke [Fri, 24 Mar 2017 18:31:31 +0000 (19:31 +0100)]
Merge pull request #3988 from nextcloud/jscombiner
[PoC] JS Combiner
Morris Jobke [Fri, 24 Mar 2017 17:10:20 +0000 (11:10 -0600)]
Merge pull request #4021 from nextcloud/update-dependencies
Update dependencies
Morris Jobke [Thu, 23 Mar 2017 23:14:46 +0000 (17:14 -0600)]
Update dependencies
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Fri, 24 Mar 2017 15:11:54 +0000 (16:11 +0100)]
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Joas Schilling [Fri, 24 Mar 2017 14:02:49 +0000 (15:02 +0100)]
Throw a nice HintException when the apps are missing
Signed-off-by: Joas Schilling <coding@schilljs.com>
Björn Schießle [Fri, 24 Mar 2017 13:33:03 +0000 (14:33 +0100)]
Merge pull request #3825 from nextcloud/federation-fixes
create correct VCard and return correct error codes
Joas Schilling [Fri, 24 Mar 2017 10:52:42 +0000 (11:52 +0100)]
Allow to use short URLs for calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 24 Mar 2017 10:51:58 +0000 (11:51 +0100)]
Allow to push a non-query URL to the browser history
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Fri, 24 Mar 2017 10:00:07 +0000 (11:00 +0100)]
Tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Bjoern Schiessle [Thu, 23 Mar 2017 15:10:53 +0000 (16:10 +0100)]
fix tests
calling getAbsoluteBundlePath() in the constructor makes other tests fail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Joas Schilling [Thu, 23 Mar 2017 13:33:25 +0000 (14:33 +0100)]
Load cert file before syncing addressbooks and contacts
Signed-off-by: Joas Schilling <coding@schilljs.com>
Bjoern Schiessle [Mon, 13 Mar 2017 15:54:27 +0000 (16:54 +0100)]
use right format for avatars
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Mon, 13 Mar 2017 13:58:37 +0000 (14:58 +0100)]
don't add empty values to the vcard
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Mon, 13 Mar 2017 11:13:57 +0000 (12:13 +0100)]
only execute code if exception was thrown by the corresponding controller
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Mon, 13 Mar 2017 13:47:08 +0000 (14:47 +0100)]
fix the way we create a new vcard to avoid to have multiple UIDs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>