Skip to content
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.

Sign up for GitHub

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

Security improvement batch #6622

Merged
merged 17 commits into from
Jan 7, 2021
Merged

Security improvement batch #6622

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f87a646
Adds a new method for the server to push notifies to the client, whic…
sulkaharo Dec 6, 2020
11f6fb1
Merge branch 'dev' into admin_messages
sulkaharo Dec 9, 2020
b551c85
Merge branch 'dev' into admin_messages
sulkaharo Dec 10, 2020
018ff9a
Fix unit tests
sulkaharo Dec 10, 2020
7fc777e
Increase timeouts on tests
sulkaharo Dec 10, 2020
8ab81d2
Add translations
sulkaharo Dec 10, 2020
db20457
Merge branch 'dev' into admin_messages
sulkaharo Dec 10, 2020
fbd94f4
Merge branch 'dev' into admin_messages
sulkaharo Dec 10, 2020
cc0c9b8
Merge branch 'dev' into admin_messages
sulkaharo Dec 27, 2020
7dc7614
* Aggregate admin messages
sulkaharo Dec 27, 2020
4820d3b
Warn users if their instance is world readable
sulkaharo Dec 28, 2020
871ccb9
Merge branch 'dev' into admin_messages
sulkaharo Jan 1, 2021
0ec36a0
Merge branch 'dev' into admin_messages
sulkaharo Jan 1, 2021
2743c3e
Merge branch 'dev' into admin_messages
sulkaharo Jan 2, 2021
09451ae
Fix adminnotifies init()
sulkaharo Jan 2, 2021
577e72a
Merge branch 'dev' into admin_messages
sulkaharo Jan 7, 2021
476b5e7
Fix couple issues from Codacy
sulkaharo Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'dev' into admin_messages
  • Loading branch information
@sulkaharo
sulkaharo committed Jan 1, 2021
commit 871ccb96a400a67216734e335c9cb784b686066e
5 changes: 2 additions & 3 deletions tests/api3.create.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,8 @@ describe('API3 CREATE', function() {
});
delete doc.identifier;

return await new Promise(function(resolve, reject) {
self.instance.ctx.treatments.create([doc], async (err) => { // let's insert the document in APIv1's way
await new Promise((resolve, reject) => {
self.instance.ctx.treatments.create([doc], async (err) => { // let's insert the document in APIv1's way
should.not.exist(err);
doc._id = doc._id.toString();

Expand All @@ -423,7 +423,6 @@ describe('API3 CREATE', function() {
delete doc._id; // APIv1 updates input document, we must get rid of _id for the next round
oldBody.should.containEql(doc);


const doc2 = Object.assign({}, doc, {
eventType: 'Meal Bolus',
insulin: 0.4,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.