 huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
10 years ago |
|
huang
|
643b06484b
|
消息表添加字段
|
10 years ago |
 cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
10 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
10 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
10 years ago |
 daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
10 years ago |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
10 years ago |
 yuanke
|
283dc86a8b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
db/schema.rb
public/assets/wechat/homework_detail.html
public/javascripts/wechat/controllers/activity.js
|
10 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
10 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
10 years ago |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
0dfc887f74
|
复制班级中资源的提示修改
|
10 years ago |
|
huang
|
2f79e521ca
|
单位批准发送消息；申请单位给系统每位管理员发送消息
|
10 years ago |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
10 years ago |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
10 years ago |
 Tim
|
82ae7310dc
|
rake db生成文件
|
10 years ago |
guange
|
c5dd2eaf41
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
daiao
|
5886a9898a
|
在单位名称列表的数据库表中，增加用户字段
|
10 years ago |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
10 years ago |
|
guange
|
6a871e2116
|
.
|
10 years ago |
|
txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
10 years ago |
|
huang
|
84d1adbf25
|
生成邀请码
|
10 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
10 years ago |
|
huang
|
160b05ae89
|
组织匿名数据处理
|
10 years ago |
|
huang
|
4e4ff4958f
|
修改changeset触发事件
|
10 years ago |
|
huang
|
472eb4736e
|
修改数据类型
|
10 years ago |
|
huang
|
246923a335
|
版本库新增提交次数表，增加至项目动态
|
10 years ago |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
10 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
10 years ago |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
10 years ago |
|
cxt
|
7725db9c69
|
题库报500
|
10 years ago |
|
cxt
|
f7942e4d3c
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
db/schema.rb
|
10 years ago |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
10 years ago |
|
guange
|
7c98e0f392
|
merge
|
10 years ago |
|
guange
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
10 years ago |
|
cxt
|
c224f97905
|
样式调整、线下作业的作品评分、导出作业成绩报500
|
10 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
10 years ago |
|
txz
|
ed39b4b4f1
|
动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分
|
10 years ago |
|
daiao
|
87d99a1908
|
数据迁移
|
10 years ago |
|
huang
|
b90c90bc60
|
add model error_list
|
10 years ago |
|
daiao
|
cc72ca8473
|
Merge branch 'develop' into daiao_dev
Conflicts:
db/schema.rb
|
10 years ago |
|
daiao
|
261f440b3d
|
迁移
|
10 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
10 years ago |
|
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
