Commit Graph

1419 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
9c31ecb39d translations 2013-09-20 22:01:40 +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
a098adef83 polish translation 2013-07-21 00:54:04 +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
0795f56326 release notes 2013-07-18 18:09:48 +04:00
Sergey Solovyev
fc9708c25e release notes 2013-07-18 18:07:00 +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
c5464f4190 fix in translation 2013-07-18 11:58:59 +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
53e23570a0 russian translation fixed 2013-07-18 10:59:26 +04:00
Sergey Solovyev
73fee3cf56 translations added 2013-07-16 17:13:37 +04:00
Sergey Solovyev
abd1ef2235 jscl version updated 2013-07-16 16:57:00 +04:00
Sergey Solovyev
d5ae136054 matrix tests added 2013-07-16 13:46:47 +04:00
Sergey Solovyev
26fd4dee77 Merge remote-tracking branch 'origin/master' 2013-07-11 16:32:10 +04:00
Sergey Solovyev
1aee47049d tests added 2013-07-11 16:31:46 +04:00
Sergey Solovyev
fc397f6c62 translations updated 2013-07-08 12:32:22 +04:00
Sergey Solovyev
b475b06504 translations updated 2013-07-08 11:56:56 +04:00
Sergey Solovyev
60e1299421 translations updated 2013-07-08 11:48:04 +04:00
Sergey Solovyev
1abaed2bab onscreen editor fixed 2013-07-03 01:27:50 +04:00
Sergey Solovyev
a9ec9ba5bd timeout reduced 2013-07-03 01:14:06 +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
e53d72fc04 widget layout changed 2013-07-02 16:48:27 +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
b7b32b1002 safe loading of calculator engine 2013-07-02 13:23:44 +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
Sergey Solovyev
f40740d531 translations 2013-07-01 23:45:12 +04:00
Sergey Solovyev
6977b4c6b8 Merge branch 'dev-number-format-in-editor' into dev
Conflicts:
	android-app-core/res/values-ru/text_strings.xml
	android-app-core/res/values-ru/text_wizard.xml
	android-app-core/res/values/text_strings.xml
	android-app-core/res/values/text_wizard.xml
2013-07-01 23:39:23 +04:00
Sergey Solovyev
6f15e03543 translations 2013-07-01 23:37:35 +04:00
serso
e0bce886f4 pom changed 2013-07-01 16:54:18 +04:00
Solovyev_S
1caf9413c0 tests fixed 2013-07-01 16:19:06 +04:00
Solovyev_S
ac43c9b25a translations 2013-07-01 13:23:25 +04:00
Solovyev_S
2de13f0ffb translations 2013-07-01 13:22:09 +04:00