alwxndr
|
75d6313511
|
react-native upgrade, re-natal upgrade, dependencies updates and fixes to make ios builds work
Former-commit-id: ba1365fa0a588792c0a9bf9df8530f18968c2b4f
|
2016-07-27 18:21:19 +03:00 |
|
Adrian Tiberius
|
32239beb54
|
fix tab bottom gradient
Former-commit-id: 1d460333a1e24ee4acd92def5714bc97d8f44441
|
2016-07-26 11:06:55 +03:00 |
|
Roman Volosovskyi
|
6af6d5cedd
|
unviewed messages counter
Former-commit-id: 2e790fb00603fe6beda5c73f75afa431ed996e5a
|
2016-07-06 20:17:52 +03:00 |
|
Roman Volosovskyi
|
db48cc6072
|
fix huge view overlaying everything for the action button
Former-commit-id: faf9c786dfa183750a382e162e24301bbb6907ee
|
2016-07-06 17:52:44 +03:00 |
|
Roman Volosovskyi
|
e464079a84
|
Merge branch 'develop' into fix/single-drawer
Former-commit-id: e3e4de6f1203c0d9a4188a766a3cbd38de50df1c
|
2016-06-22 10:48:45 +03:00 |
|
Roman Volosovskyi
|
f24e493ac4
|
Merge branch 'develop' into feature/#138
Former-commit-id: 4be203bcd38674ee56d6b8a824c4ad61d263d14d
|
2016-06-21 18:54:52 +03:00 |
|
virvar
|
c2ee61c1db
|
Contact view refactoring
Former-commit-id: 93de4680de470003df22d6894f7bd5107d625608
|
2016-06-20 16:37:26 +03:00 |
|
virvar
|
8bb880429a
|
Improve tabs bar animation
Former-commit-id: 8622859c3a1fc256c63b437c10ba2e6ce0d93824
|
2016-06-17 15:45:02 +03:00 |
|
virvar
|
b9e3e213a1
|
Grey action bar. Hide navbar on chat list scroll.
Former-commit-id: 9ed4cc03e3e6852f47688fcd9bac39df2d12274d
|
2016-06-17 15:45:01 +03:00 |
|
virvar
|
f737416893
|
Move drawer to tabs view
Former-commit-id: 86117b3de21857910eb550c430b1cf9aa037c2a5
|
2016-06-17 15:30:11 +03:00 |
|
virvar
|
5f8f390bd1
|
Merge remote-tracking branch 'origin/develop' into response-design
# Conflicts:
# src/status_im/db.cljs
Former-commit-id: 86dc0ad06ebcfeb618b529c49b3432b52b106219
|
2016-06-13 19:54:39 +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: 217f0f93d8198087accf93bd51b119152ac7e68a
|
2016-06-03 16:19:59 +03:00 |
|
Roman Volosovskyi
|
0f6e15a8d0
|
fix ids for chats created after receiving from unknown id
Former-commit-id: b914493283e4b03415ba576533ff02f68c4ada81
|
2016-05-30 11:49:16 +03:00 |
|
Jarrad
|
9888eaab18
|
Merge pull request #109 from status-im/feature/i18n
added i18n translations
Former-commit-id: b6b1bf494b2e0b00be1f44b2f001e1686a82e614
|
2016-05-25 18:09:37 +02:00 |
|
Adrian Tiberius
|
67e784598a
|
changed translation style
Former-commit-id: 182600b2d7089b36f9b7451ba49a74ac80dab515
|
2016-05-25 18:57:06 +03:00 |
|
virvar
|
a6b9ec3b9e
|
Chat name validation
Former-commit-id: 4d70e318b398d086d206e94c6b2258a51e354c74
|
2016-05-25 12:44:00 +03:00 |
|
Roman Volosovskyi
|
ded52dca90
|
uncomment name view
Former-commit-id: 6ff7c71e35be89d4314106c37cd3792b882d4d09
|
2016-05-25 11:37:49 +03:00 |
|
Adrian Tiberius
|
7d47ab2d62
|
added i18n translations
Former-commit-id: b15c156a40957c27f0c4feea3ea7ceedf0407090
|
2016-05-25 04:27:03 +03:00 |
|
Roman Volosovskyi
|
88aa653d79
|
fix content-content issue
Former-commit-id: aa751fc59c8bb0742c2a5845da7db6547bf9da91
|
2016-05-24 17:21:12 +03:00 |
|
Adrian Tiberius
|
6ab889152c
|
merge develop
Former-commit-id: 98f22d9a13d55ae1baf7c655107a09e279024d80
|
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: dcc607022f4e62e4c544495220c3130c5c30b026
|
2016-05-24 11:08:54 +03:00 |
|
Adrian Tiberius
|
9064021247
|
merge develop
Former-commit-id: 979ce25f2aa19ac957d863d800f42591d2ca38cf
|
2016-05-23 19:53:07 +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 |
|
Adrian Tiberius
|
56c1248a6d
|
fixes #88
Former-commit-id: b1bc93b782b0750be75ffdc7728736f4e0a87252
|
2016-05-23 15:13:52 +03:00 |
|
virvar
|
5142ffc4c3
|
Fix new chat icon
Former-commit-id: fc5bb416af26496701f4132ef055d463b63ee9d6
|
2016-05-23 13:50:46 +03:00 |
|
Adrian Tiberius
|
2e49994c86
|
small code clean
Former-commit-id: 45c35733be4f1c4c09d7d563f84d62020729287a
|
2016-05-23 13:13:06 +03:00 |
|
Adrian Tiberius
|
563e0d69c7
|
fix last element scroll
Former-commit-id: ff0307d4ce1c9e2b03640ec08f6623ba18e79e66
|
2016-05-22 23:36:43 +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: 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 |
|
virvar
|
585baa9d71
|
Truncate chat name
Former-commit-id: c3496957ff93f07bcfaf16d3cf78c866b4c7fe05
|
2016-05-20 16:36:00 +03:00 |
|
virvar
|
be0d7e2614
|
Add TODO comments
Former-commit-id: 3af6d2f369a105713847b7fa4cb7763dde1d847d
|
2016-05-20 15:37:24 +03:00 |
|
virvar
|
19c11ec370
|
Fix group members count
Former-commit-id: df2d2b02caeeda4c15988abd1b094d94f8f468b0
|
2016-05-20 14:38:20 +03:00 |
|
virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a12f3702bf303bd20b42340ef61c6e68
|
2016-05-20 14:20:48 +03:00 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13
|
2016-05-19 18:31:56 +02:00 |
|