Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b70616511a6f1f98f452dc50b08fe975
|
2016-06-01 11:41:50 +03:00 |
|
virvar
|
cf897d235a
|
Fix drag icon
Former-commit-id: 96ef6c34a8a4e33cf0c470075c4db4a23405e397
|
2016-05-31 14:39:38 +03:00 |
|
Adrian Tiberius
|
ecf8ea0f33
|
workaround for adding peer to geth
Former-commit-id: 32b10794d20d6ac149bb484d1d65dacff4cc84d7
|
2016-05-26 19:20:39 +03:00 |
|
virvar
|
16f7f791ac
|
Request-info view
Former-commit-id: 5333eadd67ae2e8d185bfdb0b48f359b3543a1d1
|
2016-05-26 16:54:18 +03: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: dcc607022f4e62e4c544495220c3130c5c30b026
|
2016-05-24 11:08:54 +03:00 |
|
Jarrad
|
ef205d2d78
|
Merge pull request #92 from status-im/group-chat
Group chat
Former-commit-id: 7fb60472d527281de344566d0a4ad5e0334fca51
|
2016-05-23 15:28:49 +02: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: 277905124dc9fe2bd4ea6362dd1365dca567ae38
|
2016-05-21 16:07:37 +03:00 |
|
Adrian Tiberius
|
c7a9f13733
|
merged develop
Former-commit-id: 4a35a06b8c3dee363e8a237cc245e488b9c165c8
|
2016-05-20 22:12:08 +03:00 |
|
Roman Volosovskyi
|
227f22eb48
|
chat name/load messages on [:navigate-to :chat id]/ other
Former-commit-id: ae1918a2aed109400cda0e376fec6d37cdb5d79f
|
2016-05-20 19:12:04 +03:00 |
|
|
|
5e25330d58
|
an icon why not?
Former-commit-id: 4732498ba26fd4c13cddcba6c7af784910477536
|
2016-05-20 15:45:35 +02:00 |
|
virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a12f3702bf303bd20b42340ef61c6e68
|
2016-05-20 14:20:48 +03:00 |
|
Adrian Tiberius
|
6e53d72acb
|
add gradient
Former-commit-id: 799808965dac2236d21cd07e6a32e664f17e6711
|
2016-05-19 20:05:04 +03:00 |
|
Jarrad
|
5aa61b1de4
|
Syng to Status
Former-commit-id: 134c040c3e28667f01d4e218a9a8a4ab0b4c57cf
|
2016-05-19 18:32:38 +02:00 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13
|
2016-05-19 18:31:56 +02:00 |
|
Adrian Tiberius
|
aba7d4fae0
|
fix padding
Former-commit-id: 0556e299d6fea7bb50c106a65cbe4b1f75df19a7
|
2016-05-19 18:41:25 +03:00 |
|
virvar
|
d1ef5e7e32
|
Setup sms-listener
Former-commit-id: 1f5dad71e81ec910b3370374544864e554fd6cf1
|
2016-05-18 17:40:26 +03:00 |
|
virvar
|
8919410735
|
Chat color
Former-commit-id: 14e69f9369148f334e77072d8e9a2431bd53bdfa
|
2016-05-16 13:47:34 +03:00 |
|
Adrian Tiberius
|
2b0bf554e4
|
added tabs component
Former-commit-id: 1fd3f86e235db34dde4ed04bc5535027d4a4cdfc
|
2016-05-12 22:47:32 +03:00 |
|
virvar
|
a3effe4f3d
|
Merge branch 'develop' into my-profile
Former-commit-id: 13205348ed8fa0180e94dde2b82aafb0022ecfbd
|
2016-05-11 15:49:05 +03:00 |
|
Jarrad
|
e9029d1130
|
Merge pull request #64 from status-im/commands-button
Commands button. Phone number validation. Drawer and Profile views.
Former-commit-id: 3d8adf840ef4606d38a0419280256a8ddd57a10d
|
2016-05-11 14:42:12 +02:00 |
|
virvar
|
5a63f527d3
|
Add my profile view
Former-commit-id: 3dfc4619244a0e54901d82f74b54232ee729373e
|
2016-05-11 13:05:33 +03:00 |
|
Adrian Tiberius
|
30b9298478
|
replace avatar placeholder in discovery and remove unused image resources
Former-commit-id: 5fe774faeefecac20a1f67591071914c06fe16f3
|
2016-05-10 17:39:52 +03:00 |
|
virvar
|
bdc9b6e5e0
|
Merge with 'develop'
Former-commit-id: 6f2acb0f65ea8b587e3447c98f0bda1f54cbcd6d
|
2016-05-10 16:39:09 +03:00 |
|
virvar
|
d285fcd6e0
|
Suggestions style. Add close commands button.
Former-commit-id: 6f5dade40fa03ee6557d8ae3e396843bbe08fee4
|
2016-05-10 16:16:07 +03:00 |
|
virvar
|
59e6126572
|
Show suggestions as hint for phone number format
Former-commit-id: 6eeaab5c2803eafb04e74b2a9df1872db94a7735
|
2016-05-09 15:29:08 +03:00 |
|
virvar
|
088d20ebf0
|
Fix profile styles
Former-commit-id: 7ddd90e2dca147ea6f48f9508f964e482f489c0a
|
2016-05-06 14:25:29 +03:00 |
|
Adrian Tiberius
|
b4243aa2cc
|
merged develop branch
Former-commit-id: 2c9174af631e30598f80f5005a4be717d5b8d9e1
|
2016-05-05 16:33:48 +03:00 |
|
virvar
|
968def8a3f
|
Menu items icons. Hide actions menu on click outside.
Former-commit-id: ac115087035cc2ef7efbc9146708c5989ade4c50
|
2016-05-03 16:39:08 +03:00 |
|
virvar
|
df120998cf
|
Merge branch 'design' into icons_resolution
Former-commit-id: 7ee1625b31dd98602a3f4e05744051c40dd3660e
|
2016-04-25 20:33:40 +03:00 |
|
virvar
|
99f5f9caef
|
Fix #25 Low resolution icons
Former-commit-id: 81751b294b480b4a9d9e57e771a6e101c8b772fb
|
2016-04-25 20:32:43 +03:00 |
|
Roman Volosovskyi
|
5cc01ad2d9
|
fix #28 adjustPan
Former-commit-id: 2100e08a49aa108d2218cc8e7a9ab2dd62901fea
|
2016-04-25 15:55:42 +03:00 |
|
Roman Volosovskyi
|
ee165f0694
|
fix #28
Former-commit-id: a6555242ff9267f0f8d78a63a1823d5b6072fa71
|
2016-04-25 13:41:25 +03:00 |
|
Jarrad Hope
|
25a7f8bb32
|
upgrade react-native and packages - but broken
Former-commit-id: bfaf45698c4bb12038c2c827ade7426f4919ee7f
|
2016-04-24 15:07:08 +07:00 |
|
Adrian Tiberius
|
387a802789
|
fix android-geth dependency
Former-commit-id: 71f686520435121ab0b1462f26862aa36671cff8
|
2016-04-22 19:04:29 +03:00 |
|
Jarrad Hope
|
b522302ee8
|
fix android-geth dependency
Former-commit-id: 0bd8ff367f784bc522c42a9cb352ed10e1782d79
|
2016-04-22 23:03:56 +07:00 |
|
Adrian Tiberius
|
8d349dc890
|
added geolocation permission
Former-commit-id: f32fb04c1a1a05ac95ffae2b49df0ed172c918ef
|
2016-04-19 15:30:07 +03:00 |
|
michaelr
|
d54d6555a4
|
moved re-frame app to root folder
Former-commit-id: 5a3b923b0c32e5e900b89e984393822ce6a15abc
|
2016-04-04 19:21:10 +03:00 |
|
michaelr
|
1441edc9e8
|
depend on geth arr from maven repo instead of the git repo
Former-commit-id: cc3f7ffdb17495e8e444ecc5bb67ce8028bbba9b
|
2016-03-14 00:30:11 +02:00 |
|
virvar
|
3811efeb5e
|
Save whisper identities to db
Former-commit-id: 1a7d089ddc31719a5a527acc30479c6cd4a54458
|
2016-03-11 19:04:12 +03:00 |
|
Jarrad Hope
|
7beec7dfe9
|
fresh build of go-ethereum:develop with shh_createIdentity, shh_addIdentity JSON-RPC methods
Former-commit-id: 6d906a0306e085035dfe379dc109d0fc96a20c03
|
2016-03-07 09:36:35 +01:00 |
|
Jarrad Hope
|
5db6709dd0
|
upgrade renatal, react-native, web3
Former-commit-id: 4c31f1225a9b02e2c268929112371e42e3c6c963
|
2016-03-06 23:09:55 +01:00 |
|
Jarrad Hope
|
3304099be6
|
removed quotes from geth instantiation
Former-commit-id: ea83bab74aedfb337c114d4f16221d532d01e2b4
|
2016-03-06 22:34:10 +01:00 |
|
Adrian Tiberius
|
6a2f1d6c10
|
fixed geth bootnode url
Former-commit-id: 8bc66701b8604d34f9cac0d929ce8985e5bc94f4
|
2016-02-29 17:14:56 +02:00 |
|
michaelr
|
73b9fec6a2
|
added shh API to list of APIs available over RPC
Former-commit-id: d13ad30155a72beaa168f4c1fbcef1c8b4a554ce
|
2016-02-28 18:59:05 +02:00 |
|
michaelr
|
8742e9a8b8
|
fixed for java to compile
Former-commit-id: 3d37ea77cd676e152ac0a831a576563fbbc77f87
|
2016-02-28 13:00:51 +02:00 |
|
Adrian Tiberius
|
9e46cf1bb9
|
fixed geth data folder path
Former-commit-id: 35b3013f3dbc1c293e8f308888a3518b87e05080
|
2016-02-28 12:56:00 +02:00 |
|
virvar
|
8766b15d36
|
Add font
Former-commit-id: bf31fed4ea6b6202a4b925f47e7beda63a44a4ce
|
2016-02-24 16:05:21 +03:00 |
|
Jarrad Hope
|
65644b2d84
|
i18n android integration, TODO iOS
Former-commit-id: f4af8beb158f4b36618004f5f9b61e2759265192
|
2016-02-23 23:15:51 +01:00 |
|
Jarrad Hope
|
286f50a634
|
add syng server as bootnode
Former-commit-id: cade052129c38d6be10a857b2c3b55b3ef1eae65
|
2016-02-23 19:37:48 +01:00 |
|
Jarrad Hope
|
c003165d88
|
add Whisper flag and comments for Android quirks
Former-commit-id: ebd42db745c7e4b04ee14cd5a974f15767c9d088
|
2016-02-23 18:49:35 +01:00 |
|
