19 Apr, 2018

4 commits

• 16962567   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse Dir »

  # Conflicts:
  #	app/libs/processor.jar

  wwx

  2018-04-19 16:27:48 +0800  
• 8e9c580c   no message Browse Dir »
  wwx

  2018-04-19 16:25:43 +0800  
• 772a6e0a   Merge branch 'wwx' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

  2018-04-19 13:14:57 +0800  
• d958596a   no message Browse Dir »
  姚旭斌

  2018-04-19 13:14:23 +0800  

18 Apr, 2018

1 commit

• f3a94eee   no message Browse Dir »
  wwx

  2018-04-18 09:19:45 +0800  

16 Apr, 2018

1 commit

• c2e55796   no message Browse Dir »
  wwx

  2018-04-16 18:24:53 +0800  

14 Apr, 2018

1 commit

• eda704de   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-04-14 08:13:41 +0800  

13 Apr, 2018

1 commit

• e9804745   no message Browse Dir »
  姚旭斌

  2018-04-13 19:21:57 +0800  

11 Apr, 2018

1 commit

• 84aba162   no message Browse Dir »
  段合江

  2018-04-11 09:14:50 +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  

26 Mar, 2018

1 commit

• 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

2 commits

• aa386a0f   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-24 10:54:41 +0800  
• 4b52df23   no message Browse Dir »
  陶汉栋

  2018-03-24 10:25:56 +0800  

22 Mar, 2018

1 commit

• 50ca3597   no message Browse Dir »
  张道锋

  2018-03-22 11:06:39 +0800  

20 Mar, 2018

4 commits

• 6a922153   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-20 14:40:50 +0800  
• e80f1b4f   no message Browse Dir »
  姚旭斌

  2018-03-20 13:59:31 +0800  
• 69e40270   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-20 11:32:10 +0800  
• 6b5379b8   no message Browse Dir »
  陶汉栋

  2018-03-20 10:30:59 +0800  

17 Mar, 2018

1 commit

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

  # Conflicts:
  #	app/src/main/AndroidManifest.xml

  张道锋

  2018-03-17 17:34:49 +0800  

16 Mar, 2018

4 commits

• b9b5e32e   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java

  姚旭斌

  2018-03-16 17:47:29 +0800  
• bfc68ef2   no message Browse Dir »
  陶汉栋

  2018-03-16 17:28:06 +0800  
• ad89d180   Merge branch 'developer' into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/AppConfig.java
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

  姚旭斌

  2018-03-16 17:17:57 +0800  
• 378663ec   no message Browse Dir »
  陶汉栋

  2018-03-16 13:29:22 +0800  

15 Mar, 2018

3 commits

• c7225026   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »
  姚旭斌

  2018-03-15 17:35:29 +0800  
• 675bd555   no message Browse Dir »
  陶汉栋

  2018-03-15 17:24:56 +0800  
• 3163a156   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-15 08:20:51 +0800  

14 Mar, 2018

1 commit

• de62641e   no message Browse Dir »
  姚旭斌

  2018-03-14 17:02:44 +0800  

13 Mar, 2018

4 commits

• dcf53e4f   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-13 13:42:06 +0800  
• ffe64e2f   no message Browse Dir »
  姚旭斌

  2018-03-13 11:11:32 +0800  
• 856b277c   no message Browse Dir »
  姚旭斌

  2018-03-13 11:11:27 +0800  
• 067374b8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
  #	app/src/main/res/layout/fragment_report.xml
  #	mvpsdk/src/main/java/com/share/mvpsdk/base/activity/BaseCompatActivity.java
  #	mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java

  陶汉栋

  2018-03-13 08:18:50 +0800  

12 Mar, 2018

3 commits

• 91d42621   no message Browse Dir »
  姚旭斌

  2018-03-12 20:53:51 +0800  
• 4512e826   no message Browse Dir »
  姚旭斌

  2018-03-12 16:48:20 +0800  
• bcafe53a   no message Browse Dir »
  姚旭斌

  2018-03-12 11:06:16 +0800  

10 Mar, 2018

1 commit

• 42f6a92a   no message Browse Dir »
  姚旭斌

  2018-03-10 14:40:47 +0800  

09 Mar, 2018

3 commits

• abc79afd   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »
  姚旭斌

  2018-03-09 16:50:50 +0800  
• 96a294c3   no message Browse Dir »
  陶汉栋

  2018-03-09 16:47:16 +0800  
• 59f55e6b   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse Dir »

  # Conflicts:
  #	app/src/main/res/values/colors.xml

  姚旭斌

  2018-03-09 15:33:28 +0800