Roman Volosovskyi
|
5abe38445e
|
Merge branch 'develop' into feature/#123
Conflicts:
android/app/build.gradle
android/settings.gradle
package.json
src/status_im/chat/handlers.cljs
src/status_im/chat/subs.cljs
Former-commit-id: dd3eb3c0eb
|
2016-06-23 12:02:39 +03:00 |
Jarrad
|
85c651e163
|
Merge pull request #140 from status-im/chat-animation
Chat animation
Former-commit-id: 31d7161766
|
2016-06-22 20:43:55 +02:00 |
Roman Volosovskyi
|
b505a3dc05
|
check identity length
Former-commit-id: fa2e2c2f28
|
2016-06-22 16:39:06 +03:00 |
Roman Volosovskyi
|
cbb56e499c
|
check uniqueness
Former-commit-id: 4181541ae2
|
2016-06-22 16:32:05 +03:00 |
Roman Volosovskyi
|
fe33e694b7
|
check uniqueness
Former-commit-id: bb4641fc93
|
2016-06-22 16:29:25 +03:00 |
Adrian Tiberius
|
163e98afee
|
merged develop
Former-commit-id: 6bb48a42f9
|
2016-06-22 11:24:47 +03:00 |
Adrian Tiberius
|
eb116cc65d
|
try using clojure spec for validation
Former-commit-id: 42d8ea47df
|
2016-06-22 11:18:46 +03:00 |
Roman Volosovskyi
|
9357849916
|
Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd
|
2016-06-22 10:53:27 +03:00 |
Roman Volosovskyi
|
e464079a84
|
Merge branch 'develop' into fix/single-drawer
Former-commit-id: e3e4de6f12
|
2016-06-22 10:48:45 +03:00 |
Roman Volosovskyi
|
977e29f4c3
|
comments
Former-commit-id: 2887e1c502
|
2016-06-21 20:13:51 +03:00 |
Roman Volosovskyi
|
63034358b2
|
Merge branch 'develop' into chat-animation
Conflicts:
.re-natal
src/status_im/android/core.cljs
src/status_im/chat/views/message_input.cljs
src/status_im/chat/views/plain_message.cljs
src/status_im/db.cljs
Former-commit-id: 8e2c207b2e
|
2016-06-21 19:17:30 +03:00 |
Roman Volosovskyi
|
f24e493ac4
|
Merge branch 'develop' into feature/#138
Former-commit-id: 4be203bcd3
|
2016-06-21 18:54:52 +03:00 |
Roman Volosovskyi
|
9ac1056d73
|
no contacts screen & some fixes
Former-commit-id: dc567356ca
|
2016-06-21 18:48:41 +03:00 |
Jarrad
|
3488beeee0
|
Merge pull request #143 from status-im/feature/#131
Feature/#131
Former-commit-id: f800f2c6bd
|
2016-06-21 17:07:19 +02:00 |
Jarrad
|
f6521f5c8a
|
Merge pull request #136 from status-im/feature/#31
White actionbar and hide tabs bar on scroll
Former-commit-id: 43961c2b7a
|
2016-06-21 17:02:45 +02:00 |
Adrian Tiberius
|
bfcc63fc05
|
added disabled state for create contact button
Former-commit-id: b5ea433420
|
2016-06-21 17:39:05 +03:00 |
Adrian Tiberius
|
a9d2ed2711
|
applied new design
Former-commit-id: 9f405ee18d
|
2016-06-21 17:15:46 +03:00 |
Adrian Tiberius
|
0f0cd22cb2
|
cleanup
Former-commit-id: 5a409ed6bf
|
2016-06-21 16:05:46 +03:00 |
Adrian Tiberius
|
9ecad449fe
|
added identicons for default profile pictures
Former-commit-id: eab8dd5ca2
|
2016-06-21 15:23:19 +03:00 |
Roman Volosovskyi
|
4f6ac06fa9
|
edit mode
Former-commit-id: d6040491fb
|
2016-06-21 12:46:02 +03:00 |
Roman Volosovskyi
|
36bddaff1f
|
cleanup
Former-commit-id: 4d7476dc5b
|
2016-06-21 12:23:02 +03:00 |
Roman Volosovskyi
|
6beda2ace2
|
orientation
Former-commit-id: f7b5832707
|
2016-06-21 12:03:39 +03:00 |
Roman Volosovskyi
|
4e39130176
|
keyboard height
Former-commit-id: e6639fc770
|
2016-06-21 11:35:15 +03:00 |
Roman Volosovskyi
|
ed35391d7f
|
command animation
Former-commit-id: 8c1d2eec1a
|
2016-06-21 10:56:11 +03:00 |
Roman Volosovskyi
|
3931c0a1c7
|
hiding of param's suggestions
Former-commit-id: ecd7ae26b8
|
2016-06-21 10:27:07 +03:00 |
Roman Volosovskyi
|
23b90af064
|
abit more refactoring
Former-commit-id: 9179cc61b4
|
2016-06-20 21:26:57 +03:00 |
Roman Volosovskyi
|
9e72e52737
|
some refactoring
Former-commit-id: 6299e7d686
|
2016-06-20 21:15:05 +03:00 |
Roman Volosovskyi
|
02f264251f
|
fix input
Former-commit-id: d298a142f7
|
2016-06-20 20:31:14 +03:00 |
virvar
|
c2ee61c1db
|
Contact view refactoring
Former-commit-id: 93de4680de
|
2016-06-20 16:37:26 +03:00 |
virvar
|
e43ae9f3f5
|
Contact list toolbar color
Former-commit-id: dc1c322106
|
2016-06-20 13:20:37 +03:00 |
virvar
|
c20e7a2424
|
Fix contacts sorting
Former-commit-id: c6205fdd65
|
2016-06-20 12:50:20 +03:00 |
virvar
|
3f2c598b2b
|
Add shadows
Former-commit-id: 383602200e
|
2016-06-20 12:21:57 +03:00 |
Roman Volosovskyi
|
991d909b97
|
another attempt
Former-commit-id: 5e7df10c76
|
2016-06-20 01:20:48 +03:00 |
virvar
|
dc2895f2be
|
Contacts tab view. Contacts group view.
Former-commit-id: e223fcbf9e
|
2016-06-17 18:38:47 +03:00 |
virvar
|
447e7839fe
|
Keep the keyboard open after message sending
Former-commit-id: b216d7624a
|
2016-06-17 15:59:48 +03:00 |
virvar
|
8bb880429a
|
Improve tabs bar animation
Former-commit-id: 8622859c3a
|
2016-06-17 15:45:02 +03:00 |
virvar
|
b9e3e213a1
|
Grey action bar. Hide navbar on chat list scroll.
Former-commit-id: 9ed4cc03e3
|
2016-06-17 15:45:01 +03:00 |
virvar
|
f737416893
|
Move drawer to tabs view
Former-commit-id: 86117b3de2
|
2016-06-17 15:30:11 +03:00 |
virvar
|
4cdc81bc90
|
Contacts' letters
Former-commit-id: 9855d35d37
|
2016-06-17 14:41:56 +03:00 |
virvar
|
bb79c16e37
|
Default user icon in contacts view
Former-commit-id: 5c3009ca03
|
2016-06-17 13:13:27 +03:00 |
virvar
|
c2f81f99c0
|
Uncomment randomBytes
Former-commit-id: 9d0cd3359c
|
2016-06-17 10:03:14 +03:00 |
Roman Volosovskyi
|
83a19a8817
|
suggestions from jail
Former-commit-id: 77a53cf040
|
2016-06-15 11:47:45 +03:00 |
Roman Volosovskyi
|
f1005daeed
|
Merge branch 'develop' into feature/#123
First attempt.
Conflicts:
.re-natal
android/app/build.gradle
android/settings.gradle
src/status_im/chat/handlers.cljs
src/status_im/chat/views/command.cljs
src/status_im/chat/views/content_suggestions.cljs
src/status_im/chat/views/message.cljs
src/status_im/chat/views/plain_input.cljs
Former-commit-id: 474729f230
|
2016-06-15 10:47:38 +03:00 |
Roman Volosovskyi
|
9aa89420c6
|
check empty :preview
Former-commit-id: 3e60fd36a0
|
2016-06-14 18:33:06 +03:00 |
Roman Volosovskyi
|
5d7005c64f
|
store preview
Former-commit-id: dfcf7cd47e
|
2016-06-14 18:09:24 +03:00 |
Roman Volosovskyi
|
8f37885e18
|
staged command preview
Former-commit-id: 02f37e6c97
|
2016-06-14 17:36:39 +03:00 |
Roman Volosovskyi
|
b9973cee6d
|
cleanup
Former-commit-id: 62e68fc3da
|
2016-06-14 15:56:03 +03:00 |
Roman Volosovskyi
|
4301c813f4
|
parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops)
Former-commit-id: ab93b21a4c
|
2016-06-14 14:19:56 +03:00 |
virvar
|
478976f01d
|
Merge remote-tracking branch 'origin/develop' into message-animation
# Conflicts:
# src/status_im/components/styles.cljs
Former-commit-id: bf4f8521ec
|
2016-06-13 20:04:39 +03:00 |
virvar
|
5f8f390bd1
|
Merge remote-tracking branch 'origin/develop' into response-design
# Conflicts:
# src/status_im/db.cljs
Former-commit-id: 86dc0ad06e
|
2016-06-13 19:54:39 +03:00 |
Adrian Tiberius
|
7d67ab6525
|
added login and users screens
Former-commit-id: 0a5ce64fe2
|
2016-06-13 19:35:18 +03:00 |
Roman Volosovskyi
|
f6da400ec8
|
jail component
Former-commit-id: 3aef0f2d9c
|
2016-06-10 17:04:12 +03:00 |
Roman Volosovskyi
|
836ebc2a30
|
resopnse icon in message
Former-commit-id: 13a40fae93
|
2016-06-10 16:08:21 +03:00 |
Roman Volosovskyi
|
195482f431
|
commands/responses from loaded commands.js in chat
Former-commit-id: 0319f9334c
|
2016-06-10 15:17:46 +03:00 |
virvar
|
9ec0d03d90
|
Animation refactoring
Former-commit-id: 4413d8dc3b
|
2016-06-10 12:09:19 +03:00 |
Adrian Tiberius
|
23a17b2632
|
merged develop
Former-commit-id: 7f207a3760
|
2016-06-10 03:21:48 +03:00 |
Adrian Tiberius
|
c00bc75346
|
updated new contact screen; some code cleaning
Former-commit-id: e0ce4217bb
|
2016-06-10 03:03:40 +03:00 |
Roman Volosovskyi
|
5689bf787e
|
console commands/responses
Former-commit-id: 61b6599bd3
|
2016-06-09 19:34:09 +03:00 |
virvar
|
997cc2f635
|
Little refactoring
Former-commit-id: b2cd5fe1cc
|
2016-06-09 16:49:32 +03:00 |
Roman Volosovskyi
|
75649d46aa
|
tests
Former-commit-id: 8474729695
|
2016-06-09 16:06:39 +03:00 |
virvar
|
b92a4da70b
|
Tabs animation
Former-commit-id: 16d8060c28
|
2016-06-09 15:55:43 +03:00 |
Roman Volosovskyi
|
6a9d1af886
|
store commands.js
Former-commit-id: 72768fc7dd
|
2016-06-09 14:41:25 +03:00 |
Roman Volosovskyi
|
2920984b0c
|
react-native-status dependency and other
Former-commit-id: 76e2887b17
|
2016-06-09 12:49:02 +03:00 |
virvar
|
ed7338be35
|
New message animation
Former-commit-id: ff5e4c66c3
|
2016-06-08 15:46:12 +03:00 |
Roman Volosovskyi
|
34f1e2fa17
|
fetch commands.js init
Former-commit-id: 0f4581476d
|
2016-06-08 15:14:35 +03:00 |
virvar
|
f57711aec1
|
Message appear animation
Former-commit-id: 446e6ade50
|
2016-06-08 14:39:37 +03:00 |
virvar
|
b8f3f2899c
|
Request message icon animation
Former-commit-id: 23f3004bc5
|
2016-06-07 15:07:59 +03:00 |
virvar
|
185bee8a9c
|
Show response input on icon click instead of message click
Former-commit-id: c68d43dcae
|
2016-06-07 11:43:39 +03:00 |
virvar
|
f2b1a1ae7a
|
Fix request message style
Former-commit-id: b13cb24116
|
2016-06-07 11:23:47 +03:00 |
virvar
|
bbd0e2cfae
|
Fix message input view
Former-commit-id: 0ef09b57e8
|
2016-06-06 18:59:52 +03:00 |
virvar
|
7aa209d9f3
|
Message input refactoring
Former-commit-id: 89051ce50b
|
2016-06-06 18:47:11 +03:00 |
virvar
|
d65584bd3b
|
Fix keyboard hiding. Focus on input when response view is shown.
Former-commit-id: df8c7f2fe7
|
2016-06-06 17:33:04 +03:00 |
virvar
|
f4a1d332f2
|
Fix response suggestions:
Fix scrolling messages when response view is shown.
Empty suggestions can't be fully opened.
Fix UI delays after animation.
Code improvements.
Former-commit-id: a7e694cb46
|
2016-06-06 15:05:35 +03: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 |
virvar
|
543d89ece3
|
Move PanResponder to view
Former-commit-id: 161be555b5
|
2016-06-06 09:12:55 +03:00 |
virvar
|
b0ecd68a97
|
Move animation to views
Former-commit-id: c229902a77
|
2016-06-03 22:34:24 +03:00 |
virvar
|
2423dfad15
|
Merge remote-tracking branch 'origin/develop' into response-design
# Conflicts:
# src/status_im/chat/screen.cljs
# src/status_im/chat/views/command.cljs
# src/status_im/chat/views/plain_input.cljs
# src/status_im/group_settings/screen.cljs
# src/status_im/models/commands.cljs
# src/status_im/new_group/screen.cljs
Former-commit-id: 217f0f93d8
|
2016-06-03 16:19:59 +03:00 |
Adrian Tiberius
|
a424ba1447
|
qr-scanner screen title, code cleaning, style fixes
Former-commit-id: fbd66a840f
|
2016-06-03 15:47:52 +03:00 |
virvar
|
b484edf36c
|
Replace animation listeners to callbacks. Handle height < 0.
Former-commit-id: 72bdf34348
|
2016-06-03 14:46:32 +03:00 |
virvar
|
169b2c51eb
|
Rename request-view to response-view
Former-commit-id: 06dd295ef5
|
2016-06-03 14:09:34 +03:00 |
virvar
|
27c6d6a70a
|
Move response animation to separate handler
Former-commit-id: 408d9c8b3f
|
2016-06-03 13:54:17 +03:00 |
virvar
|
cbda298af1
|
Response suggestion resize on type
Former-commit-id: 2d62d21b89
|
2016-06-03 11:16:38 +03:00 |
Roman Volosovskyi
|
13d689bb4a
|
println
Former-commit-id: 72b9afce99
|
2016-06-02 17:40:58 +03:00 |
Roman Volosovskyi
|
1d3a91c0ee
|
updated qr flow
Former-commit-id: db46a3a3cb
|
2016-06-02 17:39:26 +03:00 |
virvar
|
c8eb62bb94
|
Messages animation
Former-commit-id: 7f7ab514ca
|
2016-06-02 16:23:50 +03:00 |
Roman Volosovskyi
|
18e6b80e18
|
fix typo
Former-commit-id: 485718d871
|
2016-06-02 15:57:33 +03:00 |
virvar
|
60ee2d132c
|
Response suggestions dragging (minimize/maximize)
Former-commit-id: cad5cbaf10
|
2016-06-02 15:53:13 +03:00 |
Roman Volosovskyi
|
ea06b2da58
|
fix label function
Former-commit-id: 11edd55b5a
|
2016-06-02 15:48:57 +03:00 |
Roman Volosovskyi
|
2b4f410fd7
|
fix contacts loading
Former-commit-id: 9ae6e752d8
|
2016-06-02 14:23:28 +03:00 |
Adrian Tiberius
|
a156c8f865
|
make qr-scanner callable multiple times from different screens
Former-commit-id: 6eeefb2efb
|
2016-06-02 13:43:26 +03: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 |
virvar
|
51287cd47a
|
Start response suggestions dragging
Former-commit-id: 547c73d130
|
2016-06-01 16:36:43 +03:00 |
Adrian Tiberius
|
4d5c5755c6
|
fix translation pluralization
Former-commit-id: a46f60c854
|
2016-06-01 14:44:04 +03:00 |
Adrian Tiberius
|
8250e8d225
|
fix translation pluralization
Former-commit-id: 13c506491f
|
2016-06-01 14:35:22 +03:00 |
Roman Volosovskyi
|
7fbbf8b4aa
|
remove println
Former-commit-id: 2bfd90cec4
|
2016-06-01 14:09:43 +03:00 |
virvar
|
1b67a37877
|
Input text and buttons animation
Former-commit-id: 572fc0e554
|
2016-06-01 14:09:25 +03:00 |
Adrian Tiberius
|
4870fef74b
|
fix qr code decoding and remove extra data
Former-commit-id: 755e9bf2b3
|
2016-06-01 14:01:58 +03:00 |
Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b7
|
2016-06-01 11:41:50 +03:00 |
virvar
|
516ad56a4e
|
Animation refactoring
Former-commit-id: 5c83b09db6
|
2016-05-31 17:05:31 +03:00 |
virvar
|
cf897d235a
|
Fix drag icon
Former-commit-id: 96ef6c34a8
|
2016-05-31 14:39:38 +03:00 |
virvar
|
81055c30bd
|
Spring animation
Former-commit-id: 8892d13db4
|
2016-05-31 14:23:30 +03:00 |
virvar
|
0543b943f7
|
Response suggestions animation
Former-commit-id: b9fcad3df5
|
2016-05-30 16:50:23 +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
|
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 |
virvar
|
9b114aa371
|
Response suggestions
Former-commit-id: a495fa7961
|
2016-05-27 16:27:17 +03:00 |
virvar
|
16f7f791ac
|
Request-info view
Former-commit-id: 5333eadd67
|
2016-05-26 16:54:18 +03:00 |
Roman Volosovskyi
|
6823acd171
|
:accessibility-label
Former-commit-id: 63dd0d4a4a
|
2016-05-26 16:46:14 +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 |
virvar
|
169d7ee51c
|
Don't dismiss keyboard on command input appear
Former-commit-id: 49b08e5118
|
2016-05-25 14:50:52 +03:00 |
virvar
|
a6b9ec3b9e
|
Chat name validation
Former-commit-id: 4d70e318b3
|
2016-05-25 12:44:00 +03:00 |
Roman Volosovskyi
|
ded52dca90
|
uncomment name view
Former-commit-id: 6ff7c71e35
|
2016-05-25 11:37:49 +03:00 |
virvar
|
a035991b3f
|
Merge remote-tracking branch 'origin/develop' into fix-input
Former-commit-id: ea09dcb1a6
|
2016-05-25 10:44:14 +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 |
virvar
|
950251a281
|
Single input
Former-commit-id: 583f424e93
|
2016-05-24 16:36:27 +03:00 |
virvar
|
02e9365bdf
|
Start single input
Former-commit-id: 5a901e3b9a
|
2016-05-24 16:36:27 +03:00 |
virvar
|
870d8d4026
|
Fix suggestions tapping issue. Fix command input position.
Former-commit-id: 00145a8c6f
|
2016-05-24 16:36:27 +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 |
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 |
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 |
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 |
Adrian Tiberius
|
c7a9f13733
|
merged develop
Former-commit-id: 4a35a06b8c
|
2016-05-20 22:12:08 +03:00 |
virvar
|
585baa9d71
|
Truncate chat name
Former-commit-id: c3496957ff
|
2016-05-20 16:36:00 +03:00 |
virvar
|
615cc4d73a
|
Chat members names menu item
Former-commit-id: 34f5ab31a1
|
2016-05-20 16:18:12 +03:00 |
virvar
|
be0d7e2614
|
Add TODO comments
Former-commit-id: 3af6d2f369
|
2016-05-20 15:37:24 +03:00 |
virvar
|
19c11ec370
|
Fix group members count
Former-commit-id: df2d2b02ca
|
2016-05-20 14:38:20 +03:00 |
virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a1
|
2016-05-20 14:20:48 +03:00 |
Jarrad
|
5aa61b1de4
|
Syng to Status
Former-commit-id: 134c040c3e
|
2016-05-19 18:32:38 +02:00 |
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247c
|
2016-05-19 18:31:56 +02:00 |