status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
357 Commits 607 Branches 76 Tags 784 MiB
Commit Graph

357 Commits

Author SHA1 Message Date
Jarrad e9af469ebb Merge pull request #75 from status-im/feature/tabs 
Feature/tabs
 2016-05-23 12:25:01 +02:00
Adrian Tiberius 45c35733be small code clean 2016-05-23 13:13:06 +03:00
Adrian Tiberius ff0307d4ce fix last element scroll 2016-05-22 23:36:43 +03:00
Roman Volosovskyi 547ececac3 fix typo in ns 2016-05-22 18:17:22 +03:00
Roman Volosovskyi ebe61c9d95 rename main-tabs.cljs 2016-05-22 10:22:22 +03:00
Adrian Tiberius 4a35a06b8c merged develop 2016-05-20 22:12:08 +03:00
Jarrad c22afec74a Merge pull request #84 from status-im/icon 
an icon why not?
 2016-05-20 15:47:01 +02:00
Jarrad 4732498ba2 an icon why not? 2016-05-20 15:45:35 +02:00
Roman Volosovskyi 368b9aef2b Merge pull request #80 from status-im/syng-rename 
Syng rename to Status
 2016-05-20 12:15:15 +03:00
Jarrad ae77cdd738 fix ios build 2016-05-20 11:04:20 +02:00
Jarrad 5bea3815cd lein voom freshen 2016-05-20 10:33:09 +02:00
Adrian Tiberius 799808965d add gradient 2016-05-19 20:05:04 +03:00
Jarrad 858f4d77c1 ... 2016-05-19 18:54:39 +02:00
Jarrad 6c63d8a428 change lib branch 2016-05-19 18:51:13 +02:00
Jarrad 225e6bbaa8 whoops 2016-05-19 18:34:52 +02:00
Jarrad 134c040c3e Syng to Status 2016-05-19 18:32:38 +02:00
Jarrad 6a5250247c syng to status 2016-05-19 18:31:56 +02:00
Jarrad 416c9395c1 Merge pull request #78 from status-im/group-chat 
Group chat refactoring
 2016-05-19 17:44:05 +02:00
Adrian Tiberius 0556e299d6 fix padding 2016-05-19 18:41:25 +03:00
Roman Volosovskyi 9f5c3df150 revert run-osx.sh 2016-05-19 18:09:32 +03:00
Roman Volosovskyi a5f153bb66 add group chat/ messages in group chat 2016-05-19 18:03:15 +03:00
Jarrad 9a76ea9855 Merge pull request #72 from status-im/group-chat-settings 
Group chat settings
 2016-05-19 13:10:10 +02:00
Adrian Tiberius 74e5c4128d change icon names to keywords 2016-05-18 21:42:40 +03:00
Adrian Tiberius ea63b1df68 fix discovery tag title 2016-05-17 17:09:19 +03:00
Adrian Tiberius dfc772d0cd use the new defview 2016-05-17 17:03:21 +03:00
virvar 981912cd2c Merge branch 'develop' of https://github.com/syng-im/syng-react into group-chat-settings 2016-05-17 16:58:02 +03:00
virvar 1512b6de9d Update with new structure 2016-05-17 16:57:45 +03:00
Roman Volosovskyi 6a084b0876 fix #43 2016-05-17 16:53:27 +03:00
Adrian Tiberius 3881da9156 merged develop 2016-05-17 16:02:55 +03:00
virvar e93e7724e2 Merge develop into group-chat-settings 2016-05-17 14:38:55 +03:00
virvar 9ad014a509 Rename group-settings to screen 2016-05-17 14:26:45 +03:00
Roman Volosovskyi 4752643ed7 more cleanup in handlers/subs 2016-05-17 13:32:20 +03:00
virvar 69b0dbdb8d Fix group chat 2016-05-17 13:26:20 +03:00
virvar 1059c47826 Group settings handler/sub 2016-05-16 19:38:35 +03:00
virvar 977b010a07 Merge develop to group-chat-settings 2016-05-16 19:24:17 +03:00
Jarrad 44074bd054 Merge pull request #68 from status-im/structure 
Structure
 2016-05-16 15:05:34 +02:00
Roman Volosovskyi c2b4a1ec33 fix giant 'type' 2016-05-16 16:04:07 +03:00
Roman Volosovskyi 5f0862e3b7 discoveries toolbar 2016-05-16 15:50:06 +03:00
Roman Volosovskyi 739ca7cb1b empty sections 2016-05-16 15:38:27 +03:00
virvar 1fe23fe57c 'Clear history', 'Leave chat' handlers 2016-05-16 15:36:52 +03:00
Roman Volosovskyi 1977d29b72 profiles/drawer structure 2016-05-16 14:38:07 +03:00
Roman Volosovskyi c833764e22 content-suggestions 2016-05-16 14:05:43 +03:00
virvar 14e69f9369 Chat color 2016-05-16 13:47:34 +03:00
Roman Volosovskyi ac4548f63b drawer 2016-05-16 13:40:43 +03:00
Roman Volosovskyi 473604d859 Merge branch 'develop' into structure 
Conflicts:
	src/syng_im/android/core.cljs
	src/syng_im/chat/screen.cljs
	src/syng_im/chat/styles/suggestions.cljs
	src/syng_im/chat/suggestions.cljs
	src/syng_im/chat/views/command.cljs
	src/syng_im/chat/views/phone.cljs
	src/syng_im/chat/views/suggestions.cljs
	src/syng_im/components/chat/input/money.cljs
	src/syng_im/components/chats/chats_list.cljs
	src/syng_im/components/contact_list/contact.cljs
	src/syng_im/components/contact_list/contact_list.cljs
	src/syng_im/components/discovery/discovery.cljs
	src/syng_im/components/toolbar.cljs
	src/syng_im/db.cljs
	src/syng_im/discovery/styles.cljs
	src/syng_im/handlers.cljs
	src/syng_im/models/chat.cljs
	src/syng_im/models/contacts.cljs
	src/syng_im/subs.cljs
 2016-05-16 12:31:08 +03:00
Roman Volosovskyi af0ed4c3a9 start chat with contact 2016-05-16 10:45:59 +03:00
Roman Volosovskyi 780b12049e defview suggestion 2016-05-14 12:39:01 +03:00
Roman Volosovskyi 85e05a451d replace to-datasource2 2016-05-13 19:03:14 +03:00
Roman Volosovskyi f484b190fd remove to-realm-datasource 2016-05-13 18:56:52 +03:00
virvar bf6c419c5d Chat name edit form. Fix styles. 2016-05-13 18:03:45 +03:00