Commit Graph

433 Commits

Author SHA1 Message Date
Adrian Tiberius 0a5ce64fe2 added login and users screens 2016-06-13 19:35:18 +03:00
Jarrad 08790ddd0d Merge pull request #129 from status-im/issue/#120
Issue/#120
2016-06-13 18:06:29 +02:00
Adrian Tiberius 7f207a3760 merged develop 2016-06-10 03:21:48 +03:00
Adrian Tiberius e0ce4217bb updated new contact screen; some code cleaning 2016-06-10 03:03:40 +03:00
Roman Volosovskyi 9630f4370f Merge pull request #127 from status-im/root-warning
warn user if root before starting geth
2016-06-08 16:47:15 +03:00
Jarrad 97ff59f95b System.loadLibrary voodoo magic 2016-06-08 15:29:48 +02:00
Jarrad 804683cd52 fix conflicts 2016-06-08 13:06:58 +02:00
Jarrad 1f0a4214b8 warn user if root before starting geth 2016-06-08 12:43:02 +02:00
Jarrad 44c98d68c1 Merge pull request #118 from status-im/bug/#115
workaround for adding peer to geth
2016-06-06 12:57:09 +02:00
Adrian Tiberius fbd66a840f qr-scanner screen title, code cleaning, style fixes 2016-06-03 15:47:52 +03:00
Roman Volosovskyi 72b9afce99 println 2016-06-02 17:40:58 +03:00
Roman Volosovskyi db46a3a3cb updated qr flow 2016-06-02 17:39:26 +03:00
Roman Volosovskyi 485718d871 fix typo 2016-06-02 15:57:33 +03:00
Roman Volosovskyi 11edd55b5a fix label function 2016-06-02 15:48:57 +03:00
Roman Volosovskyi 9ae6e752d8 fix contacts loading 2016-06-02 14:23:28 +03:00
Adrian Tiberius 6eeefb2efb make qr-scanner callable multiple times from different screens 2016-06-02 13:43:26 +03:00
Jarrad ba1d5d1c4e Merge pull request #117 from status-im/appium-setup
Appium setup & unit tests
2016-06-02 11:52:39 +02:00
Jarrad 058f470ea7 update run-osx for unit tests and iTerm new release 2016-06-02 11:51:44 +02:00
Roman Volosovskyi 084f067ae8 fix exception at fetching of the contacts 2016-06-01 19:42:38 +03:00
Roman Volosovskyi bf6d4ef256 Merge branch 'develop' into appium-setup
Conflicts:
	src/status_im/i18n.cljs
2016-06-01 19:11:51 +03:00
Adrian Tiberius a46f60c854 fix translation pluralization 2016-06-01 14:44:04 +03:00
Adrian Tiberius 13c506491f fix translation pluralization 2016-06-01 14:35:22 +03:00
Roman Volosovskyi 2bfd90cec4 remove println 2016-06-01 14:09:43 +03:00
Adrian Tiberius 755e9bf2b3 fix qr code decoding and remove extra data 2016-06-01 14:01:58 +03:00
Adrian Tiberius c81276e3b7 implemented #119 and #120 2016-06-01 11:41:50 +03:00
Roman Volosovskyi b914493283 fix ids for chats created after receiving from unknown id 2016-05-30 11:49:16 +03:00
Roman Volosovskyi f30248e7fe move js/React to cljsjs.react.cljs 2016-05-30 11:01:57 +03:00
Roman Volosovskyi c8d0f590c2 doc for appium-test 2016-05-30 10:22:29 +03:00
Roman Volosovskyi 1766b1af12 first unit test 2016-05-30 08:58:38 +03:00
Roman Volosovskyi 043d28c44d js/window 2016-05-30 08:58:38 +03:00
Roman Volosovskyi 7694ad9e87 clean js/window first attempt 2016-05-30 08:58:38 +03:00
Adrian Tiberius 32b10794d2 workaround for adding peer to geth 2016-05-26 19:20:39 +03:00
Jarrad ab36ec7df7 Merge branch 'appium-setup' of github.com:status-im/status-react into appium-setup 2016-05-26 18:05:24 +02:00
Jarrad a2e14e4ff0 run appium with second param 2016-05-26 18:05:10 +02:00
Roman Volosovskyi 0e3c1d10ba implicitly wait 25s 2016-05-26 18:13:37 +03:00
Roman Volosovskyi 54ae25dc67 appium-test macro 2016-05-26 17:00:42 +03:00
Roman Volosovskyi 63dd0d4a4a :accessibility-label 2016-05-26 16:46:14 +03:00
Roman Volosovskyi dc2839e086 first attempt 2016-05-26 15:31:11 +03:00
Jarrad b6b1bf494b Merge pull request #109 from status-im/feature/i18n
added i18n translations
2016-05-25 18:09:37 +02:00
Adrian Tiberius 182600b2d7 changed translation style 2016-05-25 18:57:06 +03:00
Adrian Tiberius 930d201764 removed unneeded translations 2016-05-25 14:59:19 +03:00
Roman Volosovskyi 6ff7c71e35 uncomment name view 2016-05-25 11:37:49 +03:00
Roman Volosovskyi 83c36caf3a update protocol dependency 2016-05-25 11:35:51 +03:00
Adrian Tiberius e2b8bcc424 fix interop 2016-05-25 04:55:44 +03:00
Adrian Tiberius b15c156a40 added i18n translations 2016-05-25 04:27:03 +03:00
Roman Volosovskyi aa751fc59c fix content-content issue 2016-05-24 17:21:12 +03:00
Jarrad 9a8a5e0ddd Merge pull request #97 from status-im/utf8-hex
utf8 over whisper
2016-05-24 12:58:52 +02:00
Jarrad 01016390d8 Merge pull request #96 from status-im/bug/#88
fixes #88
2016-05-24 11:06:23 +02:00
Roman Volosovskyi 6b78d9eee2 utf8 over whisper 2016-05-24 12:05:47 +03:00
Adrian Tiberius 98f22d9a13 merge develop 2016-05-24 12:01:26 +03:00