陶汉栋 / ParentWork | GitLab

13 Apr, 2018

1 commit

e9804745 no message Browse Dir »

姚旭斌
2018-04-13 19:21:57 +0800

12 Apr, 2018

1 commit

4d51724e no message Browse Dir »

姚旭斌
2018-04-12 11:33:51 +0800

10 Apr, 2018

2 commits

8b4376c1 no message Browse Dir »

姚旭斌
2018-04-10 19:38:08 +0800
a0178454 no message Browse Dir »

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

08 Apr, 2018

2 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

04 Apr, 2018

1 commit

6a4eb0f4 Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
张道锋
2018-04-04 09:34:02 +0800

30 Mar, 2018

1 commit

cb057a09 no message Browse Dir »

姚旭斌
2018-03-30 14:56:23 +0800

29 Mar, 2018

1 commit

762b1b1d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

张道锋
2018-03-29 18:09:40 +0800

28 Mar, 2018

2 commits

0cbfbb68 no message Browse Dir »

陶汉栋
2018-03-28 19:37:03 +0800
62be613c no message Browse Dir »

姚旭斌
2018-03-28 19:35:03 +0800

27 Mar, 2018

1 commit

4f854ee0 no message Browse Dir »

张道锋
2018-03-27 16:54:18 +0800

26 Mar, 2018

3 commits

e18ab61a no message Browse Dir »

陶汉栋
2018-03-26 17:52:42 +0800
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

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

陶汉栋
2018-03-24 17:43:58 +0800

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

f6c9454a no message Browse Dir »

姚旭斌
2018-03-24 17:41:36 +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
8afee2bd no message Browse Dir »

姚旭斌
2018-03-24 17:31:29 +0800
85477cb5 no message Browse Dir »

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

陶汉栋
2018-03-24 10:26:30 +0800
e456fe36 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	.idea/modules.xml
```
姚旭斌
2018-03-24 09:43:47 +0800
8d78127a no message Browse Dir »

姚旭斌
2018-03-24 09:43:02 +0800

23 Mar, 2018

10 commits

257465ea no message Browse Dir »

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

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

姚旭斌
2018-03-23 16:15:54 +0800
c5aac4c3 no message Browse Dir »

陶汉栋
2018-03-23 16:06:22 +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
d878d22f no message Browse Dir »

陶汉栋
2018-03-23 16:03:37 +0800
e56d2f35 no message Browse Dir »

姚旭斌
2018-03-23 15:55:12 +0800
5054d902 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-23 09:38:11 +0800
69679356 no message Browse Dir »

陶汉栋
2018-03-23 09:27:08 +0800
82904893 no message Browse Dir »

陶汉栋
2018-03-23 09:26:27 +0800

22 Mar, 2018

6 commits

ee0f03b1 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-22 18:17:38 +0800
935f129c no message Browse Dir »

姚旭斌
2018-03-22 18:17:25 +0800
ae9a2c2f no message Browse Dir »

陶汉栋
2018-03-22 16:51:54 +0800
ce7abc12 no message Browse Dir »

陶汉栋
2018-03-22 16:49:53 +0800
05344cfa no message Browse Dir »

陶汉栋
2018-03-22 16:29:00 +0800
57dfbdb6 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-22 15:53:45 +0800