Commit Graph

485 Commits

Author SHA1 Message Date
M4x1m3
b8ae0f625d [settings/math] Changed from "Multiply symbol" to "Multiply", fixed #109. 2019-12-27 20:54:50 +01:00
M4x1m3
76a6678a29 [settings/about] MicroPython -> µPython, fixes offset of the version. 2019-12-27 20:36:59 +01:00
M4x1m3
3a4ffa9fb9 [settings/about] MicroPython version from mpconfig.h 2019-12-27 20:31:41 +01:00
M4x1m3
765e648d2b Added missing names, added usernames, closes #89 2019-12-27 19:44:48 +01:00
M4x1m3
9a9ae068ef Reworked exam mode, fixed #106 2019-12-27 16:48:45 +01:00
Quentin Guidée
004551d6b7 [EXPERIMENTAL] Upstream merged with Omega 2019-12-24 01:20:28 +01:00
Quentin Guidée
a159d80b1c Resolved conflicts 2019-12-24 01:07:22 +01:00
Émilie Feral
2ccdc2d0dc [apps] Fix messages regarding Dutch exam mode in non-English languages 2019-12-19 15:52:45 +01:00
Émilie Feral
7fc730597c [apps] Fix exam mode messages 2019-12-19 15:52:45 +01:00
Émilie Feral
8c6a2836de [settings] Fix row initialization in sub menus 2019-12-19 15:52:45 +01:00
Émilie Feral
a3774fb510 [settings] Exam mode: reactivate the current exam mode (stick to Dutch
exam mode if it is already on)
2019-12-19 15:52:45 +01:00
Émilie Feral
6ecfe9c5db [apps] Two exam modes in settings: Standard & Dutch 2019-12-19 15:52:45 +01:00
Émilie Feral
49d2a248da [settings] Fix messages for Dutch exam mode 2019-12-19 15:52:45 +01:00
Émilie Feral
da735b93a4 [apps] GlobalPreferences: change exam mode API 2019-12-19 15:52:45 +01:00
Émilie Feral
82fb00689e [apps/settings] Message: add messages to activate Dutch exam mode 2019-12-19 15:52:45 +01:00
M4x1m3
e347dd5616 [preferences/exam] Allowed reactivation of exam mode
Settings are not modifiable when reactiving exam mode.
Decided to do it like that for consistency with the TI-Nspire CAS models.
Should be ok with exam mode specs (at least for france).
2019-12-15 10:32:43 +01:00
M4x1m3
6499d77283 Merge branch 'omega-dev' of https://github.com/M4xi1m3/Omega into omega-dev 2019-12-15 08:58:18 +01:00
M4x1m3
3b038617db Merge branch 'omega-dev' of https://github.com/Omega-Numworks/Omega into omega-dev 2019-12-15 08:57:49 +01:00
M4x1m3
5ae425f104 [apps/settings] Fixed compilation error
Co-Authored-By: Quentin <quentin.guidee@gmail.com>
2019-12-14 15:51:12 +01:00
Quentin Guidée
17432be1d8 Fixed conflicts 2019-12-11 14:27:31 +01:00
Léa Saviot
ebc5843795 [apps/ion/exam_mode] Store the exam mode activation in the flash
This way, it is not cleared by a reset
2019-12-11 13:51:38 +01:00
Émilie Feral
e550005e43 [settings] Enable exam mode reactivation 2019-12-11 13:51:38 +01:00
M4x1m3
ca4de2bf38 [apps/settings] Exam mode settings not editable while in exam mode. 2019-12-10 22:03:01 +01:00
Quentin Guidée
70edf4420c base.fr.i18n fixed 2019-12-10 20:20:59 +01:00
M4x1m3
df6ba6e70b Merge branch 'omega-dev' into omega-dev 2019-12-09 22:48:58 +01:00
M4x1m3
896d14b9c8 [settings] Translated symbolic calc. 2019-12-09 22:39:16 +01:00
M4x1m3
01bd446d0b [settings] Updated messages trees for others prompts. 2019-12-09 22:36:20 +01:00
M4x1m3
db2807c57e [settings] Added symbolic calculation in exam mode. 2019-12-09 22:28:22 +01:00
Quentin Guidée
f7388eddb7 Merge branch 'KeyBrightness' of https://github.com/RedGl0w/Epsilon-Omega into RedGl0w-KeyBrightness 2019-12-08 22:01:20 +01:00
Danny Simmons
13fe95bb98 [apps/settings] Remove symbol_controller and references to it 2019-12-08 15:38:10 -05:00
Danny Simmons
b332d183fc [apps/settings] Modify preferences_controller to add symbols 2019-12-08 15:37:17 -05:00
Danny Simmons
890d6a5c3b [apps/settings] Fix the I18n refrences for English+Spanish 2019-12-08 15:34:30 -05:00
RedGl0w
1442e6977d Simplified code 2019-12-08 18:18:28 +01:00
RedGl0w
f6aab242a2 Corrected settings update 2019-12-08 11:09:57 +01:00
redgl0w
2568a852e7 Changed settings reloading 2019-12-06 20:21:50 +01:00
Quentin Guidée
e9b5b13cfe Public -> dev 2019-12-06 19:28:05 +01:00
Quentin Guidée
16df0f268b Merge branch 'omega-hotfix' into omega-dev 2019-12-06 19:27:17 +01:00
Quentin Guidée
66ad982c39 Added: MicroPython version in the settings 2019-12-06 09:18:57 +01:00
Quentin Guidée
2a177d2373 Switch from dev to public 2019-12-05 21:35:37 +01:00
Quentin Guidée
058e0552fa Omega theme finished 2019-11-30 22:59:33 +01:00
Quentin Guidée
ec43f41a8e Omega theme: some fixes 2019-11-29 23:35:35 +01:00
Quentin Guidée
716c93f69a Merge hotfix 2019-11-29 20:18:22 +01:00
Quentin Guidée
44c976e030 Fixed: Math > Result format did strange things 2019-11-29 20:16:26 +01:00
Quentin Guidée
c68a0cdb33 New Default theme: Omega theme! (Beta) 2019-11-29 19:42:39 +01:00
Quentin Guidée
b7c548437f Init 1.17 dev branch 2019-11-19 22:02:31 +01:00
Quentin Guidée
3454f6bb74 Better handling of multiplication sign settings, closes #74 2019-11-19 22:00:17 +01:00
RedGl0w
1bb8553124 changed position of hardware test shortcut 2019-11-19 21:11:07 +01:00
Quentin Guidée
c31d3e3712 [1.16.0] You can now change the multiplication sign 2019-11-17 14:17:38 +01:00
Quentin Guidée
aa9854b330 Work in progress: resolve conflicts + settings easier 2019-11-17 14:04:53 +01:00
redgl0w
99a1b6636c Update symbol_controller.cpp 2019-11-17 13:17:42 +01:00