Quentin Guidée 5b2f33c80a Fix conflicts

2020-02-17 17:10:32 +01:00

..

additional_outputs

Fix palette E13

2020-02-16 14:10:17 +01:00

test

[apps/calculation] Fix and add tests

2020-02-12 15:13:23 +01:00

app.cpp

Fixed some conflicts

2020-02-12 17:42:58 +01:00

app.h

Fix conflicts

2020-02-17 17:10:32 +01:00

base.de.i18n

[calculation] WIP: add messages for RationalListController

2020-02-12 15:13:19 +01:00

base.en.i18n

[calculation] WIP: add messages for RationalListController

2020-02-12 15:13:19 +01:00

base.es.i18n

[calculation] WIP: add messages for RationalListController

2020-02-12 15:13:19 +01:00

base.fr.i18n

[calculation] WIP: add messages for RationalListController

2020-02-12 15:13:19 +01:00

base.hu.i18n

newline

2020-02-16 15:10:44 +01:00

base.pt.i18n

[calculation] WIP: add messages for RationalListController

2020-02-12 15:13:19 +01:00

calculation_icon.png

[apps] Change app icons

2017-01-27 11:46:51 +01:00

calculation_store.cpp

Symbolic computation

2020-02-13 20:07:38 +01:00

calculation_store.h

[apps/calculation] Calculations now hold 4 texts: input, exact output

2020-02-12 15:13:23 +01:00

calculation.cpp

Added Compact Result Display

2020-02-16 12:47:29 -06:00

calculation.h

Added Compact Result Display

2020-02-16 12:47:29 -06:00

edit_expression_controller.cpp

[apps] Remove dead code

2020-02-17 10:31:24 -05:00

edit_expression_controller.h

[apps/calculation] Reload display output when HistoryController appears

2020-02-12 15:13:18 +01:00

expression_field.cpp

[apps/poincare] use Symbol::k_ans constexpr char *

2018-11-23 12:03:58 +01:00

expression_field.h

[apps/calculation] Removed overrided ExpressionField constructor.

2018-04-23 11:34:01 +02:00

history_controller.cpp

Fix conflicts

2020-02-17 17:10:32 +01:00

history_controller.h

Fix conflicts

2020-02-17 17:10:32 +01:00

history_view_cell.cpp

Added Compact Result Display

2020-02-16 12:47:29 -06:00

history_view_cell.h

Added Compact Result Display

2020-02-16 12:47:29 -06:00

Makefile

Fixed some conflicts

2020-02-12 17:42:58 +01:00

selectable_table_view.cpp

[apps/calculation] Avoid blinking in Calculation

2020-02-12 15:13:18 +01:00

selectable_table_view.h

[calculation] Bug in the subview selected with heigh cells

2018-12-06 14:52:23 +01:00

test.py

Switched to jbboric's version of the rammap.

2020-01-04 20:49:54 +01:00