Commits · 0c76433232000e6ddf54380567269d19a6fe1faa · labs / Tablexia · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

Apr 01, 2016
- Merging · 0c764332
  Vitaliy Vashchenko authored 8 years ago
  
  0c764332
- Merge branch 'devel' into feature-qr-code · 6f2cad26
  Vitaliy Vashchenko authored 8 years ago
```
# Conflicts:
#	android/assets/text/application/application_cs.properties
#	core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java
```
  6f2cad26
- Upgrade to RoboVM 1.7 for AppStore deploy · e96b2230
  Matyáš Latner authored 8 years ago
  
  e96b2230
- iOS manifest modification for AppStore deploy · 059d09f3
  Matyáš Latner authored 8 years ago
  
  059d09f3
Mar 31, 2016
- Merge branch 'feature-gamemenu-devel' into 'devel' · 2a272889
  Matyáš Latner authored 8 years ago
```
Feature gamemenu devel

Zmenil jsem pozice nekterych obrazku, co jsou na pozadi gamemenu tak, aby text se slozitosti byl lepe citelny. 

![Screenshot_from_2016-03-31_15-06-07](/uploads/80be148036f69c5c976b9896c31a62ba/Screenshot_from_2016-03-31_15-06-07.png)
![Screenshot_from_2016-03-31_15-02-42](/uploads/158f4e3e53f3cc902e2735d22ea70db2/Screenshot_from_2016-03-31_15-02-42.png)



See merge request !311
```
  2a272889
- Merge branch 'feature-createuser' into 'devel' · 5f461f6d
  Matyáš Latner authored 8 years ago
```
#288 updated profile photos, changed order of photos when creating profile



See merge request !310
```
  5f461f6d
- #304 Generating of capital letters for specific words in DE Robbery game text rules · 5d6ebede
  Matyáš Latner authored 8 years ago
  
  5d6ebede
- Corrected position of night watch fore. · 432db180
  Vitaliy Vashchenko authored 8 years ago
  
  432db180
- Corrected position of pursuit fore. · ec668691
  Vitaliy Vashchenko authored 8 years ago
  
  ec668691
- #288 updated profile photos, changed order of photos when creating profile · f98f3854
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  f98f3854
- Merge branch 'feature-translations-de' into devel · b55f3203
  Matyáš Latner authored 8 years ago
  
  b55f3203
- Merge branch 'feature-pursuit_devel' into 'devel' · 14767ef2
  Matyáš Latner authored 8 years ago
```
#280 ArrayIndexOutOfBoundsException fix



See merge request !306
```
  14767ef2
- Merge branch 'feature-encyclopedia' into 'devel' · f79d1b2d
  Matyáš Latner authored 8 years ago
```
#295 Změna uvozovek



See merge request !308
```
  f79d1b2d
- Merge branch 'feature-loadingscreen' into 'devel' · 066fb613
  Matyáš Latner authored 8 years ago
```
#293 Změna DE popisku pro nového detektiva



See merge request !309
```
  066fb613
- Merge branch 'feature-gamemenu2' into 'devel' · eca4e0ae
  Matyáš Latner authored 8 years ago
```
Feature gamemenu2



See merge request !305
```
  eca4e0ae
- #297 Changed DE text in Ecyklopedia play button to "Wiedegabe" and fixed image button sizing · 7f2f2663
  Matyáš Latner authored 8 years ago
  
  7f2f2663
Mar 30, 2016
- #298 mal instead of x (multiply) · 7a0c8fd3
  Vitaliy Vashchenko authored 8 years ago
  
  7a0c8fd3
- #293 DE button for new user -neuer Detektiv- changed to -Neues Profil- · 6efb6d81
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  6efb6d81
- Merge remote-tracking branch 'origin/feature-encyclopedia' into feature-encyclopedia · 40bc45d8
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
	core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java
	core/src/cz/nic/tablexia/util/ui/button/TablexiaButton.java
```
  40bc45d8
- Merge remote-tracking branch 'origin/feature-encyclopedia' into feature-encyclopedia · 62897bdc
  Anton Danilov authored 8 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
	core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java
	core/src/cz/nic/tablexia/util/ui/button/TablexiaButton.java
```
  62897bdc
- #298 Corrections in DE texts · 7799904f
  Vitaliy Vashchenko authored 8 years ago
  
  7799904f
- #295 Change type of apostrophes, removed where needed · ec513756
  Anton Danilov authored 8 years ago and Anton Danilov committed 8 years ago
  
  ec513756
- Merge branch 'feature-fontnew' into feature-encyclopedia · 1bfcd076
  Anton Danilov authored 8 years ago
  
  1bfcd076
- Removed space before comma. · 38845864
  Vitaliy Vashchenko authored 8 years ago
  
  38845864
- #296 #299 Correcting mistakes in DE texts. · 6dcaab88
  Vitaliy Vashchenko authored 8 years ago
  
  6dcaab88
- #280 ArrayIndexOutOfBoundsException fix · 9bd7db80
  Vitaliy Vashchenko authored 8 years ago
  
  9bd7db80
- #290 Fixed title for kidnapping game · 037e00e6
  Drahomír Karchňák authored 8 years ago
  
  037e00e6
- #292 Fixed typo in shooting range title · acd6d71f
  Drahomír Karchňák authored 8 years ago
  
  acd6d71f
- #294 Fixed typos in newspapers · 4478757d
  Drahomír Karchňák authored 8 years ago
  
  4478757d
- #295 Added „ and “ to bitmap fonts... · d1a9de32
  Drahomír Karchňák authored 8 years ago
  
  d1a9de32
- Merge branch 'devel' into feature-fontnew · c6e2e48c
  Drahomír Karchňák authored 8 years ago
```
Conflicts:
	core/src/cz/nic/tablexia/loader/application/ApplicationFontManager.java
```
  c6e2e48c
- #300 Fixed DE result text in Robbery game victory dialog · a351fbe2
  Matyáš Latner authored 8 years ago
  
  a351fbe2
- #301 Fixed Robbery game rule bc1bc DE text · 0dd2315a
  Matyáš Latner authored 8 years ago
  
  0dd2315a
- #302 Changed word "beliebtesten" to "Beliebtesten" · c0da32b3
  Matyáš Latner authored 8 years ago
  
  c0da32b3
- #303 Fixed typo in word "Oberteil" and "Unterteil" · bc058b74
  Matyáš Latner authored 8 years ago
  
  bc058b74
- #305 Fixed typo in DE word "gleich" and fixed Robbery DE rule text for rule bc2bc · 6cc65792
  Matyáš Latner authored 8 years ago
  
  6cc65792
- #306 Fixed Robbery DE rule text for rules ca0cc0t and ca1cc · e54c909f
  Matyáš Latner authored 8 years ago
  
  e54c909f
- #307 Fixed Robbery DE rule text for rule CC1CC · ebb9e1ae
  Matyáš Latner authored 8 years ago
  
  ebb9e1ae
Mar 29, 2016
- #292 Fixed typo in DE translation of NightWatch game preloader · 68abe0a1
  Matyáš Latner authored 8 years ago
  
  68abe0a1
- #289 Fixed typo in DE transaltion of RobberyGame and fixed constituent of Beads attribute · 3039d5b3
  Matyáš Latner authored 8 years ago
  
  3039d5b3