Arseniy Borisov
|
4b0fd5945f
|
idea formatting
|
2017-07-24 12:28:57 +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 |
|
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 |
|
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 |
|
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 |