 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 |
|
cxt
|
aed3818273
|
点击模板消息跳到微信详情页面
|
2016-04-20 14:44:10 +08:00 |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-14 11:32:35 +08:00 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
|
cxt
|
2898805aa7
|
回复的模板消息
|
2016-04-12 15:12:40 +08:00 |
|
cxt
|
275895f805
|
模板消息的重构
|
2016-04-12 11:00:47 +08:00 |
|
huang
|
86aecd21b9
|
上传图片
|
2016-04-01 23:56:05 +08:00 |
 linchun
|
52af5e4303
|
修复了管理员界面多个列表的题目问题
|
2016-03-17 15:05:14 +08:00 |
|
linchun
|
d3ed89d87e
|
sort
|
2016-03-15 15:23:43 +08:00 |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-08 11:29:58 +08:00 |
|
linchun
|
3c66a29767
|
完善课程资源列表，完成项目资源列表
|
2016-03-08 11:01:08 +08:00 |
|
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
2016-03-07 16:46:02 +08:00 |
|
cxt
|
4f3055c990
|
讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。
|
2016-03-04 17:11:52 +08:00 |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
2016-03-04 15:31:40 +08:00 |
|
cxt
|
6416b01037
|
课程里的“课程作业”改为“作业”
|
2016-03-04 14:28:06 +08:00 |
|
huang
|
83ff449946
|
项目、课程资源 浏览 改成 上传文件
|
2016-01-22 21:51:31 +08:00 |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
2016-01-22 17:27:21 +08:00 |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
2016-01-21 16:10:29 +08:00 |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
2016-01-21 11:19:08 +08:00 |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
2016-01-18 10:16:29 +08:00 |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
2016-01-14 18:25:42 +08:00 |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
2016-01-14 17:29:55 +08:00 |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
2016-01-13 16:15:46 +08:00 |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |
 ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
|
huang
|
6a9dc43d03
|
版权修改、issue编辑
|
2016-01-08 14:42:28 +08:00 |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
2016-01-08 14:12:55 +08:00 |
|
cxt
|
05f822a5c2
|
导出在线测验成绩列表
|
2016-01-07 16:43:03 +08:00 |
|
ouyangxuhua
|
e90a237a8a
|
2.1博客增加“设为主页”的功能
|
2016-01-07 15:09:09 +08:00 |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
2015-12-31 11:12:09 +08:00 |
|
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
2015-12-30 10:34:37 +08:00 |
|
huang
|
900d7d62cb
|
邮件按天发送添加提示
|
2015-12-28 16:14:32 +08:00 |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
2015-12-23 16:12:23 +08:00 |
|
ouyangxuhua
|
de229c0f1c
|
组织资源栏目的文件可以被引用至当前组织下的资源栏目
|
2015-12-17 14:51:02 +08:00 |
|
huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
2015-12-11 12:53:01 +08:00 |
|
huang
|
4e0b442309
|
修改邮箱的时候同步到gitlab
|
2015-12-10 10:50:15 +08:00 |
|
huang
|
9ff41c214b
|
Merge branch 'develop' into dev_hjq
|
2015-12-07 14:40:25 +08:00 |
|
ouyangxuhua
|
c229104d78
|
修改编辑组织标题
|
2015-12-07 13:03:21 +08:00 |
|
huang
|
ab1c945a30
|
修改版本库库权限
自己不能fork自己的项目
|
2015-12-07 10:34:10 +08:00 |
|
huang
|
4cb58211ad
|
邮件消息提示语修改
|
2015-12-04 17:44:46 +08:00 |
|
huang
|
120a7274d3
|
fork样式显示
|
2015-12-04 17:22:22 +08:00 |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
2015-11-27 14:47:16 +08:00 |
 Tim
|
3a66b1859c
|
reserved修改
|
2015-11-24 16:47:31 +08:00 |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
2015-11-24 09:55:26 +08:00 |
|
huang
|
a174cade83
|
commit by hx , 2015/11/13
|
2015-11-23 20:35:37 +08:00 |
|
huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
2015-11-14 15:22:05 +08:00 |
|
huang
|
ddbc9003c2
|
每个用户不能创建同名版本库
不同的用户可以创建不同版本库
更新fork接口方法
|
2015-11-13 20:24:30 +08:00 |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-11-13 17:27:33 +08:00 |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-13 17:21:44 +08:00 |
|
ouyangxuhua
|
ef1bc8aea7
|
组织用户不能为空提示
|
2015-11-13 10:15:39 +08:00 |
|
ouyangxuhua
|
5aea2250c4
|
组织加入成员时，如果没有选择用户，弹窗给出提示
|
2015-11-13 10:14:38 +08:00 |
|
ouyangxuhua
|
2a5eeaa527
|
在组织页面左边，增加项目名称一栏
|
2015-11-13 09:13:57 +08:00 |
 lizanle
|
d13205bd3d
|
文件正在上传提示
|
2015-11-11 11:39:02 +08:00 |
|
lizanle
|
59e95b08d7
|
feed_back
|
2015-11-05 13:49:27 +08:00 |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
2015-11-03 11:19:38 +08:00 |