Skip to content
This repository was archived by the owner on Jan 6, 2023. It is now read-only.

Commit 49e9e48

Browse files
authored
Merge pull request #720 from mozilla/production-3.0.0
Production 3.0.0
2 parents 4e9fc07 + 0e01122 commit 49e9e48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+16901
-1136
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["react"]
3+
}

.eslintrc.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ env:
44
webextensions: true
55

66
parserOptions:
7+
ecmaFeatures:
8+
jsx: true
79
ecmaVersion: 2017
10+
sourceType: module
811

912
extends:
1013
- eslint:recommended
1114
- plugin:mozilla/recommended
15+
- plugin:react/recommended
16+
- plugin:jsx-a11y/recommended
1217

1318
globals:
14-
BrowserStorageCredentials: false
1519
ClassicEditor: false
1620
Jose: false
1721
JoseJWE: false
@@ -20,23 +24,26 @@ globals:
2024
Quill: false
2125
TestPilotGA: false
2226
customizeEditor: false
23-
disconnectFromKinto: false
2427
formatFooterTime: false
2528
fxaCryptoRelier: false
2629
fxaFetchProfile: false
2730
fxaRenewCredential: false
2831
getPadStats: false
29-
loadFromKinto: false
3032
localizeEditorButtons: false
3133
migrationCheck: false
3234
migrationNote: false
3335
migrationBody: false
3436
retrieveNote: false
35-
saveToKinto: false
3637
setAnimation: false
38+
BrowserStorageCredentials: false
39+
loadFromKinto: false
40+
disconnectFromKinto: false
41+
saveToKinto: false
3742

3843
plugins:
3944
- mozilla
45+
- jsx-a11y
46+
- react
4047

4148
root: true
4249

.stylelintrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"extends": "stylelint-config-recommended",
3+
"rules": {
4+
"no-descending-specificity": null,
5+
"shorthand-property-no-redundant-values": null
6+
}
7+
}

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: node_js
22
addons:
33
firefox: latest
44
node_js:
5-
- "6"
5+
- "8"
66
before_install:
77
- export DISPLAY=:99.0
88
- sh -e /etc/init.d/xvfb start
@@ -15,12 +15,17 @@ env:
1515

1616
matrix:
1717
include:
18-
- script: npm run build-ck
19-
env: BUILD_CK
18+
- script: npm run test
19+
env:
20+
global:
21+
- FIREFOX_BINARY: firefox
2022
before_install:
23+
- export DISPLAY=:99.0
24+
- sh -e /etc/init.d/xvfb start
25+
- sleep 3
2126
- script: npm run build
2227
env: BUILD_NOTES
23-
before_install:
2428
- script: npm run lint
2529
env: LINT
30+
before_script: npm run build
2631
before_install:

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 3.0.0
4+
5+
* Add send-to-notes context menu (#655)
6+
* Use React.js states to render the add-on frontend (#550)
7+
* Export to HTML feature (#695)
8+
9+
310
## 2.2.0 (2018-02-12)
411

512
* Add the full heading names (#528)

README.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# Firefox Notes
22

3+
A notepad for Firefox
4+
35
[![CircleCI](https://circleci.com/gh/mozilla/notes/tree/master.svg?style=svg)](https://circleci.com/gh/mozilla/notes/tree/master)
46
[![Available on Test Pilot](https://img.shields.io/badge/available_on-Test_Pilot-0996F8.svg)](https://testpilot.firefox.com/experiments/notes)
57
[![Waffle.io - Bug Triage](https://badge.waffle.io/mozilla/notes.svg?columns=all)](https://waffle.io/mozilla/notes)
68

7-
## What does it aim for
8-
9-
This project let you open a notepad in the Firefox toolbar to store notes about your browsing.
9+
> Discussion Forum: [https://discourse.mozilla.org/c/test-pilot/notes](https://discourse.mozilla.org/c/test-pilot/notes)
1010
1111

12-
## How can you use it
12+
## Contribute
1313

14-
Step 0: If you plan on sending pull-request, you should fork the repository.
15-
Step 1: Clone the [notes](https://github.com/mozilla/notes) repository or your fork.
14+
* Step 0: If you plan on sending a pull-request, you should fork the repository.
15+
* Step 1: Clone the [notes](https://github.com/mozilla/notes) repository or your fork.
1616
```
1717
git clone https://github.com/mozilla/notes.git
1818
# or
1919
git clone https://github.com/[yourusername]/notes.git
2020
```
21-
Step 2:Navigate to the root of the directory you cloned and run:
21+
* Step 2: Navigate to the root of the directory you cloned and run:
2222
> Make sure to use Node.js 6+.
2323
2424
| Command | Description |
@@ -29,7 +29,11 @@ Step 2:Navigate to the root of the directory you cloned and run:
2929

3030
You can also open the `test/index.html` file in your browser to run the automated tests.
3131

32-
## Localization
32+
## Release
33+
34+
See [RELEASE.md](https://github.com/mozilla/notes/blob/master/RELEASE.md) for release steps.
35+
36+
### Localization
3337

3438
Firefox Notes localization is managed via [Pontoon](https://pontoon.mozilla.org/projects/test-pilot-notes/), not direct pull requests to the repository. If you want to fix a typo, add a new language, or simply know more about localization, please get in touch with the [existing localization team](https://pontoon.mozilla.org/teams/) for your language, or Mozilla’s [l10n-drivers](https://wiki.mozilla.org/L10n:Mozilla_Team#Mozilla_Corporation) for guidance.
3539

RELEASE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ git push origin production
4040
* Upgrade to next version in dev (i.e 1.8.0dev):
4141
* Update `package.json` next version number
4242
* Update `src/manifest.json` next version number
43-
* Update `src/background.js` next version number
4443
* Prepare `CHANGELOG.md` for the next release
4544

4645
```

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ machine:
44

55
test:
66
override:
7+
- npm run build
78
- npm run lint
89

910
# Build the extension and copy to artifacts directory.
10-
- npm run build
1111
- cp web-ext-artifacts/*.zip $CIRCLE_ARTIFACTS

docs/metrics.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@ An event fired when the migration from Quill.JS to CKEditor already happened
152152
- `ec` - `notes`
153153
- `ea` - `metrics-migrated-before`
154154

155+
#### `context-menu`
156+
An event fired when the "Send to Notes" context menu is used
157+
158+
- `ec` - `notes`
159+
- `ea` - `metrics-context-menu`
160+
155161
#### `limit-reached`
156162

157163
An event fired when user goes over the pad limit (15000 character)

locales/ar/notes.properties

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,10 @@ textDirectionTitle=اتجاه النص
107107
themeLegend=سمة
108108
defaultThemeTitle=المبدئي
109109
darkThemeTitle=داكن
110+
111+
# Displayed in the context menu when selecting text on a web page, used to send
112+
# the text to Firefox Notes. Keep "Notes" in English, since it's the name of the
113+
# add-on.
114+
sendToNotes=أرسِل إلى الملاحظات
115+
116+
exportAsHTML=صدّر بنسق HTML…

0 commit comments

Comments
 (0)