 cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
9 years ago |
|
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
9 years ago |
 yuanke
|
4932b9fad8
|
班级留言不显示
|
9 years ago |
|
cxt
|
56b74b755b
|
取消收藏
|
9 years ago |
|
yuanke
|
e0957113d8
|
项目issue模版消息提醒
|
9 years ago |
|
yuanke
|
bd3911c072
|
.
|
9 years ago |
|
yuanke
|
f8dfe85156
|
项目issue增加模版消息
|
9 years ago |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
9 years ago |
 Tim
|
f67336fbe5
|
课程信息单词折行
|
9 years ago |
|
cxt
|
2759d562ac
|
首页项目列表
|
9 years ago |
|
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
9 years ago |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
yuanke
|
a1dfdae58d
|
修改班级通知模版消息的跳转
|
9 years ago |
|
yuanke
|
7c5240b386
|
微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复
|
9 years ago |
|
yuanke
|
57737ff15d
|
微信细节优化
|
9 years ago |
 huang
|
87c5f50545
|
PULL request 评论创建及局部刷新
|
9 years ago |
|
huang
|
6319a1bac6
|
PR添加评论定义
|
9 years ago |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
9 years ago |
|
huang
|
518d6bacbe
|
添加关闭pull request功能
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
515649beb6
|
接受PR局部刷新及跳转
|
9 years ago |
|
yuanke
|
ee019cd364
|
修改测试版微信加入项目审核通知
|
9 years ago |
|
cxt
|
cecf917764
|
从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用”
|
9 years ago |
|
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
9 years ago |
|
huang
|
be081f5c66
|
添加Api（提交内容，改动）及相关方法路由
|
9 years ago |
|
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
9 years ago |
guange
|
a1d3bbbfa9
|
解决ruby2.3执行sql出错的bug
|
9 years ago |
|
guange
|
fc38ef6a3f
|
增加了一个查看服务器内网ip的middleware，利于以后分析问题，headers为X-Response-Ip
|
9 years ago |
|
huang
|
3660f8cbce
|
gitlab相关方法的封装
|
9 years ago |
|
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
9 years ago |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
9 years ago |
 daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
9 years ago |
|
daiao
|
5b93d40f67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
9 years ago |
|
daiao
|
39478eb4e4
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
Conflicts:
app/views/admin/applied_schools.html.erb
app/views/admin/has_applied_schools.html.erb
|
9 years ago |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
9 years ago |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
9 years ago |
|
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
9 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
|
daiao
|
5b30036639
|
单位名称列表功能
|
9 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
9 years ago |
|
daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
9 years ago |
