Commit Graph

3231 Commits

Author SHA1 Message Date
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
Roman Volosovskyi 02fb65516b disable 'create button' until new chat will be opened
Former-commit-id: 6e52fca420
2016-05-19 19:29:17 +03:00
Jarrad 7e13cdc613 Merge pull request #78 from status-im/group-chat
Group chat refactoring 

Former-commit-id: 416c9395c1
2016-05-19 17:44:05 +02:00
Adrian Tiberius aba7d4fae0 fix padding
Former-commit-id: 0556e299d6
2016-05-19 18:41:25 +03:00
Roman Volosovskyi 2312cd7a14 revert run-osx.sh
Former-commit-id: 9f5c3df150
2016-05-19 18:09:32 +03:00
Roman Volosovskyi f613dbd2dc add group chat/ messages in group chat
Former-commit-id: a5f153bb66
2016-05-19 18:03:15 +03:00
virvar ee28404ef6 Chat icon component
Former-commit-id: 4ce65b37f9
2016-05-19 16:46:42 +03:00
Jarrad 9405eb1325 Merge pull request #72 from status-im/group-chat-settings
Group chat settings

Former-commit-id: 9a76ea9855
2016-05-19 13:10:10 +02:00
virvar c015d260e8 Real last message, chat icon
Former-commit-id: a5350f9b9b
2016-05-19 11:51:13 +03:00
Adrian Tiberius 97f1a4bafa change icon names to keywords
Former-commit-id: 74e5c4128d
2016-05-18 21:42:40 +03:00
virvar a1e47ce00f Listen and send confirmation code
Former-commit-id: 476d36f555
2016-05-18 18:40:01 +03:00
virvar d1ef5e7e32 Setup sms-listener
Former-commit-id: 1f5dad71e8
2016-05-18 17:40:26 +03:00
virvar 11c08f1e01 Send international phone number to server. Send confirmation code.
Former-commit-id: 9274ba0ebb
2016-05-18 16:45:03 +03:00
Adrian Tiberius 8d8170d9ab fix discovery tag title
Former-commit-id: ea63b1df68
2016-05-17 17:09:19 +03:00
Adrian Tiberius a03b1a0357 use the new defview
Former-commit-id: dfc772d0cd
2016-05-17 17:03:21 +03:00
virvar 389e5013dd Merge branch 'develop' of https://github.com/syng-im/syng-react into group-chat-settings
Former-commit-id: 981912cd2c
2016-05-17 16:58:02 +03:00
virvar 9f61a21a98 Update with new structure
Former-commit-id: 1512b6de9d
2016-05-17 16:57:45 +03:00
Roman Volosovskyi e327c013f8 fix #43
Former-commit-id: 6a084b0876
2016-05-17 16:53:27 +03:00