Commit Graph

161 Commits

Author SHA1 Message Date
gorodeckii abaf35300b indents in comments to pass static 2017-07-26 18:13:16 +03:00
Arseniy Borisov 4b0fd5945f idea formatting 2017-07-24 12:28:57 +03:00
gorodeckii 3bf46be7e1 Merge branch 'master' into master-rx-java-2 2017-07-13 17:48:47 +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
gorodeckii 796371648c description for unknown enum values 2017-07-13 15:50:44 +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
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
Alexander Bubnov b970b7c673 add maybe to bindable 2017-06-30 15:13:33 +03:00
Gavriil e97bce4061 Merge pull request #63 from TouchInstinct/bugs/network_type
fix getNetworkType
2017-06-21 15:12:44 +03:00
Arseniy Borisov af49926976 fix getNetworkType 2017-06-21 14:56:00 +03:00
Gavriil Sitnikov d9878a8035 Merge branch 'master' into master-rx-java-2 2017-06-08 18:43:42 +03:00
Gavriil Sitnikov 79ec7fb827 static fix 2017-06-08 17:39:26 +03:00
Gavriil Sitnikov bd63ca8570 Merge branch 'calendar_init_fix' into master-rx-java-2 2017-06-08 16:50:27 +03:00
Gavriil Sitnikov 41ce954ba1 fix of layout manager 2017-06-08 16:49:56 +03:00
Gavriil Sitnikov 876f634923 Merge branch 'master' into master-rx-java-2 2017-06-08 14:59:48 +03:00
Gavriil Sitnikov 0c25b19563 calendar static fix 2017-06-08 14:54:36 +03:00
Gavriil Sitnikov 29b5d1b95e Merge branch 'master' into master-rx-java-2 2017-06-08 14:22:13 +03:00
Gavriil Sitnikov c8fc0fe745 fix of unnecessary moves of adapter on it's items changes 2017-06-08 14:20:15 +03:00
Elena Bobkova 0a9c3d531d Merge branch 'master' into master-rx-java-2 2017-06-01 15:14:59 +03:00
Elena Bobkova 2727d3be55 Merge branch 'master' into feature/general_improvements 2017-06-01 15:14:37 +03:00
Elena Bobkova 12d21bc2bd added refCount() to publish() 2017-06-01 15:13:09 +03:00
Elena Bobkova 3364e67281 Merge branch 'master' into feature/general_improvements 2017-06-01 14:53:17 +03:00
Elena Bobkova 169f4ffec8 Merge branch 'master' into master-rx-java-2
# Conflicts:
#	build.gradle
2017-06-01 14:53:06 +03:00
Elena Bobkova 24bcae7170 replay(1) removed from socket connection 2017-06-01 14:49:54 +03:00
Anton Domnikov e711ff27d3 added method to update calendarItems 2017-05-31 14:19:02 +03:00
Anton Domnikov 3efec74601 static 2017-05-20 16:56:57 +03:00
Anton Domnikov 9205c14efc fixed some calendar logic 2017-05-20 16:43:28 +03:00
Gavriil Sitnikov cfa1c96229 compile error fixed 2017-05-12 20:11:05 +03:00
Gavriil Sitnikov ef2a6efb90 google son removed 2017-05-12 19:45:20 +03:00
Gavriil Sitnikov 7b12898a76 Merge branch 'feature/general_improvements' into master-rx-java-2
# Conflicts:
#	build.gradle
#	src/main/java/ru/touchin/templates/TouchinApp.java
2017-05-12 19:33:14 +03:00
Gavriil Sitnikov 6203b9a7cf observable collection debug enabled 2017-05-12 19:31:41 +03:00
Gavriil Sitnikov 6c5a299bff Merge branch 'master' into feature/general_improvements 2017-05-12 19:31:14 +03:00
Elena Bobkova 58a015369e Revert "registration of hook crash fixed"
This reverts commit dfb0907eb5.
2017-05-05 16:58:12 +03:00
Arhipov 317bcce28e Merge branch 'master' into master-rx-java-2
# Conflicts:
#	src/main/java/ru/touchin/templates/TouchinApp.java
2017-05-04 14:10:06 +03:00
Anton Domnikov f3b989cd0a static 2017-05-04 13:31:43 +03:00
gorodeckii 0b4e2eb14d rxjava version + static fix 2017-05-03 09:37:15 +03:00
Gavriil Sitnikov 6266c8356b Merge branch 'feature/general_improvements' into master-rx-java-2
Conflicts:
	build.gradle
2017-04-28 02:10:09 +03:00
Gavriil Sitnikov fe29d22933 fixed useless validation of logic on collections validation 2017-04-28 02:09:39 +03:00
Gavriil Sitnikov dfb0907eb5 registration of hook crash fixed 2017-04-22 18:31:54 +03:00
Gavriil Sitnikov 00f4b2ac69 missed/nullable exception clarified 2017-04-22 16:29:52 +03:00
Gavriil Sitnikov 2efd0a5b29 static fixes 2017-04-21 00:10:56 +03:00
Gavriil Sitnikov bf045ba8e2 Merge branch 'feature/general_improvements' into master-rx-java-2 2017-04-20 19:42:30 +03:00
Gavriil Sitnikov 71d4d60e99 lognasquare fixes added 2017-04-20 19:37:09 +03:00
Ilia Kurtov 6e73850d06 validation 2017-04-18 14:04:50 +03:00
Gavriil Sitnikov 468da1f2b9 RxJava2 migration 2017-04-17 03:12:19 +03:00
Gavriil Sitnikov 140eff7458 rxjava 1.2.9 fixes 2017-04-17 00:45:22 +03:00