Commits | 4f4eb2065e696f28e005d9e5eeb49d8de72784f1 | iOS Team / VLionADSDKDemo

30 Nov, 2017

2 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
4f4eb206
```
# Conflicts:
#	VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
```
张旭 authored
2017-11-30 11:27:18 +0800
Browse Code »
修改监测宏原生页面
47cd9179

张旭 authored
2017-11-30 11:24:55 +0800
Browse Code »

21 Nov, 2017

1 commit

最新SDK 17.11.21
17098ecc

王军波 authored
2017-11-21 14:07:38 +0800
Browse Code »

15 Nov, 2017

2 commits

no message
4136d3d7

wangJunBo authored
2017-11-15 18:11:22 +0800
Browse Code »
no message
6d24fadc

wangJunBo authored
2017-11-15 17:12:11 +0800
Browse Code »

10 Nov, 2017

1 commit

no message
2d50649f

junbo authored
2017-11-10 11:33:47 +0800
Browse Code »

08 Nov, 2017

3 commits

no message
33bbdacd

王军波 authored
2017-11-08 17:47:42 +0800
Browse Code »
no message
4387cb79

王军波 authored
2017-11-08 15:19:21 +0800
Browse Code »
no message
0c93b6cf

王军波 authored
2017-11-08 10:42:21 +0800
Browse Code »

30 Oct, 2017

2 commits

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
c3b96710

朱林 authored
2017-10-30 17:12:01 +0800
Browse Code »
no message
8274bec3

朱林 authored
2017-10-30 17:11:55 +0800
Browse Code »

24 Oct, 2017

11 commits

no message
937d594e

王军波 authored
2017-10-24 15:16:00 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
0eede357

王军波 authored
2017-10-24 15:14:24 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
0d52b00a
```
# Conflicts:
#	VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
```
王军波 authored
2017-10-24 15:14:18 +0800
Browse Code »
no message
2d7eda7c

张旭 authored
2017-10-24 15:13:25 +0800
Browse Code »
SDK
9212bba9

王军波 authored
2017-10-24 15:12:39 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
b926c84f
```
# Conflicts:
#	VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
```
张旭 authored
2017-10-24 15:11:54 +0800
Browse Code »
no message
15ac7cbc

张旭 authored
2017-10-24 15:07:03 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
3cd953cf

王军波 authored
2017-10-24 14:44:38 +0800
Browse Code »
no message
42802ebb

王军波 authored
2017-10-24 14:44:30 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
faa52201
```
# Conflicts:
#	VLionAdSDKDemo/VLionAdSDKDemo/New Group/ViewController.m
```
张旭 authored
2017-10-24 11:05:54 +0800
Browse Code »
no message
a6c47fa5

张旭 authored
2017-10-24 11:04:56 +0800
Browse Code »

19 Oct, 2017

2 commits

toast
d25d9e01

朱林 authored
2017-10-19 09:56:17 +0800
Browse Code »
错误提示
0aa9b680

王军波 authored
2017-10-19 09:39:58 +0800
Browse Code »

18 Oct, 2017

15 commits

no message
3b200504

王军波 authored
2017-10-18 17:06:23 +0800
Browse Code »
SDK
fdc5afe8

王军波 authored
2017-10-18 16:46:23 +0800
Browse Code »
SDK
fba13e19

王军波 authored
2017-10-18 15:41:43 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
4d46427b

王军波 authored
2017-10-18 14:58:44 +0800
Browse Code »
gai
c6d75d23

王军波 authored
2017-10-18 14:58:37 +0800
Browse Code »
no message
e7cf0248

张旭 authored
2017-10-18 13:02:04 +0800
Browse Code »
4444444
5226382c

王军波 authored
2017-10-18 12:32:39 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
b671edd5
```
Conflicts:
	VLionADSDKDemo/VLionADSDKDemo.xcodeproj/project.pbxproj
```
朱林 authored
2017-10-18 11:42:35 +0800
Browse Code »
no message
3d05d7a1

朱林 authored
2017-10-18 11:40:59 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
ce636068

张旭 authored
2017-10-18 11:40:13 +0800
Browse Code »
no message
5dcebb76

张旭 authored
2017-10-18 11:40:07 +0800
Browse Code »
占位图
ccd36aba

王军波 authored
2017-10-18 11:21:59 +0800
Browse Code »
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo ...
f4751dd9
```
Conflicts:
	VLionADSDKDemo/VLionADSDKDemo/Assets.xcassets/LaunchImage.launchimage/Contents.json
```
朱林 authored
2017-10-18 11:09:00 +0800
Browse Code »
no message
5e1f178d

朱林 authored
2017-10-18 11:08:36 +0800
Browse Code »
appiconlaunch
de2aa036

张旭 authored
2017-10-18 11:06:21 +0800
Browse Code »

17 Oct, 2017

1 commit

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/VLionADSDKDemo
a85dc8ff

朱林 authored
2017-10-17 18:29:13 +0800
Browse Code »

iOS Team / VLionADSDKDemo · Commits

GitLab

30 Nov, 2017

21 Nov, 2017

15 Nov, 2017

10 Nov, 2017

08 Nov, 2017

30 Oct, 2017

24 Oct, 2017

19 Oct, 2017

18 Oct, 2017

17 Oct, 2017