Commit Graph

2910 Commits

Author SHA1 Message Date
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