Skip to content

Commit fc73357

Browse files
author
Erika Perugachi
authored
Merge pull request #449 from JulianAdams4/available-remote-login
Remote login socket event
2 parents 715715e + 5c319a3 commit fc73357

File tree

5 files changed

+42
-15
lines changed

5 files changed

+42
-15
lines changed

CHANGELOG.md

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,44 @@
11
# Change Log
22

3+
## [0.11.4](https://github.com/criptext/Criptext-Email-React-Client/tree/0.11.4) (2018-09-27)
4+
[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.11.3...0.11.4)
5+
6+
**Implemented enhancements:**
7+
8+
- Add CHANGELOG [\#448](https://github.com/Criptext/Criptext-Email-React-Client/issues/448)
9+
- Mailbox: Discard drafts [\#441](https://github.com/Criptext/Criptext-Email-React-Client/issues/441)
10+
11+
**Fixed bugs:**
12+
13+
- Mailbox: Fix labels on Spam and Trash [\#442](https://github.com/Criptext/Criptext-Email-React-Client/issues/442)
14+
- Mailbox: Discard drafts [\#441](https://github.com/Criptext/Criptext-Email-React-Client/issues/441)
15+
- Fix scroll [\#436](https://github.com/Criptext/Criptext-Email-React-Client/issues/436)
16+
- Fix decryption error [\#434](https://github.com/Criptext/Criptext-Email-React-Client/issues/434)
17+
- Fix search contact, shoul be fast [\#425](https://github.com/Criptext/Criptext-Email-React-Client/issues/425)
18+
19+
**Closed issues:**
20+
21+
- Automatic sync, when mailbox windows is focus [\#438](https://github.com/Criptext/Criptext-Email-React-Client/issues/438)
22+
- Composer: focus respective input with the differents action \[reply, fordward, new email\] [\#426](https://github.com/Criptext/Criptext-Email-React-Client/issues/426)
23+
24+
**Merged pull requests:**
25+
26+
- Composer and project structure [\#447](https://github.com/Criptext/Criptext-Email-React-Client/pull/447) ([erikaperugachi](https://github.com/erikaperugachi))
27+
- Remote Login [\#446](https://github.com/Criptext/Criptext-Email-React-Client/pull/446) ([JulianAdams4](https://github.com/JulianAdams4))
28+
- Fix reply email [\#445](https://github.com/Criptext/Criptext-Email-React-Client/pull/445) ([erikaperugachi](https://github.com/erikaperugachi))
29+
- Discard drafts, Spam & Trash Labels [\#444](https://github.com/Criptext/Criptext-Email-React-Client/pull/444) ([JulianAdams4](https://github.com/JulianAdams4))
30+
- Fix contact search & cleanHTML [\#443](https://github.com/Criptext/Criptext-Email-React-Client/pull/443) ([erikaperugachi](https://github.com/erikaperugachi))
31+
- Update issue templates [\#440](https://github.com/Criptext/Criptext-Email-React-Client/pull/440) ([danieltigse](https://github.com/danieltigse))
32+
- Automatic sync, when mailbox windows is focus. Close \#438 [\#439](https://github.com/Criptext/Criptext-Email-React-Client/pull/439) ([erikaperugachi](https://github.com/erikaperugachi))
33+
- Fix scroll. Fix \#436 [\#437](https://github.com/Criptext/Criptext-Email-React-Client/pull/437) ([erikaperugachi](https://github.com/erikaperugachi))
34+
- Fix decryption error. Fix \#434 [\#435](https://github.com/Criptext/Criptext-Email-React-Client/pull/435) ([erikaperugachi](https://github.com/erikaperugachi))
35+
336
## [0.11.3](https://github.com/criptext/Criptext-Email-React-Client/tree/0.11.3) (2018-09-21)
437
[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.11.2...0.11.3)
538

639
**Implemented enhancements:**
740

41+
- Login/Loading: Refactoring creating account new device [\#433](https://github.com/Criptext/Criptext-Email-React-Client/issues/433)
842
- Settings: Add OS information on Contact Support [\#420](https://github.com/Criptext/Criptext-Email-React-Client/issues/420)
943
- App: Remove all email data on delete [\#417](https://github.com/Criptext/Criptext-Email-React-Client/issues/417)
1044
- Mailbox: Empty Search Icon [\#409](https://github.com/Criptext/Criptext-Email-React-Client/issues/409)
@@ -22,6 +56,7 @@
2256

2357
**Closed issues:**
2458

59+
- Login & Mailbox: Login without password [\#431](https://github.com/Criptext/Criptext-Email-React-Client/issues/431)
2560
- EmailDetail: Move single email in thread to Spam or Trash [\#414](https://github.com/Criptext/Criptext-Email-React-Client/issues/414)
2661
- Mailbox: Delete emails in Trash over 30 days ago [\#406](https://github.com/Criptext/Criptext-Email-React-Client/issues/406)
2762
- Validate that any js run in the email viewer [\#349](https://github.com/Criptext/Criptext-Email-React-Client/issues/349)
@@ -573,4 +608,4 @@
573608

574609

575610

576-
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
611+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

electron_app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "criptext",
3-
"version": "0.11.4",
3+
"version": "0.12.0",
44
"author": {
55
"name": "Criptext Inc.",
66
"email": "[email protected]",

email_login/src/components/LoginWrapper.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,12 @@ class LoginWrapper extends Component {
174174
ev.stopPropagation();
175175
const username = this.state.values.username;
176176
const isAvailable = await checkUsernameAvailable(username);
177-
const isAvailableLinkDevice = false;
178177
if (isAvailable) {
179178
this.setState({
180179
errorMessage: errorMessages.USERNAME_NOT_EXISTS
181180
});
182-
} else if (isAvailableLinkDevice) {
183-
await this.initLinkDevice(username);
184181
} else {
185-
this.goToPasswordLogin();
182+
await this.initLinkDevice(username);
186183
}
187184
};
188185

email_mailbox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "email_mailbox",
3-
"version": "0.11.4",
3+
"version": "0.12.0",
44
"private": true,
55
"dependencies": {
66
"animejs": "^2.2.0",

email_mailbox/src/utils/electronEventInterface.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -632,15 +632,10 @@ const setEventAsHandled = async eventId => {
632632
----------------------------- */
633633
ipcRenderer.on('socket-message', async (ev, message) => {
634634
const eventId = message.cmd;
635-
if (
636-
eventId === SocketCommand.DEVICE_REMOVED ||
637-
eventId === SocketCommand.PEER_PASSWORD_CHANGED ||
638-
eventId === SocketCommand.PEER_RECOVERY_EMAIL_CHANGED ||
639-
eventId === SocketCommand.PEER_RECOVERY_EMAIL_CONFIRMED
640-
) {
641-
handleEvent(message);
642-
} else if (eventId === 400) {
635+
if (eventId === 400) {
643636
await getGroupEvents();
637+
} else {
638+
handleEvent(message);
644639
}
645640
});
646641

0 commit comments

Comments
 (0)