25 May, 2017

27 commits

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

  2017-05-25 14:56:51 +0800  
• cf353903   no message Browse Dir »
  葛建军

  2017-05-25 14:56:45 +0800  
• 092fe4e4   no message Browse Dir »
  左丞

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

  2017-05-25 14:43:44 +0800  
• 04fab793   no message Browse Dir »
  左丞

  2017-05-25 14:43:41 +0800  
• 3345ba31   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  葛建军

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

  2017-05-25 14:42:00 +0800  
• 63fbe41b   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  左丞

  2017-05-25 13:32:41 +0800  
• e2c9604b   no message Browse Dir »
  左丞

  2017-05-25 13:32:35 +0800  
• 7d431ea4   no message Browse Dir »
  葛建军

  2017-05-25 11:11:30 +0800  
• 027ee0a9   no message Browse Dir »
  葛建军

  2017-05-25 10:28:45 +0800  
• 2fe02865   no message Browse Dir »
  左丞

  2017-05-25 10:19:44 +0800  
• ac3bfc98   no message Browse Dir »
  左丞

  2017-05-25 10:13:18 +0800  
• 5759e542   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  左丞

  2017-05-25 10:04:30 +0800  
• a9b5243d   no message Browse Dir »
  左丞

  2017-05-25 10:04:23 +0800  
• 4a9a13ed   no message Browse Dir »
  葛建军

  2017-05-25 10:00:41 +0800  
• 7bbfc07e   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  葛建军

  2017-05-25 09:56:20 +0800  
• c1bf8c6f   界面细节修改 Browse Dir »
  葛建军

  2017-05-25 09:56:14 +0800  
• 20f33773   no message Browse Dir »
  左丞

  2017-05-25 09:54:13 +0800  
• 3d541d12   no message Browse Dir »
  左丞

  2017-05-25 09:47:51 +0800  
• d1b0ea35   no message Browse Dir »
  葛建军

  2017-05-25 09:42:40 +0800  
• e3b3478c   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive ... Browse Dir »

  # Conflicts:
  #	YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard

  葛建军

  2017-05-25 09:41:34 +0800  
• 7a722212   no message Browse Dir »
  葛建军

  2017-05-25 09:39:25 +0800  
• 53a44107   no message Browse Dir »
  左丞

  2017-05-25 09:35:52 +0800  
• c42e7d84   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  葛建军

  2017-05-25 08:57:13 +0800  
• 642a5f75   no message Browse Dir »
  葛建军

  2017-05-25 08:57:07 +0800  
• 8bbf316e   no message Browse Dir »
  左丞

  2017-05-25 08:52:34 +0800  

24 May, 2017

11 commits

• 9fdd262d   no message Browse Dir »
  左丞

  2017-05-24 17:17:18 +0800  
• 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  
• 5e82f595   Merge branch 'newLive' of http://git.shunzhi.net/iosgroup/newlive into newLive Browse Dir »
  左丞

  2017-05-24 13:44:35 +0800  
• 487b82be   no message Browse Dir »
  左丞

  2017-05-24 13:44:27 +0800  
• 349ae761   no message Browse Dir »
  葛建军

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

  2017-05-24 08:52:09 +0800  
• 9d367c56   no message Browse Dir »
  左丞

  2017-05-24 08:52:06 +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

2 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