25 May, 2017

2 commits

• e10ed80e   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  左丞

  2017-05-25 14:43:44 +0800  
• 82fa2992   no message Browse Dir »
  葛建军

  2017-05-25 14:42:00 +0800  

24 May, 2017

6 commits

• e977cdf1   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  左丞

  2017-05-24 17:09:34 +0800  
• 7b40e261   no message Browse Dir »
  左丞

  2017-05-24 17:09:31 +0800  
• fa0078e1   资源排序筛选界面教材,目录搭建及数据处理，资源搜索方法实现。 Browse Dir »
  葛建军

  2017-05-24 16:59:23 +0800  
• 9bc76476   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  左丞

  2017-05-24 08:52:09 +0800  
• aa722845   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive ... Browse Dir »

  # Conflicts:
  #	YouerLiveVideo/YouerLiveVideo.xcodeproj/project.pbxproj
  #	YouerLiveVideo/YouerLiveVideo.xcodeproj/project.xcworkspace/xcuserdata/jun.xcuserdatad/UserInterfaceState.xcuserstate

  葛建军

  2017-05-24 08:50:47 +0800  
• 7ed31079   资源排序筛选界面学段,年级,学科搭建及数据处理，图标导入及添加。 Browse Dir »
  葛建军

  2017-05-24 08:46:38 +0800  

23 May, 2017

3 commits

• a824de42   no message Browse Dir »
  左丞

  2017-05-23 16:50:36 +0800  
• 235e5ed1   no message Browse Dir »
  左丞

  2017-05-23 14:56:18 +0800  
• 0fcdc1f6   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive ... Browse Dir »

  # Conflicts:
  #	YouerLiveVideo/YouerLiveVideo/controllers/Resource/ResourceViewController.swift

  左丞

  2017-05-23 08:47:40 +0800  

22 May, 2017

2 commits

• 6337a8d4   no message Browse Dir »
  左丞

  2017-05-22 17:25:48 +0800  
• 66f62deb   首页界面间距调整，微课首页界面搭建及数据填充。 Browse Dir »
  葛建军

  2017-05-22 14:38:35 +0800  

20 May, 2017

5 commits

• 5b0c5e90   资源首页数据填充 Browse Dir »
  葛建军

  2017-05-20 17:26:04 +0800  
• 0db1c538   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  葛建军

  2017-05-20 14:02:08 +0800  
• bd57d55a   首页排行界面搭建及数据填充 Browse Dir »
  葛建军

  2017-05-20 14:01:56 +0800  
• 498f740d   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  左丞

  2017-05-20 09:02:10 +0800  
• df45eda6   no message Browse Dir »
  左丞

  2017-05-20 09:02:07 +0800  

19 May, 2017

3 commits

• 6f06ed3c   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  葛建军

  2017-05-19 16:33:16 +0800  
• aa410649   教育视频云首页界面搭建及数据填充 Browse Dir »
  葛建军

  2017-05-19 16:33:09 +0800  
• 8d05af0c   no message Browse Dir »
  左丞

  2017-05-19 14:30:59 +0800  

18 May, 2017

2 commits

• fc612f20   注册流程及登录test Browse Dir »
  葛建军

  2017-05-18 10:50:17 +0800  
• 945455e2   no message Browse Dir »
  葛建军

  2017-05-18 09:52:57 +0800  

17 May, 2017

2 commits

• 69c7c256   no message Browse Dir »
  葛建军

  2017-05-17 17:22:14 +0800  
• 37b548f9   no message Browse Dir »
  葛建军

  2017-05-17 16:19:03 +0800