Skip to content
This repository has been archived by the owner on Nov 28, 2023. It is now read-only.

完成project管理和白名单管理 #3

Merged
merged 19 commits into from
Jun 2, 2016
Merged

完成project管理和白名单管理 #3

merged 19 commits into from
Jun 2, 2016

Conversation

lightless233
Copy link
Collaborator

白名单编辑功能尚未完成。

@lightless233
增加查看规则详情功能.
eaf38d1
@lightless233
Merge remote-tracking branch 'upstream/master'
6b3154c 
merge from upstream
@lightless233
删除前端js一些log
07aadf8
@lightless233
增加添加任务的api接口.
c335b5b
@lightless233
增加project表的model
eebb527
@lightless233
修改languages表model,增加suffix字段,存储文件后缀名.
244db3f
@lightless233
增加api接口add_new_task文档说明
6094927
@lightless233
修改数据表名称
99357a2
@lightless233
修改add_new_task api,数据已经插入到project表中.
e7b11b9
@lightless233
增加whitelist数据表的model和迁移文件
7fc0d02
@lightless233
增加whitelist和projects的管理入口,移动js代码至admin.js中
6218df4
@lightless233
修复一个modal的bug.
e855266
@lightless233
完成projects的查看和删除功能
0203290
@lightless233
完成修改project功能
6824b1b
@lightless233
完成 增加白名单的功能
faf7797
@lightless233
增加white list列表
b879914
@lightless233
同步上游代码,解决冲突
ee95373
@lightless233
同步上游代码,解决冲突.
b11e454
@lightless233
解决冲突
d0ce032
@FeeiCN FeeiCN merged commit 6c3a9d9 into FeeiCN:master Jun 2, 2016
FeeiCN pushed a commit that referenced this pull request Sep 11, 2017
@braveghz
Merge pull request #3 from wufeifei/master
87fb03e 
fix #512 / resolve bug
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lightless233 @FeeiCN