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 |
|
Anton Domnikov
|
ff4167316a
|
remove targetSdkVersion
|
2017-06-09 15:41:50 +03:00 |
|
Anton Domnikov
|
f607946ecb
|
noinspection OldTargetApi
|
2017-06-09 15:17:10 +03:00 |
|
Gavriil Sitnikov
|
d9878a8035
|
Merge branch 'master' into master-rx-java-2
|
2017-06-08 18:43:42 +03:00 |
|
Gavriil
|
04019efaa0
|
Merge pull request #61 from TouchInstinct/static_fix
static fix
|
2017-06-08 17:45:46 +03:00 |
|
Gavriil Sitnikov
|
79ec7fb827
|
static fix
|
2017-06-08 17:39:26 +03:00 |
|
Gavriil
|
b5f1a6958a
|
Merge pull request #60 from TouchInstinct/calendar_init_fix
fix of layout manager
|
2017-06-08 16:53:13 +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
|
b5a06328df
|
Merge pull request #59 from TouchInstinct/static_fix
calendar static fix
|
2017-06-08 14:58:24 +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
|
d7b4e01537
|
Merge pull request #58 from TouchInstinct/calendar_fix
fix of unnecessary moves of adapter on it's items changes
|
2017-06-08 14:21:34 +03:00 |
|
Gavriil Sitnikov
|
c8fc0fe745
|
fix of unnecessary moves of adapter on it's items changes
|
2017-06-08 14:20:15 +03:00 |
|
Gavriil
|
1951c44ef1
|
Merge pull request #57 from TouchInstinct/feature/general_improvements
Feature/general improvements
|
2017-06-06 16:01:37 +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 |
|
Gavriil
|
c782bacb63
|
Merge pull request #56 from TouchInstinct/socket_connection_refCount()_added
added refCount() to publish()
|
2017-06-01 15:14:02 +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 |
|
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 |
|
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 |
Oleg Kuznetcov
|
09286b3ddd
|
retrofit version
|
2017-05-15 16:40:05 +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 |