Commit Graph

1211 Commits

Author SHA1 Message Date
Baptiste Grob
c705b5b4db fix: correctly start and stop autolock timer 2020-09-18 12:17:14 +02:00
Karol Sójko
b97f7c686d Merge branch 'hotfix/3.4.5' 2020-09-16 09:35:19 +02:00
Karol Sójko
d6ac37a04a fix: docker entrypoint command interpret 2020-09-16 09:35:13 +02:00
Baptiste Grob
f440eaa692 hotfix: 3.4.4, fix not being able to import backup 2020-09-10 20:36:21 +02:00
Baptiste Grob
cb2115c0d6 chore(version): 3.4.3 (bump to match desktop version) 2020-09-10 16:35:45 +02:00
Baptiste Grob
3a34fd0c87 Merge branch 'hotfix/3.3.13' 2020-09-09 18:09:09 +02:00
Baptiste Grob
2744989674 chore: bundle 2020-09-09 18:08:55 +02:00
Baptiste Grob
8c76453942 chore(version): 3.3.13 2020-09-09 18:08:47 +02:00
Baptiste Grob
4bbbef32fb fix: ionicons 2020-09-09 18:07:29 +02:00
Baptiste Grob
8278986eb6 Merge branch 'hotfix/3.3.12' 2020-09-09 17:44:31 +02:00
Baptiste Grob
2ebaa940fe chore(version): 3.3.12 2020-09-09 17:42:41 +02:00
Baptiste Grob
ec0a9687f5 chore: bundle 2020-09-09 17:42:28 +02:00
Baptiste Grob
7cfa95520b Merge pull request #464 from standardnotes/hotfix/3.3.11
check backup file version first before importing
2020-09-09 17:34:37 +02:00
Baptiste Grob
990b76324e chore(version): 3.3.11 2020-09-08 18:01:39 +02:00
Baptiste Grob
6f798e3ba9 fix: check backup file version first before importing 2020-09-08 18:01:05 +02:00
Baptiste Grob
a43d33aa59 Merge pull request #462 from standardnotes/hotfix/3.3.10
fix: prevent importing backup files with version > 003
2020-09-07 15:41:05 +02:00
Baptiste Grob
a1727b1b1e fix: show import error sooner 2020-09-07 11:20:45 +02:00
Baptiste Grob
7f03922b67 fix: do not run ruby-dependent command on install 2020-09-07 10:34:20 +02:00
Baptiste Grob
3b525ae40a fix: handle keyParams and auth_params in import 2020-09-07 10:33:10 +02:00
Baptiste Grob
157b6c50b2 chore(version): 3.3.10 2020-09-04 19:02:04 +02:00
Baptiste Grob
a0d6884fd7 fix: prevent importing backup files with version > 003 2020-09-04 19:01:22 +02:00
Karol Sójko
c9a5e21c4b Merge branch 'hotfix/3.3.9' 2020-08-11 12:37:19 +02:00
Karol Sójko
7ccb3fc99f fix: remove assets and health check logs 2020-08-11 12:37:12 +02:00
Karol Sójko
3a22265426 Merge branch 'hotfix/3.3.8' 2020-07-30 12:41:37 +02:00
Karol Sójko
af7da1d79c fix: application namespace for datadog trace collection 2020-07-30 12:41:31 +02:00
Karol Sójko
f14816e98d Merge branch 'hotfix/3.3.7' 2020-07-28 18:26:48 +02:00
Karol Sójko
c2ac21be9d feat: add datadog integration and lograge JSON logs formatting 2020-07-28 18:26:41 +02:00
Baptiste Grob
d7260e8ea7 Merge branch 'release/3.3.6' 2020-07-23 10:53:28 +02:00
Baptiste Grob
93b7f5858c chore: bundle 2020-07-22 17:52:45 +02:00
Baptiste Grob
207890dc2f feat: rename backup files to mention their importing capabilities 2020-07-22 17:51:16 +02:00
Johnny A
8b486a66f9 Merge pull request #433 from standardnotes/fix-ionicons-path
fix: ionicons not found on webpack dev server
2020-07-22 11:18:17 -04:00
Baptiste Grob
5eff00545e fix: ignore index.html and provide a sample file instead 2020-07-22 12:09:13 +02:00
Baptiste Grob
1631aee113 chore: bundle 2020-07-22 10:34:01 +02:00
Baptiste Grob
9f522c8eb6 fix: store zipped items inside "Items" subfolder 2020-07-22 10:33:49 +02:00
Baptiste Grob
e86f70233a chore: build 2020-07-21 18:31:31 +02:00
Baptiste Grob
d3c369604a chore: 3.3.6 2020-07-21 18:04:53 +02:00
Baptiste Grob
b888e68c5a fix: bundle files together when exporting a decrypted backup 2020-07-21 18:04:39 +02:00
dependabot[bot]
c906603634 chore(deps): bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-19 14:06:38 +02:00
Johnny Almonte
28708c4d0b fix: ionicons not found on webpack dev server 2020-07-15 13:41:05 -04:00
Karol Sójko
4de62deaf0 fix: sync with master branch 2020-07-09 08:25:58 +02:00
Mo Bitar
5ee44d56c2 fix: compile assets 2020-07-08 13:43:07 -05:00
Karol Sójko
8f3537a48d Merge branch 'release/1.1.0' 2020-07-08 20:20:54 +02:00
Karol Sójko
6d1bb23835 Merge branch 'hotfix/1.0.4' into develop 2020-07-08 19:47:42 +02:00
Karol Sójko
6c057311ec Merge branch 'hotfix/1.0.4' 2020-07-08 19:47:40 +02:00
Karol Sójko
c96a6c9e46 fix: log formatting on production 2020-07-08 19:47:32 +02:00
Karol Sójko
3ec3ec0f1e Merge branch 'hotfix/1.0.3' into develop 2020-07-08 09:18:00 +02:00
Karol Sójko
52696cd92c Merge branch 'hotfix/1.0.3' 2020-07-08 09:17:58 +02:00
Karol Sójko
51dfbe5ca2 fix: order of commands in ci 2020-07-08 09:17:50 +02:00
Karol Sójko
14d9659cf1 Merge branch 'hotfix/1.0.2' into develop 2020-07-08 09:15:25 +02:00
Karol Sójko
3d84923467 Merge branch 'hotfix/1.0.2' 2020-07-08 09:15:21 +02:00