Commit Graph

2305 Commits

Author SHA1 Message Date
VardanHakobyan
9f8bef81ee Merge remote-tracking branch 'upstream/feature/account-menu-react' into account-menu-splitted 2021-06-23 19:21:17 +03:00
Antonella Sgarlatta
3d24d89ce5 Merge branch 'develop' into feature/account-menu-react 2021-06-22 15:30:18 -03:00
Antonella Sgarlatta
34f1ce1f7e Merge branch 'release/3.8.8' into main 2021-06-22 13:33:11 -03:00
Antonella Sgarlatta
fa6377d0d3 chore(version): 3.8.8 2021-06-22 13:32:48 -03:00
Antonella Sgarlatta
d1d6068de1 chore(version-snjs): 2.7.5 2021-06-22 13:32:22 -03:00
VardanHakobyan
b0c88c9383 Merge remote-tracking branch 'upstream/develop' into account-menu-splitted 2021-06-22 10:22:31 +03:00
Antonella Sgarlatta
2d097d80e4 Merge branch 'release/3.8.7' into main 2021-06-21 16:17:02 -03:00
Antonella Sgarlatta
1ee97d970d chore(version): 3.8.7 2021-06-21 16:16:55 -03:00
Antonella Sgarlatta
1d2cf9f0ea Merge branch 'release/3.8.7' into main 2021-06-21 16:14:11 -03:00
Antonella Sgarlatta
edcd56ae1d chore(version-snjs): 2.7.4 2021-06-21 16:01:11 -03:00
VardanHakobyan
205c48b0e0 fix: add dependencies array to useEffect so that it doesn't run on every render 2021-06-21 19:20:38 +03:00
VardanHakobyan
980fea7313 Merge remote-tracking branch 'upstream/develop' into account-menu-splitted 2021-06-21 16:58:11 +03:00
Antonella Sgarlatta
f23f0e3088 Merge branch 'release/3.8.6' into main 2021-06-19 14:59:21 -03:00
Antonella Sgarlatta
5e83493633 fix: remove log 2021-06-19 14:58:13 -03:00
Antonella Sgarlatta
0b7a886460 Merge branch 'release/3.8.6' into main 2021-06-19 14:56:30 -03:00
Antonella Sgarlatta
b587986a91 fix: fix snjs version on package.json 2021-06-19 13:51:35 -03:00
Antonella Sgarlatta
436a4c4bbb chore(version): 3.8.6 2021-06-19 13:49:55 -03:00
Antonella Sgarlatta
ebe38eae57 fix: fix panels that can't be expanded after collapse 2021-06-19 13:49:32 -03:00
VardanHakobyan
839cf05d90 Merge remote-tracking branch 'upstream/develop' into account-menu-splitted
# Conflicts:
#	app/assets/javascripts/directives/views/accountMenu.ts
2021-06-19 19:10:31 +03:00
VardanHakobyan
b74549bfc6 refactor: move observers and streamers to separate methods, code cleanup 2021-06-19 19:05:29 +03:00
Antonella Sgarlatta
9d258ffcee Merge branch 'release/3.8.5' into main 2021-06-17 15:57:44 -03:00
Antonella Sgarlatta
13916ad84a chore(version): 3.8.5 2021-06-17 15:57:32 -03:00
Antonella Sgarlatta
2d4969d6df Merge branch 'release/3.8.5' into main 2021-06-17 15:51:55 -03:00
Antonella Sgarlatta
25e46ff2f1 chore(version-snjs): 2.7.3 2021-06-17 15:42:46 -03:00
Antonella Sgarlatta
650109f63f chore(version-snjs): 2.7.2 2021-06-17 13:18:48 -03:00
VardanHakobyan
bba1d089bf refactor: set initial value of server on Application.Launched event 2021-06-17 17:51:45 +04:00
VardanHakobyan
72eb2c1e42 chore: fix after merge conflict 2021-06-17 13:59:27 +04:00
VardanHakobyan
33082fcd7a fix: prevent default action when activating "Import Backup" by keyboard 2021-06-17 13:57:00 +04:00
VardanHakobyan
374e9c0616 Merge remote-tracking branch 'upstream/develop' into account-menu-splitted
# Conflicts:
#	app/assets/javascripts/directives/views/accountMenu.ts
2021-06-17 13:37:16 +04:00
VardanHakobyan
a76213dd1f feat: change label to button for better accessibility, let users to import backup by keyboard as well 2021-06-17 13:36:39 +04:00
Karol Sójko
eb41b426fd Merge branch 'hotfix/3.8.4' into develop 2021-06-17 09:52:30 +02:00
Karol Sójko
b214111ff3 Merge branch 'hotfix/3.8.4' 2021-06-17 09:52:26 +02:00
Karol Sójko
fbdec0251f fix: fallback to default sync server as the next version server - fixes #577 2021-06-17 09:52:15 +02:00
VardanHakobyan
9f142c05df style: set correct margins for "Advanced Options" button 2021-06-17 11:35:27 +04:00
Antonella Sgarlatta
184ce19ad7 fix: autolock polling for desktop 2021-06-16 19:40:33 -03:00
Antonella Sgarlatta
cba9a52e30 Merge branch 'release/3.8.3' into main 2021-06-16 18:50:20 -03:00
Antonella Sgarlatta
dcbc8f59f9 fix: focus autocomplete input after adding tag from hint 2021-06-16 18:10:22 -03:00
Antonella Sgarlatta
2473a780d1 fix: scroll notes list when navigating with arrow keys 2021-06-16 14:13:03 -03:00
Antonella Sgarlatta
91fc475aac fix: show autocomplete tag results only if query isn't empty 2021-06-16 12:54:39 -03:00
Antonella Sgarlatta
124f7779c3 fix: remove recursive tag deletion 2021-06-16 12:28:32 -03:00
Antonella Sgarlatta
a85d2b9676 styles: remove faded style to disabled margin resizers 2021-06-16 12:24:44 -03:00
Antonella Sgarlatta
1c07253efb fix: reduce panel resizer width 2021-06-16 12:03:54 -03:00
VardanHakobyan
c897199d33 refactor: move user-related data to appStore 2021-06-16 17:00:13 +04:00
VardanHakobyan
018251838c refactor: read the required data from appState instead of passing by parent component 2021-06-16 16:20:23 +04:00
VardanHakobyan
17515848b4 fix: observe KeyStatusChanged event and correctly update hasProtections info 2021-06-16 16:00:14 +04:00
VardanHakobyan
6a3433d522 style: make "Advanced Options" button's styling similar to its previous "a" element's style 2021-06-16 15:18:06 +04:00
VardanHakobyan
96aaff5ff8 refactor: move all applicable parts to mobx instead of passing from parent to children components 2021-06-16 15:16:45 +04:00
Antonella Sgarlatta
1af72abe23 fix: set next version host on host input change 2021-06-15 17:15:48 -03:00
Antonella Sgarlatta
6cd1d8a688 chore: change pure-lockfile to frozen-lockfile on build 2021-06-15 15:39:47 -03:00
Antonella Sgarlatta
83a813ed94 fix: fix package.json StyleKit version 2021-06-15 13:37:50 -03:00