 Jarrad
|
4b43096ba8
|
System.loadLibrary voodoo magic
Former-commit-id: 97ff59f95b
|
2016-06-08 15:29:48 +02:00 |
|
Jarrad
|
ce6ebde8b7
|
fix conflicts
Former-commit-id: 804683cd52
|
2016-06-08 13:06:58 +02:00 |
|
Jarrad
|
6756d02335
|
warn user if root before starting geth
Former-commit-id: 1f0a4214b8
|
2016-06-08 12:43:02 +02:00 |
Jarrad
|
fb5d4f15f1
|
Merge pull request #118 from status-im/bug/#115
workaround for adding peer to geth
Former-commit-id: 44c98d68c1
|
2016-06-06 12:57:09 +02:00 |
Roman Volosovskyi
|
2b4f410fd7
|
fix contacts loading
Former-commit-id: 9ae6e752d8
|
2016-06-02 14:23:28 +03:00 |
|
Jarrad
|
855dca08f5
|
Merge pull request #117 from status-im/appium-setup
Appium setup & unit tests
Former-commit-id: ba1d5d1c4e
|
2016-06-02 11:52:39 +02:00 |
|
Jarrad
|
ed65ba0ba7
|
update run-osx for unit tests and iTerm new release
Former-commit-id: 058f470ea7
|
2016-06-02 11:51:44 +02:00 |
|
Roman Volosovskyi
|
ce80c8a330
|
fix exception at fetching of the contacts
Former-commit-id: 084f067ae8
|
2016-06-01 19:42:38 +03:00 |
|
Roman Volosovskyi
|
04760cc549
|
Merge branch 'develop' into appium-setup
Conflicts:
src/status_im/i18n.cljs
Former-commit-id: bf6d4ef256
|
2016-06-01 19:11:51 +03:00 |
Adrian Tiberius
|
4d5c5755c6
|
fix translation pluralization
Former-commit-id: a46f60c854
|
2016-06-01 14:44:04 +03:00 |
|
Roman Volosovskyi
|
7fbbf8b4aa
|
remove println
Former-commit-id: 2bfd90cec4
|
2016-06-01 14:09:43 +03:00 |
|
Roman Volosovskyi
|
0f6e15a8d0
|
fix ids for chats created after receiving from unknown id
Former-commit-id: b914493283
|
2016-05-30 11:49:16 +03:00 |
|
Roman Volosovskyi
|
c4d3436bfc
|
move js/React to cljsjs.react.cljs
Former-commit-id: f30248e7fe
|
2016-05-30 11:01:57 +03:00 |
|
Roman Volosovskyi
|
eedf38895d
|
doc for appium-test
Former-commit-id: c8d0f590c2
|
2016-05-30 10:22:29 +03:00 |
|
Roman Volosovskyi
|
3ea8b2cb82
|
first unit test
Former-commit-id: 1766b1af12
|
2016-05-30 08:58:38 +03:00 |
|
Roman Volosovskyi
|
59cf02194b
|
js/window
Former-commit-id: 043d28c44d
|
2016-05-30 08:58:38 +03:00 |
|
Roman Volosovskyi
|
17c1c76003
|
clean js/window first attempt
Former-commit-id: 7694ad9e87
|
2016-05-30 08:58:38 +03:00 |
|
Adrian Tiberius
|
ecf8ea0f33
|
workaround for adding peer to geth
Former-commit-id: 32b10794d2
|
2016-05-26 19:20:39 +03:00 |
|
Jarrad
|
983a007280
|
Merge branch 'appium-setup' of github.com:status-im/status-react into appium-setup
Former-commit-id: ab36ec7df7
|
2016-05-26 18:05:24 +02:00 |
|
Jarrad
|
ee2087ce77
|
run appium with second param
Former-commit-id: a2e14e4ff0
|
2016-05-26 18:05:10 +02:00 |
|
Roman Volosovskyi
|
e8256f34e9
|
implicitly wait 25s
Former-commit-id: 0e3c1d10ba
|
2016-05-26 18:13:37 +03:00 |
|
Roman Volosovskyi
|
23b646c213
|
appium-test macro
Former-commit-id: 54ae25dc67
|
2016-05-26 17:00:42 +03:00 |
|
Roman Volosovskyi
|
6823acd171
|
:accessibility-label
Former-commit-id: 63dd0d4a4a
|
2016-05-26 16:46:14 +03:00 |
|
Roman Volosovskyi
|
c10abb17bb
|
first attempt
Former-commit-id: dc2839e086
|
2016-05-26 15:31:11 +03:00 |
|
Jarrad
|
9888eaab18
|
Merge pull request #109 from status-im/feature/i18n
added i18n translations
Former-commit-id: b6b1bf494b
|
2016-05-25 18:09:37 +02:00 |
|
Adrian Tiberius
|
67e784598a
|
changed translation style
Former-commit-id: 182600b2d7
|
2016-05-25 18:57:06 +03:00 |
|
Adrian Tiberius
|
c64b157666
|
removed unneeded translations
Former-commit-id: 930d201764
|
2016-05-25 14:59:19 +03:00 |
|
Roman Volosovskyi
|
ded52dca90
|
uncomment name view
Former-commit-id: 6ff7c71e35
|
2016-05-25 11:37:49 +03:00 |
|
Roman Volosovskyi
|
0cd0a638a1
|
update protocol dependency
Former-commit-id: 83c36caf3a
|
2016-05-25 11:35:51 +03:00 |
|
Adrian Tiberius
|
67c8a63e26
|
fix interop
Former-commit-id: e2b8bcc424
|
2016-05-25 04:55:44 +03:00 |
|
Adrian Tiberius
|
7d47ab2d62
|
added i18n translations
Former-commit-id: b15c156a40
|
2016-05-25 04:27:03 +03:00 |
|
Roman Volosovskyi
|
88aa653d79
|
fix content-content issue
Former-commit-id: aa751fc59c
|
2016-05-24 17:21:12 +03:00 |
|
Jarrad
|
91bdb515a7
|
Merge pull request #97 from status-im/utf8-hex
utf8 over whisper
Former-commit-id: 9a8a5e0ddd
|
2016-05-24 12:58:52 +02:00 |
|
Jarrad
|
0031c9d077
|
Merge pull request #96 from status-im/bug/#88
fixes #88
Former-commit-id: 01016390d8
|
2016-05-24 11:06:23 +02:00 |
|
Roman Volosovskyi
|
4bef3a0428
|
utf8 over whisper
Former-commit-id: 6b78d9eee2
|
2016-05-24 12:05:47 +03:00 |
|
Adrian Tiberius
|
6ab889152c
|
merge develop
Former-commit-id: 98f22d9a13
|
2016-05-24 12:01:26 +03:00 |
|
Jarrad
|
bc1f9dcedd
|
Merge pull request #85 from status-im/real-data
Listen sms. Comment/replace placeholders.
Former-commit-id: eb72ea776f
|
2016-05-24 10:52:21 +02:00 |
virvar
|
49a9ae3ba1
|
Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.
# Conflicts:
# .re-natal
# android/app/build.gradle
# android/app/src/main/java/com/statusim/MainActivity.java
# android/settings.gradle
# src/status_im/chat/handlers.cljs
# src/status_im/chat/screen.cljs
# src/status_im/chats_list/views/chat_list_item.cljs
# src/status_im/db.cljs
# src/status_im/group_settings/screen.cljs
Former-commit-id: dcc607022f
|
2016-05-24 11:08:54 +03:00 |
|
Adrian Tiberius
|
9064021247
|
merge develop
Former-commit-id: 979ce25f2a
|
2016-05-23 19:53:07 +03:00 |
|
Jarrad
|
ef205d2d78
|
Merge pull request #92 from status-im/group-chat
Group chat
Former-commit-id: 7fb60472d5
|
2016-05-23 15:28:49 +02:00 |
|
Adrian Tiberius
|
56c1248a6d
|
fixes #88
Former-commit-id: b1bc93b782
|
2016-05-23 15:13:52 +03:00 |
|
virvar
|
5142ffc4c3
|
Fix new chat icon
Former-commit-id: fc5bb416af
|
2016-05-23 13:50:46 +03:00 |
|
Jarrad
|
7c5c20ff70
|
Merge pull request #75 from status-im/feature/tabs
Feature/tabs
Former-commit-id: e9af469ebb
|
2016-05-23 12:25:01 +02:00 |
|
Adrian Tiberius
|
2e49994c86
|
small code clean
Former-commit-id: 45c35733be
|
2016-05-23 13:13:06 +03:00 |
|
Adrian Tiberius
|
563e0d69c7
|
fix last element scroll
Former-commit-id: ff0307d4ce
|
2016-05-22 23:36:43 +03:00 |
|
Roman Volosovskyi
|
2b70ed56f4
|
fix typo in ns
Former-commit-id: 547ececac3
|
2016-05-22 18:17:22 +03:00 |
|
Roman Volosovskyi
|
322622ae52
|
rename main-tabs.cljs
Former-commit-id: ebe61c9d95
|
2016-05-22 10:22:22 +03:00 |
|
Roman Volosovskyi
|
c6de5075fe
|
remove println
Former-commit-id: 86f80dc525
|
2016-05-21 16:34:06 +03:00 |
|
Roman Volosovskyi
|
ec1439943d
|
fix loading of chat's messages
Former-commit-id: 8bda739201
|
2016-05-21 16:32:04 +03:00 |
|
Roman Volosovskyi
|
7d2371afec
|
Merge branch 'develop' into group-chat
Conflicts:
src/status_im/android/core.cljs
src/status_im/chat/handlers.cljs
src/status_im/group_settings/handlers.cljs
src/status_im/group_settings/screen.cljs
src/status_im/group_settings/styles/chat_name_edit.cljs
src/status_im/group_settings/subs.cljs
src/status_im/group_settings/views/chat_name_edit.cljs
src/status_im/handlers.cljs
src/status_im/navigation.cljs
src/status_im/participants/views/contact.cljs
src/status_im/participants/views/create.cljs
src/status_im/participants/views/remove.cljs
src/syng_im/subs.cljs
Former-commit-id: 277905124d
|
2016-05-21 16:07:37 +03:00 |