Adrian Tiberius
|
a156c8f865
|
make qr-scanner callable multiple times from different screens
Former-commit-id: 6eeefb2efbd460376eb00b9714422e1c23724402
|
2016-06-02 13:43:26 +03:00 |
|
Roman Volosovskyi
|
04760cc549
|
Merge branch 'develop' into appium-setup
Conflicts:
src/status_im/i18n.cljs
Former-commit-id: bf6d4ef2569f3be04ec86548389ef4ad5b9c83a4
|
2016-06-01 19:11:51 +03:00 |
|
Adrian Tiberius
|
4d5c5755c6
|
fix translation pluralization
Former-commit-id: a46f60c854a6d17d982da3ffdc62ae186a8fa981
|
2016-06-01 14:44:04 +03:00 |
|
Adrian Tiberius
|
8250e8d225
|
fix translation pluralization
Former-commit-id: 13c506491fb4181ee8df9fcec8a0426fb2067f7f
|
2016-06-01 14:35:22 +03:00 |
|
Roman Volosovskyi
|
3ea8b2cb82
|
first unit test
Former-commit-id: 1766b1af1295f6773f580a3a6d3a1afba3dbff0a
|
2016-05-30 08:58:38 +03:00 |
|
Roman Volosovskyi
|
17c1c76003
|
clean js/window first attempt
Former-commit-id: 7694ad9e873d80824a07798de66b96b0f6a96dbb
|
2016-05-30 08:58:38 +03:00 |
|
Adrian Tiberius
|
67e784598a
|
changed translation style
Former-commit-id: 182600b2d7089b36f9b7451ba49a74ac80dab515
|
2016-05-25 18:57:06 +03:00 |
|
Adrian Tiberius
|
67c8a63e26
|
fix interop
Former-commit-id: e2b8bcc42436f584060a874b67e06adf6dc7957c
|
2016-05-25 04:55:44 +03:00 |
|
Adrian Tiberius
|
7d47ab2d62
|
added i18n translations
Former-commit-id: b15c156a40957c27f0c4feea3ea7ceedf0407090
|
2016-05-25 04:27:03 +03:00 |
|