chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-23 14:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,261 Commits 1 Branch 56 Tags 66 MiB
ce7bf7ec29
Commit Graph

2261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jedimark
7a93ef4933 Merge branch 'master' into 'master' 
Master

Mark, pls merge this as asjb is helping Damien with French and must be up-to-date for that

See merge request !8
 2016-03-26 23:07:06 +00:00
Arie Klerk
4bf8c83926 Merge branch 'master' of http://gitlab.jedimark.net/code/sleepyhead 2016-03-26 10:01:48 +01:00
Arie Klerk
df21e786ad French updated, rest just lupdated 2016-03-26 09:58:40 +01:00
Jedimark
825c19261b Merge branch 'master' into 'master' 
Master

Minor changes in Dutch

See merge request !6
 2016-03-20 03:13:14 +00:00
Arie Klerk
4f38ab9d45 Merge branch 'master' of http://gitlab.jedimark.net/code/sleepyhead 2016-03-19 08:44:21 +01:00
Arie Klerk
05a5471dd9 Minor changes in Dutch 2016-03-19 08:44:06 +01:00
Jedimark
7994dd0551 Merge Arie's 'master' into 'master' 
Added new translations for Dutch, French and Chinese

See merge request !5
 2016-03-18 22:17:47 +00:00
Arie Klerk
a6743ea517 There are indeed more differences than apnoea only! 2016-03-18 16:04:51 +01:00
Arie Klerk
044f62ee11 Added new translation for Bulgarian 2016-03-18 10:40:30 +01:00
Arie Klerk
b979641c26 Sorry, edited Dutch version again... 2016-03-18 08:56:20 +01:00
Arie Klerk
88fa34af9f Merge branch 'master' of http://gitlab.jedimark.net/code/sleepyhead 2016-03-18 08:25:06 +01:00
Arie Klerk
f8946108d9 Updated Dutch, French and Chinese translations 2016-03-18 08:24:17 +01:00
Mark Watkins
09012510b6 Move Minutes at pressure tooltip to other side of cursor so it's visible at the end 2016-03-17 18:51:10 +10:00
Mark Watkins
99f668be05 Fix merge conflict 2016-03-17 18:41:39 +10:00
Mark Watkins
7962666b14 Reset channel names properly on language change 2016-03-17 18:37:08 +10:00
Mark Watkins
b6e4dfdad0 Convert Tooltip Timeout slider to seconds, extend limits 2016-03-17 13:38:50 +10:00
Mark Watkins
f79f12be86 Fix Time at Pressure chart sometimes dropping outside of graph boundary 2016-03-17 10:28:21 +10:00
Mark Watkins
75e3f6eed7 Clean up some more channels.xml stuff 2016-03-17 09:28:18 +10:00
Mark Watkins
037289e6be Migrate some more old settings from old Channels.xml so they are translatable 2016-03-17 08:56:59 +10:00
Mark Watkins
a231b1589c Merge branch 'master' of gitlab.jedimark.net:code/sleepyhead 2016-03-17 07:38:52 +10:00
Mark Watkins
85485d383e Be realistic and force reset channel names on every language change 2016-03-17 07:38:35 +10:00
Jedimark
d6aa89c37f Merge branch 'master' into 'master' 
Master

Please add new languages and updated ones (including English (UK)...

See merge request !4
 2016-03-16 09:02:15 +00:00
Jedimark
b00b5ff8f0 Merge branch 'AlanE_2016-03-15' into 'master' 
Removed TextLabel value Reference: code/sleepyhead#22

Reference: code/sleepyhead#22 "TextLabel" showing under version. Cleared value. 
Testing first merge request.

See merge request !3
 2016-03-16 04:30:38 +00:00
Alan Edwards
17913ce7f7 Removed TextLabel value Reference: code/sleepyhead#22 2016-03-15 23:58:13 -04:00
Arie Klerk
2d14fc6f8b Watch carefully: I have added Arabic and Greek 2016-03-15 10:04:49 +01:00
Arie Klerk
91e485bb3c Merge branch 'master' of http://gitlab.jedimark.net/code/sleepyhead 2016-03-15 08:53:52 +01:00
Arie Klerk
ced0cc063a Updated UK translation file, if anyone can think of anything else but 
apnea => apnoea, please tell me instantly!!
 2016-03-15 08:52:59 +01:00
Mark Watkins
8559fbdb09 Shut down properly on RestartApplication on Windows/Linux 2016-03-15 10:09:09 +10:00
Mark Watkins
f3dbaab165 Added fetchUpstream script for syncing master 2016-03-13 20:12:39 +10:00
Mark Watkins
664a13395d Merge remote-tracking branch 'arie/master' 2016-03-13 19:28:56 +10:00
Arie Klerk
b15679a405 Latest translation files of march 13 2016-03-13 10:25:57 +01:00
Mark Watkins
48d194dd7b Update README 2016-03-13 08:31:35 +00:00
Mark Watkins
f8a90a0187 Some more unfinished work on the auto-Updater 2016-03-12 17:20:55 +10:00
Mark Watkins
ee50b6d275 FP Icon pixmap courtesy of Johnrrr 2016-03-12 12:56:58 +10:00
Mark Watkins
edba3a26f1 Some unfinished working on Updates.xml parser 2016-03-12 12:51:52 +10:00
Mark Watkins
521b3ae696 Inital PRS1 Family 5.2 importer work 2016-03-11 10:00:01 +10:00
Mark Watkins
2285444dce Bump ResMed & PRS1 loader versions to initiate auto-rebuild 2016-03-09 00:45:02 +10:00
Mark Watkins
f042e34806 Fix typos in changelog 2016-03-09 00:43:39 +10:00
Mark Watkins
c2391056a6 Fix TempEnable glitch, update changelog, bump build number 2016-03-09 00:39:56 +10:00
Mark Watkins
09e07997ef Add in ResMed AirSense/Curve Machine Settings (Reimport to get them) 2016-03-08 23:55:29 +10:00
Mark Watkins
4e07049591 Fix Import Scanner Cancel not allowing import again 2016-03-08 22:31:46 +10:00
Mark Watkins
bc06d48b20 Events List in Daily Summary needed to be in LocalTime 2016-03-08 22:10:42 +10:00
Mark Watkins
c72da66b3a TAP minpressure not dropping low enough when needed 2016-03-08 17:37:35 +10:00
Mark Watkins
a39e9345d5 Fix PRS1 Breathing not Detected flagging by mistake at start of waveform blocks 2016-03-08 17:22:46 +10:00
Mark Watkins
c54a533a70 Allow TAP range to expand if needed 2016-03-08 14:59:55 +10:00
Mark Watkins
2cfac972aa Add hover-over for TAP chart 2016-03-08 14:26:48 +10:00
Mark Watkins
acde68ca44 Smarted TAP YAxis labels up a bit 2016-03-08 13:21:26 +10:00
Mark Watkins
1266c750b5 Clean up list of events shown in TAP 2016-03-08 12:31:55 +10:00
Mark Watkins
9ff8389a91 Add a cancel button to import auto-scanner 2016-03-08 12:17:00 +10:00
Mark Watkins
da9bc5fde5 Use pressure channel colors, and line thickness settings in TAP chart 2016-03-08 11:42:16 +10:00