Commit Graph

287 Commits

Author SHA1 Message Date
Oksana Pokrovskaya da42e2e41d deleted Logic 2018-03-07 16:30:01 +03:00
Denis Karmyshakov 7250a60f1d LoganSquare update (#104) 2018-02-16 18:15:00 +03:00
Denis Karmyshakov 38e52e5ba9 Enum serialization (#102) 2018-02-09 14:57:21 +03:00
Anton Domnikov 7a3c3f11fd fixed parsing when date is empty (#100) 2018-02-02 17:04:11 +03:00
Denis Karmyshakov 1e3acae437
Merge pull request #98 from TouchInstinct/gradle_update
Gradle update
2017-12-01 16:11:29 +03:00
Denis Karmyshakov 25492e93da Gradle update 2017-11-30 18:02:23 +03:00
Arseniy Borisov 90d88a9e97 LoganSquareBigDecimalConverter (#96) 2017-11-15 17:31:25 +03:00
Ilia Kurtov 3fcf47c4f1 fixed internet observable 2017-10-23 20:20:26 +03:00
Ilia Kurtov e7be976085 Merge pull request #95 from TouchInstinct/feature/network_connection
feature/network_connection
2017-10-06 15:37:36 +03:00
Oleg f0965d3dfa small fix 2017-10-06 15:29:18 +03:00
Oleg cee02ad925 add new method 2017-10-06 14:23:57 +03:00
Oleg d004fb7686 Merge pull request #94 from TouchInstinct/update/gradle
Versions in constants
2017-10-05 15:52:28 +03:00
Oleg 21c368cc39 Versions in constants 2017-10-05 15:51:23 +03:00
Denis Karmyshakov 617ce9494a Merge pull request #92 from TouchInstinct/versions_in_constants
Versions in constants
2017-10-04 12:28:51 +03:00
Denis Karmyshakov 2b3ee88ea7 Versions in constants 2017-10-04 12:25:04 +03:00
Oleg c436d06efd buildToolsVersion 26.0.2 (#90) 2017-09-29 14:52:59 +03:00
Ilia Kurtov 96f91a0da1 Merge pull request #89 from TouchInstinct/update/rxjava
update rxjava
2017-09-22 16:43:05 +03:00
Ilia Kurtov 2790890222 update rxjava 2017-09-22 16:38:02 +03:00
Anton Domnikov 8d77683453 Merge pull request #88 from TouchInstinct/feature/network_connection_observable
Feature/network connection observable
2017-09-20 16:27:21 +03:00
Anton Domnikov b23ee3581c Merge branch 'master-kotlin-rxjava2' into feature/network_connection_observable 2017-09-20 16:26:23 +03:00
Anton Domnikov 1fa0aba9db CR fixes 2017-09-20 16:26:00 +03:00
Ilia Kurtov 164a9eee9c Merge pull request #87 from TouchInstinct/feature/network_connection_observable
added network connection observable
2017-09-20 14:42:59 +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