Commit Graph

329 Commits

Author SHA1 Message Date
Sergey Solovyev 379f27db78 Merge branch 'master' into dev
Conflicts:
	android-app-core/res/values-de/text_vars.xml
	android-app-core/res/values-es/text_about.xml
	android-app-core/res/values-es/text_functions.xml
	android-app-core/res/values-es/text_operators.xml
	android-app-core/res/values-es/text_strings.xml
	android-app-core/res/values-es/text_vars.xml
	android-app-core/res/values-it/text_about.xml
	android-app-core/res/values-it/text_functions.xml
	android-app-core/res/values-it/text_operators.xml
	android-app-core/res/values-it/text_strings.xml
	android-app-core/res/values-it/text_vars.xml
	android-app-core/res/values-pl/text_about.xml
	android-app-core/res/values-pl/text_operators.xml
	android-app-core/res/values-pl/text_preferences.xml
	android-app-core/res/values-pl/text_strings.xml
	android-app-core/res/values-pl/text_vars.xml
	android-app-core/res/values-ru/text_about.xml
	android-app-core/res/values-uk/text_about.xml
	android-app-core/res/values-uk/text_functions.xml
	android-app-core/res/values-uk/text_operators.xml
	android-app-core/res/values-uk/text_preferences.xml
	android-app-core/res/values-uk/text_strings.xml
	android-app-core/res/values-uk/text_vars.xml
	android-app-core/res/values-zh-rtw/text_about.xml
	android-app-core/res/values-zh-rtw/text_functions.xml
	android-app-core/res/values-zh-rtw/text_operators.xml
	android-app-core/res/values-zh-rtw/text_preferences.xml
	android-app-core/res/values-zh-rtw/text_strings.xml
	android-app-core/res/values-zh-rtw/text_vars.xml
	android-app/project.properties
	pom.xml
2013-09-20 22:14:08 +04:00
Sergey Solovyev 21d326b563 deps version update 2013-09-20 21:26:09 +04:00
Sergey Solovyev fc3082d452 version update 2013-07-22 15:26:15 +04:00
Sergey Solovyev 2bab557737 [maven-release-plugin] prepare for next development iteration 2013-07-22 15:04:30 +04:00
Sergey Solovyev 79afd35f6b [maven-release-plugin] prepare release release-2.0.0 2013-07-22 15:04:19 +04:00
Sergey Solovyev 6b85c070bc Version code update 2013-07-22 14:49:30 +04:00
Sergey Solovyev 11ae49b8f4 icons 2013-07-19 12:20:11 +04:00
Sergey Solovyev 584805ed12 version update 2013-07-18 18:53:45 +04:00
Sergey Solovyev d0de4f097c [maven-release-plugin] prepare for next development iteration 2013-07-18 18:28:13 +04:00
Sergey Solovyev 1e772f57ac [maven-release-plugin] prepare release release-1.6.3-b 2013-07-18 18:28:05 +04:00
Sergey Solovyev 1fda7d619e correct versions in release notes 2013-07-18 17:53:44 +04:00
Sergey Solovyev 17b034c1c9 translators list 2013-07-18 17:20:19 +04:00
Sergey Solovyev 9297cfaf4b round brackets button 2013-07-18 11:56:17 +04:00
Sergey Solovyev 525165a0c8 wizard fixes 2013-07-18 11:38:33 +04:00
Sergey Solovyev d5ae136054 matrix tests added 2013-07-16 13:46:47 +04:00
Sergey Solovyev 1aee47049d tests added 2013-07-11 16:31:46 +04:00
Sergey Solovyev 57b6b54604 acl version update 2013-07-03 00:49:28 +04:00
Sergey Solovyev c772a4e429 Merge remote-tracking branch 'origin/master'
Conflicts:
	android-app-core/res/values-ru/text_about.xml
	android-app-core/res/values-ru/text_wizard.xml
	android-app-core/res/values/text_about.xml
	android-app-core/res/values/text_wizard.xml
	pom.xml
2013-07-03 00:08:50 +04:00
Solovyev_S 33acdd68e6 translations 2013-07-02 16:43:48 +04:00
Solovyev_S 16385653d9 facebook button substituted with operators in the widget 2013-07-02 16:29:49 +04:00
serso c55001ffa2 greek letters added to the var names 2013-07-02 14:49:35 +04:00
Solovyev_S 9ae9aed9fc history item color changed 2013-07-02 13:27:03 +04:00
Solovyev_S 4dae4bbca4 numeral base/angle units button fix 2013-07-02 13:23:28 +04:00
Sergey Solovyev 572f151d24 android manifest version udpate 2013-07-02 00:21:50 +04:00
Sergey Solovyev f611f55190 [maven-release-plugin] prepare for next development iteration 2013-07-02 00:06:44 +04:00
Sergey Solovyev 95973053d2 [maven-release-plugin] prepare release release-1.6.3-a 2013-07-02 00:06:35 +04:00
Sergey Solovyev 0ecad8b2d7 versions updated 2013-07-01 23:55:27 +04:00
Solovyev_S 1caf9413c0 tests fixed 2013-07-01 16:19:06 +04:00
Solovyev_S cba364f036 wizard finished 2013-07-01 13:00:02 +04:00
Sergey Solovyev 58b64b1017 calculator receiver added 2013-06-28 16:16:08 +04:00
Sergey Solovyev 5a94e633e7 fix for widget 2013-06-28 15:59:57 +04:00
Sergey Solovyev 6ab63bfbbc external listeners removed 2013-06-28 00:53:12 +04:00
Sergey Solovyev 8d15db4c3f number formatting is working now 2013-06-28 00:02:30 +04:00
Sergey Solovyev 6870232f26 help removed 2013-06-26 13:40:08 +04:00
Sergey Solovyev a5e6647d3b new email for crashes 2013-06-26 13:22:59 +04:00
Sergey Solovyev 545cdf2319 lint warnings fixed 2013-06-26 13:00:02 +04:00
Sergey Solovyev 6aa5802dea deprecations fixed 2013-06-26 12:25:54 +04:00
Sergey Solovyev 99e7471ebd copyright + code reformat 2013-06-26 12:22:26 +04:00
Sergey Solovyev 23d5441b99 expand button 2013-06-26 12:01:26 +04:00
Sergey Solovyev 961300c910 icons +plot menu 2013-06-26 11:26:14 +04:00
Sergey Solovyev d8d79e85f1 history improvements 2013-06-26 01:45:33 +04:00
Sergey Solovyev d6b4863fa2 sherlock removed from wizard 2013-06-26 00:07:15 +04:00
Sergey Solovyev d800895380 Wizard -> Wizards 2013-06-25 23:09:59 +04:00
Sergey Solovyev b4198f7918 method moved 2013-06-25 23:09:07 +04:00
Sergey Solovyev bba654f378 method extracted 2013-06-25 23:08:01 +04:00
Sergey Solovyev 6c578d7d09 history improvements 2013-06-25 18:27:16 +04:00
Sergey Solovyev 3a67f465ea history improvements 2013-06-25 18:25:47 +04:00
Sergey Solovyev e1b0679263 prevent screen from fading 2013-06-25 17:24:49 +04:00
Sergey Solovyev 2fb20dc2b5 wizard 2013-06-25 16:17:17 +04:00
Sergey Solovyev c906e572f7 finish wizard dialog 2013-06-25 15:53:11 +04:00