Merge branch 'master' into Index

# Conflicts:
#	web/jobs/jobs.go

.gitignore

@@ -3,6 +3,7 @@
 /assets/locales/*.po
 !/assets/locales/en.po
 /cozy-stack*
+/scripts/cozy-stack*
 /debian
 /storage
 /tests/clone/generated

assets/.externals

@@ -11,20 +11,20 @@
 #
 
 name    ./js/cozy-client.min.js
-url     https://raw.githubusercontent.com/cozy/cozy-client-js/v0.12.1/dist/cozy-client.min.js
-sha256  2c8fab17148a133a6ff3ad61445ef12f62cd9be6f392a0801f822d021a72e52d
+url     https://raw.githubusercontent.com/cozy/cozy-client-js/v0.13.0/dist/cozy-client.min.js
+sha256  adff3cdbe79c01f6d6b046fd4494e8d37669ccff442f6ab8ae2f6ed8a83241bf
 
 name    ./js/cozy-client.min.js.map
-url     https://raw.githubusercontent.com/cozy/cozy-client-js/v0.12.1/dist/cozy-client.min.js.map
+url     https://raw.githubusercontent.com/cozy/cozy-client-js/v0.13.0/dist/cozy-client.min.js.map
 sha256  290d9610010534cdc8454424825b29913303579b6ab63181100f84713439c0a5
 
 name    ./js/cozy-bar.min.js
-url     https://unpkg.com/cozy-bar@6.1.1/dist/cozy-bar.min.js
-sha256  d18d72e55f24859be88cd76733d46ad7a9e906a26d930ca1db4242c9a3697616
+url     https://unpkg.com/cozy-bar@5.4.0/dist/cozy-bar.min.js
+sha256  ea0638d11a6256f5821f725a3b95535fed0354090c34355b61445d0643b3fb30
 
 name    ./css/cozy-bar.min.css
-url     https://unpkg.com/cozy-bar@6.1.1/dist/cozy-bar.min.css
-sha256  c844880a4dd5a16af92b33db416ee736c0ea1d3d214f8d1d171981aab7d58e20
+url     https://unpkg.com/cozy-bar@5.4.0/dist/cozy-bar.min.css
+sha256  3948f637b56cca2a0eeaccd7e3ed8ce476ba3161465f697f4a2a7f8665248e92
 
 name    ./js/piwik.js
 url     https://piwik.cozycloud.cc/piwik.js

assets/locales/en.po

@@ -49,7 +49,7 @@ msgid "Login Password button hide"
 msgstr "hide"
 
 msgid "Login Long Session"
-msgstr "Memorize"
+msgstr "Remember me"
 
 msgid "Login Submit"
 msgstr "Log in"
@@ -218,6 +218,15 @@ msgstr "Address of this Cozy does not exist"
 msgid "Error Instance not found Message"
 msgstr "You may have entered a wrong address form a typing mistake. To make sure, please check the address of your Cozy sent to you by e-mail during its creation."
 
+msgid "Error Application not found Title"
+msgstr "Application not yet available"
+
+msgid "Error Application not found Message"
+msgstr "We are sorry. This application is not yet available in your Cozy."
+
+msgid "Error Application not found Action"
+msgstr "Go to your home"
+
 msgid "Error Contact us"
 msgstr "A problem, a question ? Contact us at"
 
@@ -400,15 +409,6 @@ msgstr ""
 "You never asked for a new password? In this case you can forget this email.\n"
 "Just so you know, you have 15 minutes to choose a new password, then this email will self-destruct."
 
-msgid "Mail Konnector Error Subject"
-msgstr "Collection problem for your Cozy"
-
-msgid "Mail Konnector Error Intro"
-msgstr ""
-"Something wrong happened when we tried to gather the data from your {{.KonnectorName}} account.\n"
-"If you want more information, please go to the configuration page {{.KonnectorPage}} of your account.\n"
-"If the problem remains, please contact us at [email protected]\n"
-
 msgid "Mail Archive Subject"
 msgstr "Archive of your Cozy data"
 
@@ -552,18 +552,24 @@ msgid "Sharing Online help"
 msgstr "Try out online help."
 
 msgid "Notifications Disk Quota Subject"
-msgstr "You have reached 90% of your available storage"
+msgstr "You have currently reached 90% of your Cozy space."
 
 msgid "Notifications Disk Quota Intro"
-msgstr ""
-"You have reached 90% of your available storage. When reach your storage quota, you will not be able to add any more files to your Cozy.\"
-"In order to keep your account below its storage quota, you can delete files from your Cozy or subscribe to a new option."
+msgstr "You have two options to get more space."
+
+msgid "Notifications Disk Quota offers instruction"
+msgstr "Option 1: Upgrade your account\n"
+"Upgrade your Cozy by choosing new offer to get lots more space"
+
+msgid "Notifications Disk Quota offers text"
+msgstr "Upgrade now"
 
-msgid "Notifications Disk Quota instruction"
-msgstr "Click on this button to subscribe to a new option and get more data in your Cozy."
+msgid "Notifications Disk Quota free instructions"
+msgstr "Option 2: Free up space\n"
+"Save space by deleting unneeded files"
 
-msgid "Notifications Disk Quota text"
-msgstr "Subscribe for more data"
+msgid "Notifications Disk Quota free text"
+msgstr "Free up storage space"
 
 msgid "Terms of services have been updated"
 msgstr "To comply with the GDPR, Cozy Cloud has updated its Terms of Services that have taken effect on May 25, 2018"

assets/styles/stack.css

@@ -243,9 +243,6 @@ li[class^="io.cozy.files"]:before {
 li[class^="io.cozy.konnectors"]:before {
     background-image: url('../images/icon-konnectors.svg');
 }
-li[class^="io.cozy.konnectors.result"]:before {
-    background-image: url('../images/icon-konnectors-result.svg');
-}
 li[class^="io.cozy.notifications"]:before {
     background-image: url('../images/icon-notifications.svg');
 }

assets/templates/error.html

@@ -27,6 +27,9 @@ <h1>{{if .ErrorTitle}}{{t .ErrorTitle}}{{else}}{{t "Error Title"}}{{end}}</h1>
                   <p>{{$p}}</p>
                   {{end}}
                 {{end}}
+                {{if .ActionURL }}
+                <p><a href="{{.ActionURL}}">{{t .ActionTitle}}</a></p>
+                {{end}}
                 <p><strong>{{t "Error Contact us" }} <a href="mailto:[email protected]">[email protected]</a>.</strong></p>
               </div>
             </div>

client/instances.go

@@ -77,10 +77,11 @@ type TokenOptions struct {
 // OAuthClientOptions is a struct holding all the options to generate an OAuth
 // client associated to an instance.
 type OAuthClientOptions struct {
-	Domain      string
-	RedirectURI string
-	ClientName  string
-	SoftwareID  string
+	Domain          string
+	RedirectURI     string
+	ClientName      string
+	SoftwareID      string
+	AllowLoginScope bool
 }
 
 // UpdatesOptions is a struct holding all the options to launch an update.
@@ -219,29 +220,6 @@ func (c *Client) DestroyInstance(domain string) error {
 	return err
 }
 
-// FsckInstance returns the list of the inconsistencies in the VFS.
-func (c *Client) FsckInstance(domain string, prune, dryRun bool) ([]map[string]string, error) {
-	if !validDomain(domain) {
-		return nil, fmt.Errorf("Invalid domain: %s", domain)
-	}
-	res, err := c.Req(&request.Options{
-		Method: "GET",
-		Path:   "/instances/" + url.PathEscape(domain) + "/fsck",
-		Queries: url.Values{
-			"Prune":  {strconv.FormatBool(prune)},
-			"DryRun": {strconv.FormatBool(dryRun)},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	var list []map[string]string
-	if err = json.NewDecoder(res.Body).Decode(&list); err != nil {
-		return nil, err
-	}
-	return list, nil
-}
-
 // GetToken is used to generate a toke with the specified options.
 func (c *Client) GetToken(opts *TokenOptions) (string, error) {
 	q := url.Values{
@@ -273,10 +251,11 @@ func (c *Client) GetToken(opts *TokenOptions) (string, error) {
 // instance.
 func (c *Client) RegisterOAuthClient(opts *OAuthClientOptions) (map[string]interface{}, error) {
 	q := url.Values{
-		"Domain":      {opts.Domain},
-		"RedirectURI": {opts.RedirectURI},
-		"ClientName":  {opts.ClientName},
-		"SoftwareID":  {opts.SoftwareID},
+		"Domain":          {opts.Domain},
+		"RedirectURI":     {opts.RedirectURI},
+		"ClientName":      {opts.ClientName},
+		"SoftwareID":      {opts.SoftwareID},
+		"AllowLoginScope": {strconv.FormatBool(opts.AllowLoginScope)},
 	}
 	res, err := c.Req(&request.Options{
 		Method:  "POST",