Skip to content

/ notes

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Sync Support on top of CKEditor #425

Merged
merged 178 commits into from Dec 7, 2017
Merged

Add Sync Support on top of CKEditor #425

merged 178 commits into from Dec 7, 2017

Conversation

@Natim
Copy link
Collaborator

@Natim Natim commented Nov 21, 2017 •
edited

Fixes #180
Superseeded #313
vladikoff and others added 30 commits Jul 13, 2017
@vladikoff
Bring back FxA login using the crypto relier library
378a8a5
@vladikoff
switch to live server
b97596c
@vladikoff
wip
c9a9a93
@vladikoff
Update to latest changes
b92c5c3
@vladikoff
Add install step for lib
081bd55
Rémy HUBSCHER @vladikoff
Fix lint errors.
9e3c963
Rémy HUBSCHER @vladikoff
Adding back kinto and jose libs.
f8e0cb5
Rémy HUBSCHER @vladikoff
Store credentials in local storage.
328e6a7
@vladikoff
Update to latest relier lib
a68aeec
@vladikoff
update to latest relier lib
4a0b5ee
@vladikoff
fix lib install and server endpoint
7307104
@vladikoff
Add localization note
8743892
@vladikoff
use 1.0.0 of relier lib
ae559e1
Rémy HUBSCHER
Put back kinto syncing.
1961182
Rémy HUBSCHER
Load from kinto and sync into kinto.
1837005
Rémy HUBSCHER
Add debounce.
7979a96
Rémy HUBSCHER
Enable disconnect on the Give Feedback button.
eb2bf18
Rémy HUBSCHER
Handle status bar.
a925d9d
Rémy HUBSCHER
Better handle merges.
a39de3e
Rémy HUBSCHER
Use the Kinto timestamp in the toolbar.
ecf7c3c
Rémy HUBSCHER
Load kinto on first login.
d65423e
Rémy HUBSCHER
Don't merge with the first content.
017a650
Rémy HUBSCHER
Initial content status.
b3c85ab
Rémy HUBSCHER
Initial content was hard to grasp.
c2743dd
Rémy HUBSCHER
Make linter happy!!
2187f4d
Rémy HUBSCHER
Move code related to Kinto loading/saving and encryption in the sync.…
49994af 
…js file.
Rémy HUBSCHER
Fix eslint configuration.
bad16c9
Rémy HUBSCHER
Don't ask to merge a previous merged thing. Fix #230
2dc9f88
Rémy HUBSCHER
Handle merge conflicts on save.
d64cb1d
Rémy HUBSCHER
Update FXA Crypto lib.
41bc33b
Rémy HUBSCHER added 4 commits Nov 29, 2017
Rémy HUBSCHER
Remove quill ops property.
359b0db
Rémy HUBSCHER
Reload when handling the conflict.
d58eb34
Rémy HUBSCHER
Conflict handling with race.
b105bfe
Rémy HUBSCHER
Switching between sidebar windows still update other sidebars.
b2b5fad
@Natim
Copy link
Collaborator Author

@Natim Natim commented Nov 29, 2017

addon-2.0.0b5.zip
vladikoff added 6 commits Nov 30, 2017
@vladikoff
Fix start to just start
90f4bf2
@vladikoff
Add sync metrics events, handle password reset and change, reconnect …
aaf494b 
…notification,

Fixes #464
Fixes #463
Fixes #293
Fixes #391
@vladikoff
Start without ckeditor rebuild
031fd02
@vladikoff
Localize merge warning
aad98a3
@vladikoff
use lastModified as Date.now() in panel front-end
83d1e2d
@vladikoff
Simplify CSS for the menu
88a3cf1
@Natim
Copy link
Collaborator Author

@Natim Natim commented Dec 1, 2017

addon-2.0.0b6.zip
vladikoff added 3 commits Dec 1, 2017
@vladikoff
Merge branch 'master' into sync-v5
ece5857 
# Conflicts:
#	locales/en-US/notes.properties
@vladikoff
Use new strings
3cce2b7
@vladikoff
Enable disable sync button when reconnect is shown
f6599c8
@vladikoff
vladikoff reviewed Dec 1, 2017
View changes
src/background.js Outdated
/**
* Google Analytics / TestPilot Metrics
*/
const TRACKING_ID = 'UA-35433268-79';

const KINTO_SERVER = 'https://kinto-testpilot.stage.mozaws.net/v1';

This comment has been minimized.

Sign in to view
@vladikoff

vladikoff Dec 1, 2017
Contributor

Use prod kinto here before merge
@vladikoff
Copy link
Contributor

@vladikoff vladikoff commented Dec 1, 2017

addon-2.0.0b7.zip
vladikoff and others added 2 commits Dec 4, 2017
@vladikoff
Remove extra title tag in feedback icon
54c7242 
Fixes #474
Rémy HUBSCHER
Prevent resyncing while already syncing.
643eb26 
Fixes #479.
@Natim
Copy link
Collaborator Author

@Natim Natim commented Dec 6, 2017

addon-2.0.0b8.zip
vladikoff added 3 commits Dec 6, 2017
@vladikoff
Handle drag and drop sync (#496)
bf64e70 
Fixes #491
Fixes #490
@vladikoff
Fix Sync button tab navigation
487ccf2 
Fixes #495
@vladikoff
Fix "Syncing changes..." message not hiding in other windows, hide sa…
cbc878d 
…ving indicator on reconnect

Addresses #483
Fixes #482
@vladikoff
Copy link
Contributor

@vladikoff vladikoff commented Dec 6, 2017

notes-2.0.0rc1.zip
Rémy HUBSCHER added 2 commits Dec 7, 2017
Rémy HUBSCHER
Switch to the production stack. Fixes #493.
2659f69
Rémy HUBSCHER
Merge branch 'master' and upgrade translation.
6915aa8
@Natim
Copy link
Collaborator Author

@Natim Natim commented Dec 7, 2017

RC means I am landing this in master.
@Natim Natim merged commit 4b603ce into master Dec 7, 2017
0 of 3 checks passed
0 of 3 checks passed
ci/circleci CircleCI is running your tests
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/travis-ci/push The Travis CI build is in progress
Details
@Natim Natim deleted the sync-v5 branch Feb 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vladikoff vladikoff

@pdehaan pdehaan

@flodolo flodolo

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@Natim @vladikoff @pdehaan @flodolo @glasserc @cedricium @sebastienbarbier