Quentin Guidée c87c5b63e3 Fix conflicts

2019-12-27 23:22:23 +01:00

..

about_controller.cpp

Public -> dev

2019-12-06 19:28:05 +01:00

about_controller.h

Added: MicroPython version in the settings

2019-12-06 09:18:57 +01:00

accessibility_controller.cpp

[apps] Implement accessibility features

2019-11-01 20:00:33 +01:00

accessibility_controller.h

[apps] Implement accessibility features

2019-11-01 20:00:33 +01:00

contributors_controller.cpp

Added missing names, added usernames, closes #89

2019-12-27 19:44:48 +01:00

contributors_controller.h

Added missing names, added usernames, closes #89

2019-12-27 19:44:48 +01:00

display_mode_controller.cpp

[apps/settings] Minimal number of significant digits in Engineering

2019-09-04 15:20:51 +02:00

display_mode_controller.h

[escher] TextField: all text fields use the same draft text buffer

2019-08-13 09:44:00 +02:00

exam_mode_controller.cpp

Reworked exam mode, fixed #106

2019-12-27 16:48:45 +01:00

exam_mode_controller.h

Reworked exam mode, fixed #106

2019-12-27 16:48:45 +01:00

generic_sub_controller.cpp

[settings] Fix row initialization in sub menus

2019-12-19 15:52:45 +01:00

generic_sub_controller.h

Resolved conflicts

2019-12-24 01:07:22 +01:00

language_controller.cpp

[settings] Split SubController in several controllers: about_controller,

2018-09-25 15:13:31 +02:00

language_controller.h

[settings] Split SubController in several controllers: about_controller,

2018-09-25 15:13:31 +02:00

math_options_controller.cpp

[apps/settings] Remove symbol_controller and references to it

2019-12-08 15:38:10 -05:00

math_options_controller.h

[apps/settings] Remove symbol_controller and references to it

2019-12-08 15:38:10 -05:00

message_table_cell_with_editable_text_with_separator.cpp

Omega theme finished

2019-11-30 22:59:33 +01:00

message_table_cell_with_editable_text_with_separator.h

[apps/escher] Uniformize k_separatorThickness

2019-09-09 19:10:17 +02:00

preferences_controller.cpp

Reworked exam mode, fixed #106

2019-12-27 16:48:45 +01:00

preferences_controller.h

Resolved conflicts

2019-12-24 01:07:22 +01:00