19 Mar, 2018

6 commits

• 190b12d2   no message Browse Dir »
  张道锋

  2018-03-19 13:25:56 +0800  
• d177b23c   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-19 11:24:17 +0800  
• e7ab7c8e   no message Browse Dir »
  陶汉栋

  2018-03-19 11:24:05 +0800  
• 35f2acad   no message Browse Dir »
  张道锋

  2018-03-19 11:20:46 +0800  
• cebff8c0   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-19 11:19:59 +0800  
• beafeb7e   no message Browse Dir »
  张道锋

  2018-03-19 11:13:40 +0800  

17 Mar, 2018

2 commits

• 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  
• c84d837b   no message Browse Dir »
  张道锋

  2018-03-17 17:33:53 +0800  

16 Mar, 2018

20 commits

• dec4c9a0   no message Browse Dir »
  姚旭斌

  2018-03-16 23:04:48 +0800  
• 0a469ad2   no message Browse Dir »
  陶汉栋

  2018-03-16 19:12:57 +0800  
• 6bee8968   no message Browse Dir »
  姚旭斌

  2018-03-16 18:32:29 +0800  
• 2e8868cb   no message Browse Dir »
  陶汉栋

  2018-03-16 18:00:03 +0800  
• 658234ab   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-16 17:57:11 +0800  
• 8510cba8   no message Browse Dir »
  陶汉栋

  2018-03-16 17:55:36 +0800  
• 8f6486da   Merge branch 'developer' into yxb_dev ... Browse Dir »

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

  姚旭斌

  2018-03-16 17:49:37 +0800  
• 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  
• f7a6aa86   no message Browse Dir »
  陶汉栋

  2018-03-16 17:34:00 +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  
• 2c3dd885   no message Browse Dir »
  姚旭斌

  2018-03-16 17:16:05 +0800  
• b181dda4   no message Browse Dir »
  陶汉栋

  2018-03-16 13:45:20 +0800  
• a97b79d9   no message Browse Dir »
  姚旭斌

  2018-03-16 13:42:44 +0800  
• 7143f4b6   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-16 13:29:33 +0800  
• 378663ec   no message Browse Dir »
  陶汉栋

  2018-03-16 13:29:22 +0800  
• bcb57ba9   Merge branch 'developer' into yxb_dev Browse Dir »
  姚旭斌

  2018-03-16 09:07:41 +0800  
• b21e283f   no message Browse Dir »
  姚旭斌

  2018-03-16 09:07:19 +0800  
• 6a57d64f   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-16 08:24:15 +0800  
• b808b918   no message Browse Dir »
  陶汉栋

  2018-03-16 08:24:03 +0800  

15 Mar, 2018

12 commits

• 08e1bf53   no message Browse Dir »
  陶汉栋

  2018-03-15 17:57:59 +0800  
• c7225026   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »
  姚旭斌

  2018-03-15 17:35:29 +0800  
• 616118e8   no message Browse Dir »
  姚旭斌

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

  2018-03-15 17:32:04 +0800  
• d4dc8b01   no message Browse Dir »
  陶汉栋

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

  2018-03-15 17:24:56 +0800  
• c0b46499   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »
  姚旭斌

  2018-03-15 17:02:42 +0800  
• df6597cd   no message Browse Dir »
  姚旭斌

  2018-03-15 17:02:38 +0800  
• ecc56fa8   no message Browse Dir »
  陶汉栋

  2018-03-15 11:50:32 +0800  
• 84aba0cd   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »
  陶汉栋

  2018-03-15 09:52:01 +0800  
• 287f1d90   no message Browse Dir »
  陶汉栋

  2018-03-15 09:51:47 +0800  
• 02c439f8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »
  姚旭斌

  2018-03-15 09:50:52 +0800