Adrian Tiberius
|
97b5014307
|
merge develop
Former-commit-id: 4fca2507da80bb91decb20d92acc4de7baa58b36
|
2016-06-30 19:12:07 +03:00 |
|
Adrian Tiberius
|
b8a0269357
|
fix signup process
Former-commit-id: 763aac2141bd13dd108563f353d0e2f4310c740f
|
2016-06-30 19:05:28 +03:00 |
|
Adrian Tiberius
|
ea7c5b1665
|
created new accounts realm object and fixed new create account flow
Former-commit-id: c878fba6f13f458d4918ea02cab19e03f9d0b3fe
|
2016-06-30 18:06:05 +03:00 |
|
Roman Volosovskyi
|
b746bcef4f
|
attempt to fix performance issues
Former-commit-id: 3a93e0890bfea4b167b934c26f2c5096ea73421a
|
2016-06-30 17:23:38 +03:00 |
|
Roman Volosovskyi
|
5e94fb9b7b
|
first parameter
Former-commit-id: 013e4e79ae3c7336c5b6a4d502cd7aa25e1bc1c5
|
2016-06-27 18:38:44 +03:00 |
|
Roman Volosovskyi
|
a987ffee7c
|
missed conflict
Former-commit-id: 8d13f5dc3686e7b98548593ae1b0d2089bf74f8b
|
2016-06-27 16:44:54 +03:00 |
|
Roman Volosovskyi
|
4da9f24d55
|
Merge branch 'develop' into feature/#123
Former-commit-id: 65c76e3cb1390e63e7944a67c97234b32bbc8538
|
2016-06-27 16:02:42 +03:00 |
|
Roman Volosovskyi
|
ca2e5681db
|
load messages on scroll
Former-commit-id: ff1291dac0598a61ed82e3d9fb3d6299dab82b83
|
2016-06-27 15:57:40 +03:00 |
|
Roman Volosovskyi
|
9357849916
|
Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd72f0393c4c7541bba5c77ea3884fa3
|
2016-06-22 10:53:27 +03:00 |
|
Adrian Tiberius
|
0f0cd22cb2
|
cleanup
Former-commit-id: 5a409ed6bf803c75c128ab74ad78fdcb84113bab
|
2016-06-21 16:05:46 +03:00 |
|
Adrian Tiberius
|
9ecad449fe
|
added identicons for default profile pictures
Former-commit-id: eab8dd5ca21b851da7fa508b978a0fb1ffa79647
|
2016-06-21 15:23:19 +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: 474729f230346fc10d7d14474282f7f6458f0998
|
2016-06-15 10:47:38 +03:00 |
|
Roman Volosovskyi
|
9aa89420c6
|
check empty :preview
Former-commit-id: 3e60fd36a0f394cb218148cf4cb981e20763cf02
|
2016-06-14 18:33:06 +03:00 |
|
Roman Volosovskyi
|
5d7005c64f
|
store preview
Former-commit-id: dfcf7cd47e63a0eaad02df0bc05ff561bafa0f72
|
2016-06-14 18:09:24 +03:00 |
|
Roman Volosovskyi
|
4301c813f4
|
parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops)
Former-commit-id: ab93b21a4c2d0ed573f1d588c537baec9e068e0a
|
2016-06-14 14:19:56 +03:00 |
|
Roman Volosovskyi
|
195482f431
|
commands/responses from loaded commands.js in chat
Former-commit-id: 0319f9334c4de4dfef4e147ca4f7cbcb0b6b61c6
|
2016-06-10 15:17:46 +03:00 |
|
Roman Volosovskyi
|
5689bf787e
|
console commands/responses
Former-commit-id: 61b6599bd37d8a2d9e6214993ca4ff2fb5e3a8bc
|
2016-06-09 19:34:09 +03:00 |
|
Roman Volosovskyi
|
34f1e2fa17
|
fetch commands.js init
Former-commit-id: 0f4581476d52eaf91a4dacd1d248b73c7d141c8b
|
2016-06-08 15:14:35 +03:00 |
|
virvar
|
f57711aec1
|
Message appear animation
Former-commit-id: 446e6ade503771a15d4ba71dd015081964312763
|
2016-06-08 14:39:37 +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 |
|
virvar
|
0543b943f7
|
Response suggestions animation
Former-commit-id: b9fcad3df576bfea8592d0cbfa0419005c412266
|
2016-05-30 16:50:23 +03:00 |
|
Adrian Tiberius
|
67e784598a
|
changed translation style
Former-commit-id: 182600b2d7089b36f9b7451ba49a74ac80dab515
|
2016-05-25 18:57:06 +03:00 |
|
Adrian Tiberius
|
c64b157666
|
removed unneeded translations
Former-commit-id: 930d201764c042aced8178499102dc937ad5b249
|
2016-05-25 14:59:19 +03:00 |
|
Adrian Tiberius
|
7d47ab2d62
|
added i18n translations
Former-commit-id: b15c156a40957c27f0c4feea3ea7ceedf0407090
|
2016-05-25 04:27:03 +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 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13
|
2016-05-19 18:31:56 +02:00 |
|