 daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 20:52:18 +08:00 |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
2016-07-29 20:48:36 +08:00 |
|
daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
2016-07-28 20:02:57 +08:00 |
 yuanke
|
1489ab015a
|
微信模版消息标题加上句号
|
2016-07-28 17:55:37 +08:00 |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
2016-07-28 15:11:04 +08:00 |
 huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
2016-07-28 14:42:36 +08:00 |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
2016-07-28 10:19:37 +08:00 |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
2016-07-27 10:54:38 +08:00 |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
2016-07-27 10:46:48 +08:00 |
|
huang
|
84d1adbf25
|
生成邀请码
|
2016-07-25 14:36:52 +08:00 |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
2016-07-25 10:59:08 +08:00 |
|
daiao
|
03d6afd1c4
|
优化上周动态获取代码
|
2016-07-18 15:52:04 +08:00 |
|
daiao
|
dcc37ef847
|
增加作品查看界面中，班级查询条件下，增加暂无分班的查询条件
|
2016-07-13 16:58:31 +08:00 |
 cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
2016-07-07 15:14:11 +08:00 |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
2016-07-07 09:02:41 +08:00 |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-05 16:49:50 +08:00 |
|
daiao
|
cc72ca8473
|
Merge branch 'develop' into daiao_dev
Conflicts:
db/schema.rb
|
2016-07-05 15:44:47 +08:00 |
|
cxt
|
5f41e191b1
|
在线测验的提示信息
|
2016-07-05 10:06:46 +08:00 |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
2016-07-01 17:52:23 +08:00 |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:52:29 +08:00 |
|
cxt
|
5a1090c0e1
|
bug修复
|
2016-07-01 17:27:34 +08:00 |
|
yuanke
|
89e42ac776
|
将姓氏改为姓名
|
2016-07-01 16:10:48 +08:00 |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
2016-07-01 11:31:51 +08:00 |
|
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
|
yuanke
|
5cc40408ee
|
修改KE单倍行距显示的时候不一致的BUG
|
2016-06-30 16:30:02 +08:00 |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
2016-06-29 10:45:56 +08:00 |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
2016-06-28 15:13:04 +08:00 |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
2016-06-24 19:17:26 +08:00 |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
2016-06-24 10:50:40 +08:00 |
|
cxt
|
e457593416
|
作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况
|
2016-06-23 17:34:46 +08:00 |
|
huang
|
fea21fe7cd
|
Merge branch 'develop' into rep_quality
|
2016-06-17 10:36:09 +08:00 |
|
huang
|
6707868915
|
登录页面新样式
|
2016-06-16 15:52:54 +08:00 |
|
huang
|
c6bd5e6d31
|
饼状图
|
2016-06-14 09:57:53 +08:00 |
|
huang
|
4367cf2233
|
Merge branch 'yuanke' into develop
|
2016-06-03 15:01:37 +08:00 |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
2016-06-02 13:55:40 +08:00 |
|
cxt
|
b72ad364db
|
微信模板消息：用户绑定成功、作业消息、个人留言、班级通知
|
2016-06-02 10:39:11 +08:00 |
|
cxt
|
c165d0b37e
|
作业二级回复的模板通知
|
2016-05-20 14:52:47 +08:00 |
|
cxt
|
7761bd5313
|
微信模板消息的“有新缺陷了”改成“有新的问题动态了”
|
2016-05-12 10:49:12 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
2016-05-09 18:40:21 +08:00 |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
|
cxt
|
121aca7505
|
缺陷模板消息
|
2016-05-05 09:09:45 +08:00 |
|
cxt
|
06586f9e4b
|
导出作业成绩中添加作品描述的导出
|
2016-05-04 16:43:37 +08:00 |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-04-29 15:58:05 +08:00 |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
2016-04-29 15:46:26 +08:00 |
|
yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 12:38:06 +08:00 |
|
yuanke
|
a893f88ede
|
微信模版本地丢了
|
2016-04-28 10:52:55 +08:00 |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 10:45:57 +08:00 |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
|
huang
|
98da0ce6ca
|
修改版本库提示
|
2016-04-21 16:33:20 +08:00 |