Commits · 6f8cc5c66bd76a9403ccb1c1acb5df4e2d654b19 · lmj / ShorthandMaster

30 Sep, 2020 4 commits
- 修改bug · 6f8cc5c6
  zhangzhe authored Sep 30, 2020
  
  6f8cc5c6
- 修改bug · 93816a26
  zhangzhe authored Sep 30, 2020
  
  93816a26
- no message · be186d53
  lmj_521aiau@163.com authored Sep 30, 2020
  
  be186d53
- no message · 638d81ba
  lmj_521aiau@163.com authored Sep 30, 2020
  
  638d81ba
29 Sep, 2020 16 commits
- no message · 02c88254
  lmj_521aiau@163.com authored Sep 29, 2020
  
  02c88254
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · bef972ba
  lmj_521aiau@163.com authored Sep 29, 2020
  
  bef972ba
- fix UI · ba635e83
  lmj_521aiau@163.com authored Sep 29, 2020
  
  ba635e83
- 修改bug · 3079cf96
  zhangzhe authored Sep 29, 2020
  
  3079cf96
- fix bug · 7b34ae43
  lmj_521aiau@163.com authored Sep 29, 2020
  
  7b34ae43
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · 4f12f443
  lmj_521aiau@163.com authored Sep 29, 2020
  
  4f12f443
- bug fix · 87dd31b4
  lmj_521aiau@163.com authored Sep 29, 2020
  
  87dd31b4
- 修改bug · 1daaf8c8
  zhangzhe authored Sep 29, 2020
  
  1daaf8c8
- no message · 6f7db351
  zhangzhe authored Sep 29, 2020
  
  6f7db351
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · b667ec14
  zhangzhe authored Sep 29, 2020
  
  b667ec14
- 处理音频问题 · 210ad2e5
  zhangzhe authored Sep 29, 2020
  
  210ad2e5
- no message · 802cdabd
  lmj_521aiau@163.com authored Sep 29, 2020
  
  802cdabd
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · 7ceb0c54
  zhangzhe authored Sep 29, 2020
  
  7ceb0c54
- 新建笔记页 · 92f0fb20
  zhangzhe authored Sep 29, 2020
  
  92f0fb20
- main · 5bd78a98
  lmj_521aiau@163.com authored Sep 29, 2020
  
  5bd78a98
- icloud 优化 · 446c75f7
  lmj_521aiau@163.com authored Sep 29, 2020
  
  446c75f7
28 Sep, 2020 7 commits
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · 1a7e95d5
  lmj_521aiau@163.com authored Sep 28, 2020
```
# Conflicts:
#	ShorthandMaster.xcodeproj/project.pbxproj

delete record  crash fix
```
  1a7e95d5
- no message · d8bc51f3
  lmj_521aiau@163.com authored Sep 28, 2020
  
  d8bc51f3
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · 483eb3fe
  zhangzhe authored Sep 28, 2020
  
  483eb3fe
- 新增录音 · 11cd8da4
  zhangzhe authored Sep 28, 2020
  
  11cd8da4
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · 6a07d516
  lmj_521aiau@163.com authored Sep 28, 2020
  
  6a07d516
- ui recorder · 5b87fdb9
  lmj_521aiau@163.com authored Sep 28, 2020
  
  5b87fdb9
- no message · cbe2f15d
  lmj_521aiau@163.com authored Sep 28, 2020
  
  cbe2f15d
27 Sep, 2020 13 commits
- 图文的新增和查看 · dae5e19a
  zhangzhe authored Sep 27, 2020
  
  dae5e19a
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · 86a17ba3
  zhangzhe authored Sep 27, 2020
  
  86a17ba3
- no message · c9b388a8
  zhangzhe authored Sep 27, 2020
  
  c9b388a8
- dateModel · 1d38dd26
  lmj_521aiau@163.com authored Sep 27, 2020
  
  1d38dd26
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · 310abcf6
  lmj_521aiau@163.com authored Sep 27, 2020
  
  310abcf6
- no message · ff4cdcd3
  lmj_521aiau@163.com authored Sep 27, 2020
  
  ff4cdcd3
- 新建笔记图片、文字 · 3a2189a1
  zhangzhe authored Sep 27, 2020
  
  3a2189a1
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · a4ee7562
  zhangzhe authored Sep 27, 2020
  
  a4ee7562
- no message · 15d02a8a
  zhangzhe authored Sep 27, 2020
  
  15d02a8a
- no message · 1a421bdd
  lmj_521aiau@163.com authored Sep 27, 2020
  
  1a421bdd
- no message · 3f786966
  lmj_521aiau@163.com authored Sep 27, 2020
  
  3f786966
- Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1 · 7eca89d2
  zhangzhe authored Sep 27, 2020
  
  7eca89d2
- no message · 486b54c9
  zhangzhe authored Sep 27, 2020
  
  486b54c9