Elena Bobkova
|
169f4ffec8
|
Merge branch 'master' into master-rx-java-2
# Conflicts:
# build.gradle
|
2017-06-01 14:53:06 +03:00 |
Gavriil
|
cb4a4d847d
|
Merge pull request #55 from TouchInstinct/chat_android
replay(1) removed from socket connection
|
2017-06-01 14:51:00 +03:00 |
|
Elena Bobkova
|
24bcae7170
|
replay(1) removed from socket connection
|
2017-06-01 14:49:54 +03:00 |
gorodeckii
|
c664bf7314
|
retrofit version
|
2017-05-15 16:36:29 +03:00 |
|
Gavriil
|
4e30aa9fa7
|
Merge pull request #54 from TouchInstinct/retrofit_version_update
retrofit version update
|
2017-05-15 14:35:13 +03:00 |
|
Elena Bobkova
|
6fd4ee9eb6
|
retrofit version update
|
2017-05-15 14:27:38 +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 |
Oleg
|
0ae38bf5f3
|
rxjava version
|
2017-05-10 21:15:38 +03:00 |
|
Gavriil
|
0f556e5a0f
|
Merge pull request #53 from TouchInstinct/fix/blinking_fix
Revert "registration of hook crash fixed"
|
2017-05-05 17:03:53 +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 |
|
Anton Domnikov
|
ccd9b85d04
|
update build tools version
|
2017-05-04 13:27:55 +03:00 |
|
Gavriil
|
d102f2954f
|
Merge pull request #52 from TouchInstinct/fix/buildToolsUpdate
build tools update
|
2017-05-03 22:35:05 +03:00 |
|
Elena Bobkova
|
cb0da708d6
|
build tools update
|
2017-05-03 22:29:22 +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 |
|
Oleg
|
0eab7853c0
|
new versions
|
2017-04-26 15:40:05 +03:00 |
|
Gavriil
|
6b07ba49f3
|
Merge pull request #49 from TouchInstinct/small_fixes
Small fixes
|
2017-04-22 19:00:58 +03:00 |
|
Gavriil Sitnikov
|
819e4a1bea
|
facebook lib version upd
|
2017-04-22 18:46:04 +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 |
|
Gavriil
|
cf47237e49
|
Merge pull request #48 from TouchInstinct/rxjava2/validation
validation
|
2017-04-18 14:40:52 +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 |
|
Gavriil
|
f99f1dfccc
|
Merge pull request #47 from TouchInstinct/stetho_update
stetho 1.5.0
|
2017-04-14 16:01:17 +03:00 |
Arseniy Borisov
|
93fc1b0e1f
|
stetho 1.5.0
|
2017-04-14 16:00:28 +03:00 |
|
Gavriil
|
03b59c40d0
|
Merge pull request #46 from TouchInstinct/stetho
add stetho. crashlytics initialization error message.
|
2017-04-08 17:06:52 +03:00 |
|
Arseniy Borisov
|
73cada5bc6
|
cr
|
2017-04-08 17:02:48 +03:00 |
|
Arseniy Borisov
|
569ebf3ecd
|
cr
|
2017-04-08 16:44:05 +03:00 |
|
Arseniy Borisov
|
3a4554e7d5
|
add sthetho. crashlytics initialization error message.
|
2017-04-08 16:15:17 +03:00 |
|
Gavriil
|
c351075589
|
Merge pull request #45 from TouchInstinct/feature/blur
added blur
|
2017-04-06 18:09:08 +03:00 |
|
Ilia Kurtov
|
045b7999f5
|
cr fix
|
2017-04-06 18:00:38 +03:00 |
|
Ilia Kurtov
|
27ca91efc0
|
added blur
|
2017-04-06 17:27:56 +03:00 |
|
Gavriil
|
a70ae81cec
|
Merge pull request #44 from TouchInstinct/wifi_observe
Wifi state observable added
|
2017-04-04 16:03:37 +03:00 |
|
Gavriil Sitnikov
|
05cb31c661
|
Wifi state observable added
|
2017-04-03 21:51:10 +03:00 |
|
Gavriil
|
64ed1db09b
|
Merge pull request #43 from TouchInstinct/small_updates
Small updates
|
2017-03-28 14:24:15 +03:00 |
Alexander Bubnov
|
32467500c5
|
important fix
|
2017-03-28 14:21:56 +03:00 |
|
Alexander Bubnov
|
d852652bd6
|
call onErrorAction
|
2017-03-28 14:10:41 +03:00 |
|
Alexander Bubnov
|
d01ebc6dfe
|
Merge branch 'master' into small_updates
|
2017-03-28 12:20:19 +03:00 |
|
Alexander Bubnov
|
f8df418f46
|
cahnge onError to onErrorResumeNext
|
2017-03-28 12:19:06 +03:00 |