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 |
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 |
|
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 |
|
Roman Volosovskyi
|
c086162f68
|
leave group/ clear history/ add-remove participants
Former-commit-id: 01d1ccdab8
|
2016-05-21 15:23:24 +03:00 |
|
Adrian Tiberius
|
c7a9f13733
|
merged develop
Former-commit-id: 4a35a06b8c
|
2016-05-20 22:12:08 +03:00 |
|
Roman Volosovskyi
|
97b4ba8653
|
add/remove participants
Former-commit-id: cd45d3420e
|
2016-05-20 19:58:07 +03:00 |
|
Roman Volosovskyi
|
227f22eb48
|
chat name/load messages on [:navigate-to :chat id]/ other
Former-commit-id: ae1918a2ae
|
2016-05-20 19:12:04 +03:00 |
|
Jarrad
|
51c800c798
|
Merge pull request #84 from status-im/icon
an icon why not?
Former-commit-id: c22afec74a
|
2016-05-20 15:47:01 +02:00 |
 Jarrad
|
5e25330d58
|
an icon why not?
Former-commit-id: 4732498ba2
|
2016-05-20 15:45:35 +02: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 |
|
virvar
|
98d0afd034
|
Last message date
Former-commit-id: a782cf0726
|
2016-05-20 12:41:55 +03:00 |
Roman Volosovskyi
|
943090f49a
|
Merge pull request #80 from status-im/syng-rename
Syng rename to Status
Former-commit-id: 368b9aef2b
|
2016-05-20 12:15:15 +03:00 |
|
Jarrad
|
2609cbfeea
|
fix ios build
Former-commit-id: ae77cdd738
|
2016-05-20 11:04:20 +02:00 |
|
Jarrad
|
ce948b2359
|
lein voom freshen
Former-commit-id: 5bea3815cd
|
2016-05-20 10:33:09 +02:00 |
|
virvar
|
eab6dd79c8
|
Handle empty photo path
Former-commit-id: 62fb91fba6
|
2016-05-20 10:55:17 +03:00 |
|
virvar
|
06534cfd5d
|
Profile icon
Former-commit-id: d9a44d9c0b
|
2016-05-20 10:22:14 +03:00 |
|
Adrian Tiberius
|
6e53d72acb
|
add gradient
Former-commit-id: 799808965d
|
2016-05-19 20:05:04 +03:00 |
|
Jarrad
|
4ec46defd3
|
...
Former-commit-id: 858f4d77c1
|
2016-05-19 18:54:39 +02:00 |
|
Jarrad
|
d1a8534f5a
|
change lib branch
Former-commit-id: 6c63d8a428
|
2016-05-19 18:51:13 +02:00 |
Jarrad
|
83dcdf85c7
|
whoops
Former-commit-id: 225e6bbaa8
|
2016-05-19 18:34:52 +02: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 |