#590 Merged V3.4 (051f4506) · Commits · labs / Tablexia

There was an error fetching the commit references. Please try again later.

Commit 051f4506 authored 8 years ago by

Anton Danilov

Browse files

#590 Merged V3.4

parents 797d67a4 53fad295

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

android/AndroidManifest.xml 4 additions, 0 deletions

android/AndroidManifest.xml
android/assets/text/application/application_cs.properties 8 additions, 0 deletions

android/assets/text/application/application_cs.properties
android/assets/text/application/application_de.properties 10 additions, 1 deletion

android/assets/text/application/application_de.properties
android/assets/text/application/application_sk.properties 9 additions, 1 deletion

android/assets/text/application/application_sk.properties
android/assets/text/screen/form/form_cs.properties 1 addition, 0 deletions

android/assets/text/screen/form/form_cs.properties
android/assets/text/screen/form/form_de.properties 1 addition, 0 deletions

android/assets/text/screen/form/form_de.properties
android/assets/text/screen/form/form_sk.properties 1 addition, 0 deletions

android/assets/text/screen/form/form_sk.properties
android/build.gradle 7 additions, 15 deletions

android/build.gradle
android/src/androidTest/java/cz/nic/tablexia/android/test/instrumentation/AbstractOpenglTest.java 0 additions, 59 deletions

...exia/android/test/instrumentation/AbstractOpenglTest.java
android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java 10 additions, 52 deletions

...rc/main/java/cz/nic/tablexia/android/AndroidLauncher.java
android/src/main/java/cz/nic/tablexia/android/camera/AndroidCamera2QRCodeScanner.java 420 additions, 0 deletions

.../tablexia/android/camera/AndroidCamera2QRCodeScanner.java
android/src/main/java/cz/nic/tablexia/android/camera/AndroidQRCodeScanner.java 330 additions, 0 deletions

.../cz/nic/tablexia/android/camera/AndroidQRCodeScanner.java
build.gradle 5 additions, 16 deletions

build.gradle
core/assets/common/_global/application/dialog/thin_border.9.png 0 additions, 0 deletions

...ssets/common/_global/application/dialog/thin_border.9.png
core/assets/common/_global/application/ui/qr_magnifier_icon.png 0 additions, 0 deletions

...ssets/common/_global/application/ui/qr_magnifier_icon.png
core/assets/common/screen/form/gfx/qr_magnifier_icon.png 0 additions, 0 deletions

core/assets/common/screen/form/gfx/qr_magnifier_icon.png
core/assets/common/screen/halloffame/trophy/screen_halloffame_trophyheap-35.png 0 additions, 0 deletions

...een/halloffame/trophy/screen_halloffame_trophyheap-35.png
core/assets/common/screen/halloffame/trophy/screen_halloffame_trophyheap-40.png 0 additions, 0 deletions

...een/halloffame/trophy/screen_halloffame_trophyheap-40.png
core/assets/common/screen/halloffame/trophy/screen_halloffame_trophyheap-50.png 0 additions, 0 deletions

...een/halloffame/trophy/screen_halloffame_trophyheap-50.png
core/assets/common/screen/halloffame/trophy/screen_halloffame_trophyheap-60.png 0 additions, 0 deletions

...een/halloffame/trophy/screen_halloffame_trophyheap-60.png

with 806 additions and 144 deletions

Please register or to comment

Admin message

Admin message

#590 Merged V3.4