Skip to content

Commit

Permalink
Merge branch 'v3.4.2' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
mijien0179 authored Aug 9, 2019
2 parents ff56b46 + 8de465a commit 46c8e51
Show file tree
Hide file tree
Showing 16 changed files with 149 additions and 173 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ There might be several issue present on the [IssueHunt](https://issuehunt.io/rep

You can contribute me financially by two ways:

1. Sending donation directly to my Paypal
1. Sending donation directly to my PayPal

[<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif">](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=4W3EWHHBSYMM8&lc=IE&item_name=Code%20Settings%20Sync&item_number=visual%20studio%20code%20settings%20sync&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)

Expand Down
23 changes: 11 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ While being free and open source, if you find it useful, please consider support
</a>
<br>
</td>
<td>
<td>
<a href="https://opencollective.com/code-settings-sync/order/3848" target="_blank">
<img src="https://opencollective.com/webpack/donate/button.png?color=blue" width=200 />
</a>
<br>
*2$ Per Month
</td>
</tr>
</table>
<br>
Expand Down Expand Up @@ -75,17 +74,17 @@ All extensions and complete User Folder that Contains

Settings Sync Configuration page will be opened automatically on code start and requires two things to setup:

1. Github Token
2. Github Gist Id
1. GitHub Token
2. GitHub Gist Id

Github Token needs to be retrived by your Github account while Settings Sync creates GIST if you are first time user.
GitHub Token needs to be retrived by your GitHub account while Settings Sync creates GIST if you are first time user.

Following are the steps you need to perform to configure.

- Click on `Login with Github` .
- Login Github on Browser and close the browser tab once you get Success message.
- Click on `Login with GitHub` .
- Login GitHub on Browser and close the browser tab once you get Success message.
- If you are using Settings Sync first time GIST will be created automatically when you upload your settings.
- If you already have Github Gist, new window will be opened to allow you to select the Github Gist or `Skip` to create new Gist.
- If you already have GitHub Gist, new window will be opened to allow you to select the GitHub Gist or `Skip` to create new Gist.



Expand Down Expand Up @@ -176,7 +175,7 @@ Other users can give your Gist Id to download the Gist, but they can't upload th
Settings can be changed through the settings page, which can be accessed through **"> Sync : Advanced Options > Open Settings Page"**

There are two types of settings in Settings Sync.
I will recommend you to read the configurations details [here](https://medium.com/@itsShanKhan/visual-studio-code-settings-sync-configurations-ed8dd6fd9753).
I will recommend you to read the configurations details [here](https://dev.to/shanalikhan/visual-studio-code-settings-sync-configurations-mn0).

### Gist Settings

Expand All @@ -185,7 +184,7 @@ You can customize the settings in gist settings like:

```
1. Configure Gist Id (Environment)
2. Configure auto upload / download for Github Gist
2. Configure auto upload / download for GitHub Gist
3. Configure extension sync behaviour
4. Configure force download
4. Configure force upload
Expand Down Expand Up @@ -215,7 +214,7 @@ You can customize the sync:
2. Configure default Gist Environment name.
3. Replace the code settings after downloading.
4. Change the Gist description while creating new one in github.
5. Configure Github Enterprise Url
5. Configure GitHub Enterprise Url
```

```json
Expand Down Expand Up @@ -254,7 +253,7 @@ You can customize the sync:
}
```

I will recommend you to read the configurations details [here](https://medium.com/@itsShanKhan/visual-studio-code-settings-sync-configurations-ed8dd6fd9753).
I will recommend you to read the configurations details [here](https://dev.to/shanalikhan/visual-studio-code-settings-sync-configurations-mn0).

### Troubleshooting

Expand Down
7 changes: 1 addition & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,6 @@
"default": false,
"description": "%ext.config.quietSync%"
},
"sync.askGistName": {
"type": "boolean",
"default": false,
"description": "%ext.config.askGistName%"
},
"sync.removeExtensions": {
"type": "boolean",
"default": true,
Expand All @@ -158,7 +153,7 @@
"test": "npm run tslint-check && tsc -p ./ && mocha --recursive \"./out/test/**/*.js\""
},
"devDependencies": {
"@types/chai": "4.1.7",
"@types/chai": "4.2.0",
"@types/express": "^4.16.1",
"@types/lodash": "^4.14.123",
"@types/node-fetch": "^2.3.3",
Expand Down
1 change: 0 additions & 1 deletion package.nls.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
"common.prompt.gistNewer": "Sync: Gist hat einen neueren oder gleichen version Ihrer Einstellungen. Wollen Sie aktivieren forceUpload, dies zu ändern?",
"common.prompt.multipleGist": "Ermöglicht Ihnen, Einstellungen identifizieren, wenn Sie mehrere wesentliche.",
"common.prompt.restartCode": "Wollen Sie laden sich zu bewerben Erweiterungen und Konfigurationen?",
"ext.config.askGistName": "Fragen gist Namen auf erstellen. Hilft Ihnen zu identifizieren, das wesentliche, wenn Sie mehrere Gist.",
"ext.config.autoDownload": "Gesetzt, es wahr zu Automatischen Download der settings auf den code starten. [Code-Neustart Erforderlich]",
"ext.config.autoDownload.name": "Auto-Download",
"ext.config.autoUpload": "Legen Sie true, um die Automatische Upload über die settings ändern. [Code-Neustart Erforderlich]",
Expand Down
1 change: 0 additions & 1 deletion package.nls.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
"common.prompt.gistNewer": "Sincronización: Gist tiene una o más reciente versión idéntica de su configuración. ¿Desea habilitar forceUpload para anular este?",
"common.prompt.multipleGist": "Permite identificar las opciones de configuración si tiene varios gist.",
"common.prompt.restartCode": "¿Desea volver a cargar para aplicar extensiones y configuraciones?",
"ext.config.askGistName": "Pida a los gist nombre sobre la creación. Ayuda a identificar la esencia si tiene varios fundamentos.",
"ext.config.autoDownload": "Conjunto es cierto para Descargar automáticamente los ajustes en el código de inicio. [Código Necesario Reiniciar]",
"ext.config.autoDownload.name": "Descarga Automática",
"ext.config.autoUpload": "Conjunto es cierto para Carga Automática en la configuración de cambio. [Código Necesario Reiniciar]",
Expand Down
1 change: 0 additions & 1 deletion package.nls.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
"common.prompt.gistNewer": "Sync: Gist a une nouvelle ou identique à la version de vos paramètres. Voulez-vous activer forceUpload pour remplacer ce?",
"common.prompt.multipleGist": "Vous permet d'identifier les paramètres si vous avez plusieurs de gist.",
"common.prompt.restartCode": "Voulez-vous recharger d'appliquer les extensions et les configurations?",
"ext.config.askGistName": "Demandez gist nom lors de la création. Vous aide à identifier l'essentiel, si vous avez plusieurs gist.",
"ext.config.autoDownload": "Fixé la valeur à true pour Télécharger automatiquement les paramètres de code de démarrage. [Code Redémarrage Nécessaire]",
"ext.config.autoDownload.name": "Téléchargement Automatique",
"ext.config.autoUpload": "Jeu-il vrai de Téléchargement Automatique sur la modification des paramètres. [Code Redémarrage Nécessaire]",
Expand Down
1 change: 0 additions & 1 deletion package.nls.hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
"common.prompt.gistNewer": "Fordította: Lényeget egy újabb vagy azonos változata a beállításokat. Szeretné engedélyezni a forceUpload, hogy ezt felül?",
"common.prompt.multipleGist": "Lehetővé teszi, hogy azonosítsa a beállítások ha több lényeget.",
"common.prompt.restartCode": "Akarod, hogy újra alkalmazni fájlokat, konfigurációk?",
"ext.config.askGistName": "Kérdezd meg lényeget neve után létrehozása. Segít azonosítani a lényeg, ha több gists.",
"ext.config.autoDownload": "Állítsa igaz, hogy az Automatikus Letöltés beállításai kód kezdeni. [Kód Újraindítás Szükséges]",
"ext.config.autoDownload.name": "Automatikus Letöltés",
"ext.config.autoUpload": "Állítsa igaz, hogy az Automatikus Feltöltés a beállítások módosítása. [Kód Újraindítás Szükséges]",
Expand Down
1 change: 0 additions & 1 deletion package.nls.it.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
"common.prompt.gistNewer": "Sync: Gist è più recente o identica versione delle impostazioni. Se si vuole attivare forceUpload per eseguire l'override di questo?",
"common.prompt.multipleGist": "Consente di identificare le impostazioni, se si dispone di più gist.",
"common.prompt.restartCode": "Vuoi ricaricare per applicare le estensioni e le configurazioni?",
"ext.config.askGistName": "Chiedi gist nome al momento della creazione. Aiuta a identificare la sostanza, se si dispone di più i gist.",
"ext.config.autoDownload": "Il Set e ' vero per il Download Automatico le impostazioni del codice di avvio. [Codice Di Riavvio Richiesto]",
"ext.config.autoDownload.name": "Il Download Automatico",
"ext.config.autoUpload": "Impostare la verità Upload Automatico su modifica impostazioni. [Codice Di Riavvio Richiesto]",
Expand Down
1 change: 0 additions & 1 deletion package.nls.ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"ext.config.host": "GHE を使用する場合は GitHub Enterprise のホストを設定してください",
"ext.config.pathPrefix": "GHE を使用する場合は GitHub Enterprise API のプレフィックスを設定してください。通常は '/api/v3' です。ホストが設定されている場合にのみ使用されます",
"ext.config.quietSync": "結果をサマリーページではなくステータスバーに表示します",
"ext.config.askGistName": "作成時に Gist 名を確認することで、複数 Gist が存在する際に識別しやすくなります",
"ext.config.removeExtensions": "ダウンロード中に拡張機能を削除します",
"ext.config.syncExtensions": "拡張機能をアップロード・ダウンロードします",
"cmd.howSetting.title": "Sync: Settings Sync の設定方法を参照",
Expand Down
3 changes: 1 addition & 2 deletions package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"ext.config.host": "Set it to your GitHub Enterprise host if you want to use GHE.",
"ext.config.pathPrefix": "Set it to your GitHub Enterprise API prefix if you want to use GHE. Normally '/api/v3'. Only used when host is set.",
"ext.config.quietSync": "When set to true, will show the result in status bar instead of summary page.",
"ext.config.askGistName": "Ask gist name upon creating. Helps you to identify the gist if you have multiple gists.",
"ext.config.removeExtensions": "Set it to false if you don't want to remove extensions while downloading.",
"ext.config.syncExtensions": "Set it to false if you don't want to upload/download the extensions.",
"cmd.howSetting.title": "Sync: How To Configure",
Expand Down Expand Up @@ -38,7 +37,7 @@
"cmd.resetSettings.info.resetting": "Sync: Resetting Your Settings.",
"cmd.resetSettings.info.settingClear": "Sync: Settings Cleared.",
"cmd.otherOptions.title": "Sync: Advanced Options",
"cmd.otherOptions.openSettingsPage": "Sync : Open Settings",
"cmd.otherOptions.openSettingsPage": "Sync: Open Settings",
"cmd.otherOptions.editLocalSetting": "Sync: Edit Extension Local Settings",
"cmd.otherOptions.shareSetting": "Sync: Share Settings with Public GIST",
"cmd.otherOptions.shareSetting.beforeConfirm": "Sync: This will remove current GIST and upload settings on new public GIST. Do you want to continue?",
Expand Down
Loading

0 comments on commit 46c8e51

Please sign in to comment.