陶汉栋 / ParentWork | GitLab

10 Apr, 2018

2 commits

17585259 no message Browse Dir »

姚旭斌
2018-04-10 23:55:51 +0800
a0178454 no message Browse Dir »

陶汉栋
2018-04-10 11:02:25 +0800

08 Apr, 2018

4 commits

9595d58e no message Browse Dir »

姚旭斌
2018-04-08 21:58:54 +0800
08b7799e no message Browse Dir »

姚旭斌
2018-04-08 19:23:34 +0800
49837d23 no message Browse Dir »

姚旭斌
2018-04-08 11:09:15 +0800
07503a80 no message Browse Dir »

姚旭斌
2018-04-08 10:35:11 +0800

04 Apr, 2018

3 commits

df3a9c11 no message Browse Dir »

姚旭斌
2018-04-04 21:43:07 +0800
afec02d6 no message Browse Dir »

姚旭斌
2018-04-04 15:19:23 +0800
24a5ea4a no message Browse Dir »

姚旭斌
2018-04-04 09:47:58 +0800

26 Mar, 2018

2 commits

38b93710 no message Browse Dir »

陶汉栋
2018-03-26 13:07:21 +0800
8c9c3f09 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

张道锋
2018-03-26 10:08:18 +0800

24 Mar, 2018

9 commits

5a577c2a Merge branch 'developer' into yxb_dev ... Browse Dir »

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/layout/activity_personinfo.xml
#	app/src/main/res/layout/fragment_mine.xml

2018-03-24 17:42:54 +0800

b5c21103 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
```
姚旭斌
2018-03-24 17:32:14 +0800
7b8a96d8 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-24 17:05:14 +0800
85477cb5 no message Browse Dir »

陶汉栋
2018-03-24 17:04:57 +0800
38c88362 no message Browse Dir »

姚旭斌
2018-03-24 17:01:41 +0800
e92104a6 no message Browse Dir »

姚旭斌
2018-03-24 16:19:30 +0800
b4a2cc26 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

姚旭斌
2018-03-24 14:54:44 +0800
d4f3a486 no message Browse Dir »

姚旭斌
2018-03-24 14:54:32 +0800
22a74751 no message Browse Dir »

姚旭斌
2018-03-24 12:33:28 +0800

23 Mar, 2018

3 commits

257465ea no message Browse Dir »

陶汉栋
2018-03-23 17:46:50 +0800
bec10697 no message Browse Dir »

姚旭斌
2018-03-23 16:15:54 +0800
ec9c6c5d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
张道锋
2018-03-23 16:03:39 +0800

22 Mar, 2018

7 commits

0a7ab48f Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-03-22 18:09:01 +0800
0f4158c7 no message Browse Dir »

姚旭斌
2018-03-22 17:03:19 +0800
57dfbdb6 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-22 15:53:45 +0800
432b4257 no message Browse Dir »

陶汉栋
2018-03-22 15:36:10 +0800
de5c40dd Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
#	app/src/main/res/layout/fragment_mine.xml
```
姚旭斌
2018-03-22 12:30:21 +0800
49d6fe65 no message Browse Dir »

陶汉栋
2018-03-22 11:39:15 +0800
50ca3597 no message Browse Dir »

张道锋
2018-03-22 11:06:39 +0800

21 Mar, 2018

8 commits

fbd004dd Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-21 16:41:47 +0800
ccad9511 no message Browse Dir »

姚旭斌
2018-03-21 16:41:33 +0800
2f0e5240 no message Browse Dir »

陶汉栋
2018-03-21 15:45:26 +0800
ec30fab4 no message Browse Dir »

陶汉栋
2018-03-21 15:43:34 +0800
d045d156 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-21 15:26:55 +0800
d7705ead no message Browse Dir »

姚旭斌
2018-03-21 15:26:40 +0800
8c263840 no message Browse Dir »

陶汉栋
2018-03-21 14:42:38 +0800
5f67acc0 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
```
姚旭斌
2018-03-21 09:25:50 +0800

20 Mar, 2018

2 commits

68baa86d no message Browse Dir »

陶汉栋
2018-03-20 17:59:23 +0800
b452c5b0 no message Browse Dir »

陶汉栋
2018-03-20 17:55:21 +0800