597 Commits

Author SHA1 Message Date
9cde7d8af3 Merge branch 'beta' into dev/yisheng
* beta:
  remove user appBar
  bottomBar 添加个人中心
  ios project.pbxproj
  merge
  fix
  修改 ios 配置文件
  fix bug
  update: 临时增加code-review页
  update: 完成markdown动态更新
  temp
  delete .github no use file
  docs(update:  pr template):
  del: no use file
  update: doc

# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
2019-08-10 00:48:16 +08:00
3507cf4a27 + 2019-08-10 00:41:06 +08:00
cd708b5682 + 2019-08-10 00:10:51 +08:00
9b8238377c + 2019-08-10 00:08:35 +08:00
b1cc850fbb Modfiy: 调整栏目 2019-08-09 23:48:49 +08:00
057b02035e Merge pull request #310 from Nealyang/beta
feat:添加个人中心
2019-08-08 19:47:05 +08:00
fcb8cc238d remove user appBar 2019-08-08 19:45:58 +08:00
103e71a83e Merge remote-tracking branch 'upstream/beta' into beta 2019-08-08 19:43:14 +08:00
e8475c7715 bottomBar 添加个人中心 2019-08-08 19:41:07 +08:00
6936cf46f4 Merge pull request #309 from DeckeDeng/beta2
ios project.pbxproj
2019-08-08 19:25:53 +08:00
e0846510c9 ios project.pbxproj 2019-08-08 19:22:48 +08:00
7a7ff87d6d Merge pull request #308 from DeckeDeng/beta2
Beta2
2019-08-08 19:18:28 +08:00
1ccfea3f66 merge 2019-08-08 19:11:28 +08:00
548dc3d571 merge 2019-08-08 17:50:57 +08:00
a3dcd6cce2 fix 2019-08-08 15:57:25 +08:00
d79364b2b4 Merge pull request #304 from Nealyang/beta
fixbug:修改 ios 配置文件
2019-08-08 12:44:27 +08:00
7f1c107d4f 修改 ios 配置文件 2019-08-08 12:43:36 +08:00
f1b9dfaf5f 解决冲突 2019-08-08 12:39:05 +08:00
4e5e23b27d fix bug 2019-08-08 12:04:39 +08:00
8a83cc2cf8 Merge branch 'beta' of github.com:alibaba/flutter-go into beta 2019-08-08 10:48:07 +08:00
f778d13a8c update: 临时增加code-review页 2019-08-08 10:37:08 +08:00
009a58f292 Merge branch 'beta' into dev/yisheng
* beta:
  fix bug
  remove get collection
2019-08-07 19:14:50 +08:00
73ecfe9ddc + 2019-08-07 19:14:11 +08:00
df40e6b235 Merge pull request #302 from Nealyang/beta
fix bug
2019-08-07 19:12:59 +08:00
c8d93baf3e fix bug 2019-08-07 19:11:27 +08:00
365b173cd2 Merge remote-tracking branch 'upstream/beta' into beta 2019-08-07 19:08:54 +08:00
1d0881cb17 remove get collection 2019-08-07 19:08:25 +08:00
6ce02db8dd tep 2019-08-07 19:07:10 +08:00
8f835fec3a update: 完成markdown动态更新 2019-08-07 14:33:40 +08:00
f9bff3daec Merge pull request #297 from DeckeDeng/beta2
Beta2
2019-08-06 18:59:58 +08:00
8670d89c24 issuse message 2019-08-06 18:58:52 +08:00
1e7a78790d merge 2019-08-06 17:31:46 +08:00
7fdb2e9ca3 merge 2019-08-06 17:17:45 +08:00
15552b19da Merge pull request #294 from Nealyang/beta
Feat:收藏功能、搜索功能、个人中心功能完善
2019-08-06 17:06:05 +08:00
0cfb19b4e5 修改为线上地址 2019-08-06 17:05:15 +08:00
dcb174e855 个人中心、收藏、搜索 2019-08-06 16:58:42 +08:00
bc10e99823 Merge branch 'beta' of github.com:alibaba/flutter-go into beta 2019-08-01 17:21:45 +08:00
d21501077e merge code 2019-08-01 11:47:42 +08:00
d0f4724248 debug 2019-07-31 20:19:40 +08:00
a75269d383 temp 2019-07-31 17:36:56 +08:00
c9a9a991b0 Merge branch 'master' of github.com:alibaba/flutter-go into beta 2019-07-29 17:52:32 +08:00
7016f4bb8f delete .github no use file 2019-07-29 17:48:33 +08:00
2d6b621b2a docs(update: pr template): 2019-07-29 17:34:55 +08:00
106f04e4af del: no use file 2019-07-29 17:30:00 +08:00
a30b829834 Merge branch 'master' of github.com:alibaba/flutter-go 2019-07-29 17:29:29 +08:00
bd026a5a0f update: doc 2019-07-29 17:29:16 +08:00
3c2d31169b docs(add widget about issue): 2019-07-29 17:07:48 +08:00
19e4fd5c35 update: doc 2019-07-29 16:49:04 +08:00
78b8fd300a Merge branch 'temp' into beta 2019-07-29 16:07:51 +08:00
b274f95710 迁移位置 2019-07-29 15:34:32 +08:00