Maxim Kadushkin b041083933 Merge branch 'feature/reactjs-container-component-with-mobx' into feature/mobile-apps-on-reactjs ... # Conflicts: # apps/documenteditor/mobile/locale/en.json # apps/documenteditor/mobile/src/components/app.jsx # apps/documenteditor/mobile/src/components/settings/Settings.jsx # apps/documenteditor/mobile/src/components/settings/document-settings/DocumentSettings.jsx # apps/documenteditor/mobile/src/js/routes.js # apps/documenteditor/mobile/src/pages/home.jsx # apps/documenteditor/mobile/src/store/reducers/root.js # apps/documenteditor/mobile/src/store/store.js		2020-10-16 11:37:47 +03:00
..
components	[DE] refactoring for Settings view	2020-10-16 11:12:02 +03:00
controller	[DE mobile] Add text settings	2020-10-14 14:51:15 +03:00
controllers	[mobile] add redux-thunk package, add api into store, add orientation setting into document settings	2020-09-20 15:04:46 +03:00
css	[DE] changed stylesheets for popover with view inside	2020-10-16 11:11:26 +03:00
fonts	[DE][mobile] framework7-react project	2020-07-31 20:33:13 +03:00
js	[DE] refactoring for Settings view	2020-10-16 11:12:02 +03:00
pages	[DE] 'Settings' depends on phone/tablet	2020-10-13 17:00:59 +03:00
static/icons	[DE][mobile] framework7-react project	2020-07-31 20:33:13 +03:00
store	Merge branch 'feature/reactjs-container-component-with-mobx' into feature/mobile-apps-on-reactjs	2020-10-16 11:37:47 +03:00
index_dev.html	[DE] fix Device.android flag	2020-10-09 23:05:45 +03:00