Commit Graph

1991 Commits

Author SHA1 Message Date
Sergey Solovyev
a130a581a2 merging 2012-12-01 22:00:45 +04:00
Sergey Solovyev
87254f5335 merging 2012-12-01 21:51:40 +04:00
Sergey Solovyev
c0e57175c8 move 2012-12-01 21:32:38 +04:00
Sergey Solovyev
b9dd6b0fef Merge branch 'dev-app-structure' into dev
Conflicts:
	android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
	android-app/AndroidManifest.xml
	android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
2012-12-01 21:30:47 +04:00
Sergey Solovyev
40741566ec Merge branch 'dev-matrix-support' into dev
Conflicts:
	calculatorpp/AndroidManifest.xml
	calculatorpp/project.properties
	calculatorpp/res/layout/calc_vars_button.xml
	calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
2012-12-01 21:29:35 +04:00
Sergey Solovyev
1f5e900dd9 changes 2012-12-01 21:26:07 +04:00
Sergey Solovyev
7b9ab0ab94 changes 2012-12-01 20:39:29 +04:00
Sergey Solovyev
79017b94f9 changes 2012-12-01 20:15:24 +04:00
Sergey Solovyev
8ce44cd900 changes 2012-12-01 19:14:06 +04:00
Sergey Solovyev
19818c510e changes 2012-12-01 18:54:21 +04:00
Sergey Solovyev
2747b26506 changes 2012-12-01 18:46:36 +04:00
Sergey Solovyev
c2662e7537 changes 2012-12-01 17:46:16 +04:00
Sergey Solovyev
5d1ddf976d removed gen folder 2012-11-30 18:24:48 +04:00
Sergey Solovyev
fb53604b3f removed gen folder 2012-11-30 18:21:16 +04:00
Sergey Solovyev
b9a90f79f9 removed gen folder 2012-11-30 18:14:00 +04:00
Sergey Solovyev
53a2b84f51 changes 2012-11-30 18:07:20 +04:00
Sergey Solovyev
324bbda552 changes 2012-11-30 16:16:23 +04:00
Sergey Solovyev
476f6352d2 changes 2012-11-30 16:11:31 +04:00
Sergey Solovyev
5026597946 Application structure changed 2012-11-30 13:43:52 +04:00
Sergey Solovyev
a2009599e4 AndroidManifest version update 2012-11-29 22:58:08 +04:00
Sergey Solovyev
5e77101d60 [maven-release-plugin] prepare for next development iteration 2012-11-29 21:01:51 +04:00
Sergey Solovyev
6fe9f57ec4 [maven-release-plugin] prepare release release-1.5.2 2012-11-29 21:01:37 +04:00
Sergey Solovyev
3d167021a6 monkey script 2012-11-29 20:47:08 +04:00
Sergey Solovyev
0e2349d6ab typos fixed 2012-11-29 20:43:36 +04:00
Sergey Solovyev
d35260f5f2 release notes 2012-11-29 20:31:53 +04:00
Sergey Solovyev
6e41318ec5 AndroidManifest version update 2012-11-29 20:12:40 +04:00
Sergey Solovyev
7a52252f8f [maven-release-plugin] prepare for next development iteration 2012-11-26 23:50:19 +04:00
Sergey Solovyev
07f21b99d3 [maven-release-plugin] prepare release release-1.5.2-b 2012-11-26 23:50:09 +04:00
Sergey Solovyev
668e987ae0 Revert "calculator window"
This reverts commit ff31a17921.
2012-11-26 23:42:27 +04:00
Sergey Solovyev
ff31a17921 calculator window 2012-11-26 23:38:04 +04:00
Sergey Solovyev
3ec7efb793 translations + logs uncommented 2012-11-26 22:33:41 +04:00
Sergey Solovyev
1e8eb64f74 translations + logs uncommented 2012-11-26 22:33:26 +04:00
Sergey Solovyev
94761dfbf1 New icons 2012-11-26 22:24:41 +04:00
Sergey Solovyev
d58541443c changes 2012-11-26 01:05:39 +04:00
Sergey Solovyev
f0c43062ab pom version update 2012-11-26 00:14:56 +04:00
Sergey Solovyev
52794f0dcb changes 2012-11-26 00:13:15 +04:00
Sergey Solovyev
a5366acdeb changes 2012-11-26 00:10:52 +04:00
Sergey Solovyev
bc7b434763 changes 2012-11-26 00:01:57 +04:00
Sergey Solovyev
184e090b65 changes 2012-11-26 00:00:30 +04:00
Sergey Solovyev
642c7eb076 monkeyrunner + layouts for different screen densities 2012-11-25 15:27:28 +04:00
Sergey Solovyev
1c7cb51383 Changes 2012-11-24 21:30:49 +04:00
Sergey Solovyev
e54c5c97e6 Changes 2012-11-24 21:12:35 +04:00
Sergey Solovyev
cd41a35093 Merge branch 'dev' into dev-overlay-app
Conflicts:
	calculatorpp/AndroidManifest.xml
	calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
2012-11-24 14:35:06 +04:00
Sergey Solovyev
0fbe345b09 Rename 2012-11-24 13:56:09 +04:00
Sergey Solovyev
ac5421a6c0 Calculator Onscreen 2012-11-23 18:19:31 +04:00
Sergey Solovyev
b71a21a05f Calculator Onscreen 2012-11-23 17:39:58 +04:00
Sergey Solovyev
36772dea1f Screenshots 2012-11-23 01:19:14 +04:00
Sergey Solovyev
ddbb9b3bef Calculator onscreen added 2012-11-22 00:24:17 +04:00
Sergey Solovyev
0a35201c80 Calculator Overlay 2012-11-21 18:39:57 +04:00
Sergey Solovyev
64b01cb22a Calculator Overlay 2012-11-21 18:34:58 +04:00