Commits · 3b6941d88a2760f54e9de7fccc9a56f4109e75e8 · gengmeiios / GMBase

18 May, 2020 1 commit
- Merge branch 'lym/text' into 'master' · 3b6941d8
  乔金柱 authored May 18, 2020
```
Lym/text

See merge request !21
```
  3b6941d8
14 May, 2020 9 commits
- update · 9e91ae10
  jz authored May 14, 2020
  
  9e91ae10
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · b3afead9
  jz authored May 14, 2020
  
  b3afead9
- 迁移一部分到 swift · 4331e9c4
  jz authored May 14, 2020
  
  4331e9c4
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · be17cfd6
  luyueming authored May 14, 2020
```
* 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase:
  update
  update
  update
```
  be17cfd6
- 需改路径 · 770da005
  luyueming authored May 14, 2020
  
  770da005
- update · f3b40c71
  jz authored May 14, 2020
  
  f3b40c71
- update · 72822fd7
  jz authored May 14, 2020
  
  72822fd7
- update · c638d01e
  jz authored May 14, 2020
  
  c638d01e
- update · d40a6af1
  jz authored May 14, 2020
  
  d40a6af1
13 May, 2020 8 commits
- update · 77e6500d
  jz authored May 13, 2020
  
  77e6500d
- add GMBase/Classes/AddClass/GMCalendarEventManager.swift · 38d291a0
  jz authored May 13, 2020
  
  38d291a0
- update · 6fdd4ef1
  jz authored May 13, 2020
  
  6fdd4ef1
- add GMAddressManager · f785f339
  jz authored May 13, 2020
  
  f785f339
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · bb73c1bb
  luyueming authored May 13, 2020
```
* 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase:
  update
```
  bb73c1bb
- 添加的文件 · 54dcbd9d
  luyueming authored May 13, 2020
  
  54dcbd9d
- update · 93d00cad
  jz authored May 13, 2020
  
  93d00cad
- update · 9b7d1d72
  jz authored May 13, 2020
  
  9b7d1d72
12 May, 2020 9 commits
- update · 4d540877
  jz authored May 12, 2020
  
  4d540877
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · 7cbea0cd
  luyueming authored May 12, 2020
```
* 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase:
  update

# Conflicts:
#	GMBase.podspec
chongtu
```
  7cbea0cd
- 无效的文件 · f18657e1
  luyueming authored May 12, 2020
  
  f18657e1
- Merge branch 'lym/text' of git.wanmeizhensuo.com:gengmeiios/GMBase into lym/text · aedadf30
  luyueming authored May 12, 2020
```
# Conflicts:
#	GMBase.podspec
冲突
```
  aedadf30
- update · dd7e2e33
  jz authored May 12, 2020
  
  dd7e2e33
- update · 75e54603
  luyueming authored May 12, 2020
  
  75e54603
- update · dd9033c9
  jz authored May 12, 2020
  
  dd9033c9
- add files · 1a2a9e6b
  jz authored May 12, 2020
  
  1a2a9e6b
- add baseweb · 42d48fd1
  jz authored May 12, 2020
  
  42d48fd1
11 May, 2020 2 commits
- update · 8b06f494
  jz authored May 11, 2020
  
  8b06f494
- 提交web · 1826794b
  luyueming authored May 11, 2020
  
  1826794b
06 May, 2020 3 commits

jxPagerView放到GMBase中 · a4f39813
luyueming authored May 06, 2020

a4f39813

Merge branch 'master' into lym/text · 401aef70

luyueming authored May 06, 2020

* master:
  删除没有用的代码
  增加数组越界判断
  使用协议来添加 navigion 动画
  GMPresentAnimation 初步成型，但是还需要拆分
  优化 present 动画
  Bump version to 1.1.5
  add WMFetchDataViewModel+GMRequest.h
  add WMFetchDataViewModel+GMRequest.h
  Bump version to 1.1.4
  基类初始化referrer_link

# Conflicts:
#	GMBase/Classes/GMNavigationController.m
冲突

401aef70

无效的修改 · 56c6bb56
luyueming authored May 06, 2020

56c6bb56

10 Apr, 2020 2 commits
- 删除没有用的代码 · 4a4ba4ae
  汪洋 authored Apr 10, 2020
  
  4a4ba4ae
- 增加数组越界判断 · 7358fa97
  汪洋 authored Apr 10, 2020
  
  7358fa97
08 Apr, 2020 1 commit
- 使用协议来添加 navigion 动画 · 86d3092a
  汪洋 authored Apr 08, 2020
  
  86d3092a
03 Apr, 2020 1 commit
- GMPresentAnimation 初步成型，但是还需要拆分 · 3e4f79e9
  汪洋 authored Apr 03, 2020
  
  3e4f79e9
31 Mar, 2020 1 commit
- Merge branch 'master' into wy/present · 30d831fb
  汪洋 authored Mar 31, 2020
  
  30d831fb
25 Mar, 2020 1 commit
- 优化 present 动画 · b4774602
  汪洋 authored Mar 25, 2020
  
  b4774602
27 Dec, 2019 1 commit
- Bump version to 1.1.5 · 24b6a410
  gm-mini authored Dec 27, 2019
  
  24b6a410
26 Dec, 2019 1 commit
- add WMFetchDataViewModel+GMRequest.h · e6ffac3d
  jz authored Dec 26, 2019
  
  e6ffac3d