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

2175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Watkins
b288e2bb9d Merge branch 'master' of gitlab.com:sleepyhead/sleepyhead-code 2016-04-16 10:35:13 +10:00
Mark Watkins
0e9fd1a2f4 Version bump, clean up release notes, still more to do on windows 2016-04-16 03:15:54 +10:00
Mark Watkins
89f87b2d90 Merge branch 'master' of gitlab.com:sleepyhead/sleepyhead-code 2016-04-16 02:12:17 +10:00
Mark Watkins
06a39eb7df Support for PRS1 960t Family 5.2 Event File 2016-04-16 02:11:45 +10:00
Mark Watkins
ee799771b6 Merge branch 'master' of gitlab.com:ArieKlerk/sleepyhead-code 2016-04-15 21:17:35 +10:00
Arie Klerk
f43bba10df Merge remote-tracking branch 'upstream/master' 2016-04-15 09:05:49 +01:00
Arie Klerk
31e67ae332 Most up-to-date files now, will start a new round after lupdate 2016-04-15 08:53:42 +01:00
Mark Watkins
8a855cb509 README.txt needs newlines for gitlab's ugly display box 2016-04-15 11:18:04 +10:00
Mark Watkins
98e2498afc Fix spelling mistake and update README.TXT a little 2016-04-15 11:15:07 +10:00
Mark Watkins
40753bc7a7 Fix Heated Tubing spelling mistake 2016-04-11 13:11:15 +10:00
Arie Klerk
d5db4718d2 Here are the latest files 2016-04-08 11:06:07 +02:00
Mark Watkins
2e2b7d269c Issue #0005 EPR on/off glitch 2016-04-04 01:00:36 +10:00
Mark Watkins
0bc6fbbcc6 Supply version and platform strings to Report Bugs page 2016-04-03 23:37:42 +10:00
Mark Watkins
826b9bb175 Add Report a Bug Help menu option 2016-04-03 22:48:24 +10:00
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