Quentin Guidée 5b2f33c80a Fix conflicts

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

..

test

…

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

Fixed german special characters

2019-06-06 10:00:32 +02:00

base.en.i18n

…

base.es.i18n

[unicode] Fix Spanish literals

2019-05-03 15:53:19 +02:00

base.fr.i18n

[unicode] Add accents in french litterals

2019-05-03 15:53:19 +02:00

base.hu.i18n

Hungarian Language Added

2020-01-11 17:46:28 +01:00

base.pt.i18n

[unicode] Fix portuguese literals

2019-05-03 15:53:20 +02:00

box_axis_view.cpp

Fixed some conflicts

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

box_axis_view.h

[apps] Fix graph X axis labels that read the same

2019-01-10 11:42:02 +01:00

box_banner_view.cpp

[apps] Define Font, Text/BackgroundColor BannerView static methods

2019-05-03 15:54:21 +02:00

box_banner_view.h

[apps] Replace BannerView::set(Legend|Message)AtIndex by getters

2019-05-03 15:54:21 +02:00

box_controller.cpp

[poincare] PrintFloat: take into account the distinction between char

2019-09-26 11:26:48 +02:00

box_controller.h

[apps] Add screen telemetry identification

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

box_range.cpp

[apps/*_curve_view_range] Mark accessors const

2019-08-08 17:22:04 +02:00

box_range.h

[apps/*_curve_view_range] Mark accessors const

2019-08-08 17:22:04 +02:00

box_view.cpp

Omega theme finished

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

box_view.h

…

calculation_controller.cpp

Omega theme: some fixes

2019-11-29 23:35:35 +01:00

calculation_controller.h

[apps] Add screen telemetry identification

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

calculation_selectable_table_view.cpp

…

calculation_selectable_table_view.h

…

histogram_banner_view.cpp

[apps] Define Font, Text/BackgroundColor BannerView static methods

2019-05-03 15:54:21 +02:00

histogram_banner_view.h

[apps] Replace BannerView::set(Legend|Message)AtIndex by getters

2019-05-03 15:54:21 +02:00

histogram_controller.cpp

[apps/poincare] Use IEEE754::exponentBase10 instead of floor(log10)

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

histogram_controller.h

[apps] Add screen telemetry identification

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

histogram_parameter_controller.cpp

[apps/shared] Templatize FloatParameterController to handle float/double

2019-09-02 16:55:39 +02:00

histogram_parameter_controller.h

[coding style] Make some methods const

2019-09-09 20:05:14 +02:00

histogram_view.cpp

Fixed some conflicts

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

histogram_view.h

Omega theme finished

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

Makefile

Hungarian Language Added

2020-01-11 17:46:28 +01:00

multiple_boxes_view.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

multiple_boxes_view.h

[escher/view] setFrame and layoutSubviews can be forced

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

multiple_data_view_controller.cpp

[apps] Don't forget to call viewWillAppear

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

multiple_data_view_controller.h

…

multiple_data_view.cpp

Fixed some conflicts

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

multiple_data_view.h

[escher/view] setFrame and layoutSubviews can be forced

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

multiple_histograms_view.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

multiple_histograms_view.h

[escher/view] setFrame and layoutSubviews can be forced

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

stat_icon.png

…

statistics_context.cpp

[apps/solver] Display user variables in the solutions

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

statistics_context.h

[apps/poincare] Clearer method names

2019-08-27 17:24:57 +02:00

store_controller.cpp

Fixed some conflicts

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

store_controller.h

[poincare] Create a ContextWithParent that implements expressionTypeForIdentifier

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

store.cpp

[apps/statistics/store] Fix typo

2019-09-26 10:35:06 +02:00

store.h

…