Quentin Guidée
1310c459b0
Merge branch 'omega-hotfix' into omega-dev
2020-02-20 23:30:40 +01:00
Quentin Guidée
295d86ce71
Merge branch 'moveResultDisplay' of git://github.com/0b101/Omega-1 into 0b101-moveResultDisplay
2020-02-20 22:49:28 +01:00
0b101
377ab54a58
Moved the result display settings to the math sub-menu
2020-02-20 15:45:54 -06:00
Quentin Guidée
f1e39b6709
Fix compilation in official
2020-02-20 22:14:54 +01:00
Quentin Guidée
54b39a14d6
Merge branch 'omega-hotfix' into omega-dev
2020-02-20 00:43:11 +01:00
Quentin Guidée
73736c9b15
Fix conflicts
2020-02-20 00:42:47 +01:00
Quentin Guidée
eb2e0ddd3a
Merge branch 'omega-dev-e13' of https://github.com/Gegenter/Omega into Gegenter-omega-dev-e13
2020-02-19 23:53:24 +01:00
Quentin Guidée
1f8ae2dc88
Omega 1.20.0
2020-02-18 21:30:05 +01:00
Émilie Feral
013f817b35
[apps] Fix i18n to be able to build without settings app in offical
...
software
2020-02-18 10:11:06 +01:00
Léa Saviot
42125a1f56
[apps/settings] Fix i18n to be able to build without settings app
2020-02-18 10:11:06 +01:00
U-DESKTOP-L7NJ45P\Gegenter
1a81c4b8bb
Fixed most of the translations(probably all of them)
2020-02-17 21:20:23 +01:00
Quentin Guidée
dcaa1cb46d
Updated to public
2020-02-17 20:33:42 +01:00
Gegenter
3d932214dc
fml
2020-02-17 18:07:00 +01:00
Gegenter
6fe0fad2a2
good stuff
2020-02-17 17:51:52 +01:00
Quentin Guidée
5b2f33c80a
Fix conflicts
2020-02-17 17:10:32 +01:00
Romain Goyet
5dee4a8166
[apps] Add screen telemetry identification
2020-02-17 10:31:24 -05:00
Romain Goyet
7f43b73049
[apps] Don't forget to call viewWillAppear
...
At the moment ViewController::viewWillAppear doesn't do anything, so
there is no real impact. But if we want to use it it needs to be called
from subclasses.
2020-02-17 10:31:24 -05:00
Quentin Guidée
2172eaa7a4
Merge branch 'omega-dev-e13' of github.com:Omega-Numworks/Omega into omega-dev-e13
2020-02-16 23:52:20 +01:00
Quentin Guidée
9af87b293a
Update contributors O1.19
2020-02-16 23:52:11 +01:00
0b101
8b7bc904af
Added (google) translations
2020-02-16 15:42:59 -06:00
Quentin Guidée
3123a6183e
Translation missing
2020-02-16 22:19:19 +01:00
Quentin Guidée
42889fa4dd
Merge branch 'CompactResult' of https://github.com/0b101/Omega-1 into 0b101-CompactResult
2020-02-16 21:56:10 +01:00
Quentin Guidée
fac5b0c416
ExamMode types
2020-02-16 20:22:05 +01:00
0b101
0a07a82a96
Added Compact Result Display
2020-02-16 12:47:29 -06:00
U-DESKTOP-L7NJ45P\Gegenter
a4e3e6fcf2
Updates
2020-02-16 15:09:27 +01:00
U-DESKTOP-L7NJ45P\Gegenter
4dacfe532a
Updates
2020-02-16 15:07:25 +01:00
U-DESKTOP-L7NJ45P\Gegenter
8ff0b18b36
Updates
2020-02-16 14:58:16 +01:00
Quentin Guidée
1a35ca891e
[WIP] Fix settings
2020-02-16 13:47:28 +01:00
Quentin Guidée
9de231ba64
[WIP] Fix settings
2020-02-16 13:14:41 +01:00
Quentin Guidée
f1ee3d78ef
[WIP] Fix settings
2020-02-16 12:42:08 +01:00
Quentin Guidée
661a48f29d
[WIP] Fix settings
2020-02-16 12:27:42 +01:00
Quentin Guidée
be3829610a
[WIP] Fix settings
2020-02-16 12:15:31 +01:00
Quentin Guidée
1d2bf7fcb3
[WIP] Fix settings
2020-02-16 11:58:06 +01:00
Quentin Guidée
b52626ed65
[WIP] Fix settings
2020-02-16 10:50:34 +01:00
Quentin Guidée
30386e53f6
Fixed some errors with E13
2020-02-12 23:05:53 +01:00
Quentin Guidée
31cdd5bcc8
Fixed some conflicts
2020-02-12 18:24:13 +01:00
Quentin Guidée
ab8f731515
Fixed some conflicts
2020-02-12 17:42:58 +01:00
Émilie Feral
466f588a99
[apps/settings] Between two 'didEnterResponderChain', the exam mode page
...
might change the number of rows/the displayed messages. We then have to
re-layout the SelectableViewWithMessages to set the right frame to the
SelectableTableView.
2020-02-12 15:13:26 +01:00
Émilie Feral
46fb233428
[apps/settings] I18n: improve message alignment
2020-02-12 15:13:26 +01:00
Émilie Feral
8a87bcfc5b
[apps/settings] SelectableViewWithMessages: position the additional
...
messages at the bottom of the view
2020-02-12 15:13:26 +01:00
Émilie Feral
3c52631245
[apps/settings] Improve warning messages about non-official software
2020-02-12 15:13:26 +01:00
Émilie Feral
f69bc6c8e4
[apps] Makefile: fix tests build
2020-02-12 15:13:26 +01:00
Émilie Feral
63d2aab416
[apps/settings] Improve messages of cautious in non-official softwares
2020-02-12 15:13:26 +01:00
Émilie Feral
e17ae9024e
[apps] Gather all code regarding exam mode in ExamModeCOnfiguration file
2020-02-12 15:13:26 +01:00
Émilie Feral
541acb6a7c
[apps/settings] Factorize SettingsMessageTree model definition between
...
different targets (none/beta/update)
2020-02-12 15:13:26 +01:00
Émilie Feral
672a1a3967
[apps/settings] Change non-official-version warning messages
2020-02-12 15:13:26 +01:00
Émilie Feral
ce5f8236a9
[apps] Add comment around warning regarding non-official releases
2020-02-12 15:13:26 +01:00
Émilie Feral
3612d25539
[apps/settings] AboutController::m_view should live inside the Settings
...
app
This fixes the following bug: AboutController::view was built at first
call of "AboutController::view()" but the Settings can be rebuilt later
and the pointers might have moved (hence the ones used in
AboutController::view constructor which is not rebuilt then)
2020-02-12 15:13:26 +01:00
Émilie Feral
fffcadf384
[apps/settings] Display a caution message in the 'about' page in non-official
...
software versions
2020-02-12 15:13:26 +01:00
Émilie Feral
b28f426d36
[apps/settings] Add warning message about software liability
2020-02-12 15:13:25 +01:00
