Commit Graph

266 Commits

Author SHA1 Message Date
Anton Domnikov 1fa0aba9db CR fixes 2017-09-20 16:26:00 +03:00
Anton Domnikov e3edb0a7a7 added network connection observable 2017-09-19 18:18:28 +03:00
Arseniy Borisov 46295137a8 format javadoc (#83) 2017-08-17 14:46:17 +03:00
Ilia Kurtov e1b58249b9 rxjava update (#82) 2017-08-15 21:02:36 +03:00
Ilia Kurtov 2a0e33c6e7 libs update (#81) 2017-08-14 17:41:04 +03:00
Ilia Kurtov be01ad5792 Merge branch 'kotlin_migration' into master-kotlin-rxjava2
# Conflicts:
#	build.gradle
2017-08-11 13:51:55 +03:00
Arseniy Borisov 861675674f fresco 1.5.0 2017-08-10 19:57:31 +03:00
Denis Karmyshakov 3aacc52b04 Support lib update (#78) 2017-08-03 18:22:25 +03:00
gorodeckii 22da8c58e8 Merge branch 'master' into master-rx-java-2
# Conflicts:
#	build.gradle
2017-08-01 19:21:42 +03:00
Gavriil 29aae2df52 Merge pull request #77 from TouchInstinct/fix/converter_fix
logan square enum converter - return default value for null
2017-08-01 19:17:30 +03:00
gorodeckii 688066b30b logan square enum converter - return default value for null 2017-08-01 19:16:58 +03:00
Elena Bobkova bc1ffc1b35 fixed support library version 2017-07-27 17:42:36 +03:00
Gavriil 4f3458935f Merge pull request #76 from TouchInstinct/support_library_version_fix
fixed support library version
2017-07-27 17:06:50 +03:00
Elena Bobkova fe29f25fdf fixed support library version 2017-07-27 16:20:46 +03:00
gorodeckii abaf35300b indents in comments to pass static 2017-07-26 18:13:16 +03:00
Arseniy Borisov dd08a07afc Merge pull request #75 from TouchInstinct/build_tools_update
Build tools update
2017-07-25 19:58:02 +03:00
Denis Karmyshakov ccd4b80011 Build tools update 2017-07-25 19:54:06 +03:00
Arseniy Borisov b5554a6761 Merge branch 'master-rx-java-2' into kotlin_migration 2017-07-24 17:01:40 +03:00
Denis Karmyshakov af8569d147 Merge pull request #74 from TouchInstinct/idea_formatting
idea formatting
2017-07-24 12:44:44 +03:00
Arseniy Borisov 4b0fd5945f idea formatting 2017-07-24 12:28:57 +03:00
Anton Domnikov 488d15a22b Merge branch 'master-rx-java-2' into kotlin_migration
# Conflicts:
#	build.gradle
2017-07-20 13:33:35 +03:00
Alexander Bubnov 2013a7ad56 Merge branch 'lib_upd' into master-rx-java-2 2017-07-17 14:46:12 +03:00
Alexander Bubnov 129bbf5b18 update libs 2017-07-17 14:15:33 +03:00
gorodeckii 3bf46be7e1 Merge branch 'master' into master-rx-java-2 2017-07-13 17:48:47 +03:00
Gavriil 2ce692bfb2 Merge pull request #71 from TouchInstinct/collections_validation
validation for collection responses
2017-07-13 17:21:32 +03:00
gorodeckii a0c2e758cb fix static 2017-07-13 17:19:01 +03:00
gorodeckii 06acc22f11 validation for collection responses 2017-07-13 17:01:26 +03:00
gorodeckii e0f57761e7 Merge branch 'master' into master-rx-java-2
# Conflicts:
#	src/main/java/ru/touchin/templates/chat/Chat.java
2017-07-13 16:33:03 +03:00
Gavriil e1dfde7b0c Merge pull request #70 from TouchInstinct/feature/enum_exception_description
description for unknown enum values
2017-07-13 15:51:38 +03:00
gorodeckii 796371648c description for unknown enum values 2017-07-13 15:50:44 +03:00
Gavriil dc68c8445a Merge pull request #69 from TouchInstinct/lib_version
socket.io new version
2017-07-12 13:11:43 +03:00
gorodeckii cde6c030f1 socket.io new version 2017-07-12 12:39:37 +03:00
Anton Domnikov a73fed8fee Merge branch 'master-rx-java-2' into kotlin_migration 2017-07-11 14:31:22 +03:00
Gavriil 1c17b565c7 Merge pull request #66 from TouchInstinct/changes_fix
Changes fix
2017-07-05 15:26:57 +03:00
Denis Karmyshakov 9051f8074e Changes fix 2017-07-05 15:25:09 +03:00
gorodeckii c79a77f52a Merge branch 'master' into master-rx-java-2 2017-07-05 15:04:31 +03:00
Gavriil f1bbb5ee6f Merge pull request #65 from TouchInstinct/enum_converter
enum converter with default value
2017-07-05 15:03:40 +03:00
gorodeckii c6fd3f738c implemented into existing class 2017-07-05 14:48:50 +03:00
gorodeckii 3b1e944bf4 enum converter with default value 2017-07-05 14:41:21 +03:00
Gavriil 435ab8617c Merge pull request #64 from TouchInstinct/master-rx-java-2-maybe
add maybe to bindable
2017-06-30 15:24:55 +03:00
Alexander Bubnov b970b7c673 add maybe to bindable 2017-06-30 15:13:33 +03:00
Anton Domnikov 9d6aa9c445 Merge branch 'master-rx-java-2' into kotlin_migration 2017-06-23 13:31:52 +03:00
Alexander Bubnov e3666b32b3 update rxJava2 to 2.1.1 2017-06-21 17:04:42 +03:00
Gavriil e97bce4061 Merge pull request #63 from TouchInstinct/bugs/network_type
fix getNetworkType
2017-06-21 15:12:44 +03:00
Gavriil 2abdc20f65 Merge pull request #63 from TouchInstinct/bugs/network_type
fix getNetworkType
2017-06-21 15:10:24 +03:00
Arseniy Borisov af49926976 fix getNetworkType 2017-06-21 14:56:00 +03:00
Anton Domnikov a2fe86ec09 revert retrolambda 2017-06-19 18:23:48 +03:00
Anton Domnikov a2f2dc5c88 remove retrolambda 2017-06-14 17:52:44 +03:00
gorodeckii 5ef88a5ccc Merge branch 'master' into master-rx-java-2 2017-06-09 15:51:20 +03:00
Gavriil 140f01d28e Merge pull request #62 from TouchInstinct/OldTargetApi
noinspection OldTargetApi
2017-06-09 15:43:15 +03:00