Commit Graph

34 Commits

Author SHA1 Message Date
Roman Volosovskyi 5abe38445e Merge branch 'develop' into feature/#123
Conflicts:
	android/app/build.gradle
	android/settings.gradle
	package.json
	src/status_im/chat/handlers.cljs
	src/status_im/chat/subs.cljs


Former-commit-id: dd3eb3c0eb
2016-06-23 12:02:39 +03:00
Roman Volosovskyi 9357849916 Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd
2016-06-22 10:53:27 +03:00
Roman Volosovskyi 63034358b2 Merge branch 'develop' into chat-animation
Conflicts:
	.re-natal
	src/status_im/android/core.cljs
	src/status_im/chat/views/message_input.cljs
	src/status_im/chat/views/plain_message.cljs
	src/status_im/db.cljs


Former-commit-id: 8e2c207b2e
2016-06-21 19:17:30 +03:00
Adrian Tiberius 9ecad449fe added identicons for default profile pictures
Former-commit-id: eab8dd5ca2
2016-06-21 15:23:19 +03:00
Roman Volosovskyi 6545e27465 orientation module
Former-commit-id: 84e9ea897f
2016-06-21 13:04:08 +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: 474729f230
2016-06-15 10:47:38 +03:00
Adrian Tiberius 23a17b2632 merged develop
Former-commit-id: 7f207a3760
2016-06-10 03:21:48 +03:00
Roman Volosovskyi 2920984b0c react-native-status dependency and other
Former-commit-id: 76e2887b17
2016-06-09 12:49:02 +03:00
Jarrad 4b43096ba8 System.loadLibrary voodoo magic
Former-commit-id: 97ff59f95b
2016-06-08 15:29:48 +02:00
Jarrad ed65ba0ba7 update run-osx for unit tests and iTerm new release
Former-commit-id: 058f470ea7
2016-06-02 11:51:44 +02:00
Adrian Tiberius d094cd286c implemented #119 and #120
Former-commit-id: c81276e3b7
2016-06-01 11:41:50 +03:00
Jarrad ee2087ce77 run appium with second param
Former-commit-id: a2e14e4ff0
2016-05-26 18:05:10 +02: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 c7a9f13733 merged develop
Former-commit-id: 4a35a06b8c
2016-05-20 22:12:08 +03:00
virvar 844ff739af Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a1
2016-05-20 14:20:48 +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 5aa61b1de4 Syng to Status
Former-commit-id: 134c040c3e
2016-05-19 18:32:38 +02:00
virvar d1ef5e7e32 Setup sms-listener
Former-commit-id: 1f5dad71e8
2016-05-18 17:40:26 +03:00
Jarrad Hope 25a7f8bb32 upgrade react-native and packages - but broken
Former-commit-id: bfaf45698c
2016-04-24 15:07:08 +07:00
Jarrad Hope b522302ee8 fix android-geth dependency
Former-commit-id: 0bd8ff367f
2016-04-22 23:03:56 +07:00
virvar 353dd02ce8 Dismiss keyboard on send
Former-commit-id: 9f1c71c451
2016-04-19 11:07:07 +03:00
michaelr d54d6555a4 moved re-frame app to root folder
Former-commit-id: 5a3b923b0c
2016-04-04 19:21:10 +03:00
michaelr 06c885c757 revert .re-natal to localhost
Former-commit-id: d296a2d54f
2016-03-23 12:47:30 +02:00
michaelr 95817924d6 changed navigation method, send new message
Former-commit-id: 77cae2cc42
2016-03-23 12:46:41 +02:00
virvar 4a49dac6cd Use phone's locale for phone number internationalization
Former-commit-id: b21b4ecc1a
2016-03-21 13:53:21 +03:00
virvar f3184fda11 Update .re-natal
Former-commit-id: 785ddcc245
2016-03-18 15:28:49 +03:00
virvar 3811efeb5e Save whisper identities to db
Former-commit-id: 1a7d089ddc
2016-03-11 19:04:12 +03:00
virvar 577cf4e93c Setup cljsjs/web dependency
Former-commit-id: 8d7a57e6d4
2016-03-07 20:00:30 +03:00
Jarrad Hope 5db6709dd0 upgrade renatal, react-native, web3
Former-commit-id: 4c31f1225a
2016-03-06 23:09:55 +01:00
virvar fe21a4f25f Add web3
Former-commit-id: 22310a3ee8
2016-03-04 20:28:06 +03:00
virvar 76fcd5c3f7 User phone number input view
Former-commit-id: 68ae5ce5a9
2016-03-04 00:20:37 +03:00
virvar 5cd48e241a Messages scroll direction
Former-commit-id: 995738ba19
2016-02-26 12:22:25 +03:00
virvar 7c6e7c644a Initial 2016-02-23 01:04:42 +03:00