 ouyangxuhua
|
bd6a1a9d49
|
增加组织动态中的项目问题的回复框
|
2015-11-16 17:21:26 +08:00 |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
2015-11-16 15:02:57 +08:00 |
 cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-16 08:59:54 +08:00 |
 huang
|
ca8b62b8bd
|
Merge branch 'szzh' into gitlab_guange
|
2015-11-14 15:22:05 +08:00 |
 lizanle
|
56613b6358
|
增加项目的显示
|
2015-11-14 10:45:49 +08:00 |
|
huang
|
a40e5c5b54
|
frok功能开发--权限还未完成
|
2015-11-13 17:30:14 +08:00 |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-11-13 17:27:33 +08:00 |
 sw
|
e6cd104ead
|
index界面以及试卷统计相关路由添加
|
2015-11-13 17:23:52 +08:00 |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-13 17:21:44 +08:00 |
|
sw
|
70c5b27a43
|
相关路由
|
2015-11-13 16:40:39 +08:00 |
|
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
2015-11-13 16:34:00 +08:00 |
|
ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
2015-11-13 15:02:12 +08:00 |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
2015-11-12 20:57:41 +08:00 |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
2015-11-12 14:55:31 +08:00 |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
2015-11-12 09:32:00 +08:00 |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
|
cxt
|
ee7b21de72
|
禁用匿评功能
|
2015-11-04 10:54:09 +08:00 |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
2015-11-03 11:19:38 +08:00 |
|
lizanle
|
b7a6bc3614
|
outline url
|
2015-10-30 17:21:12 +08:00 |
|
lizanle
|
578bb2537d
|
课程大纲功能
|
2015-10-29 17:09:03 +08:00 |
|
lizanle
|
ac82910aa5
|
大纲
|
2015-10-29 11:53:52 +08:00 |
|
lizanle
|
b67afc2b95
|
大纲
|
2015-10-29 09:07:26 +08:00 |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +08:00 |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
2015-10-26 10:21:13 +08:00 |
|
lizanle
|
9d89da7e66
|
课程加入消息错误
|
2015-10-24 11:11:49 +08:00 |
|
cxt
|
fde4ce74ba
|
作业配置菜单增加评分设置
|
2015-10-23 14:45:56 +08:00 |
|
lizanle
|
35719f9c28
|
消息处理路由
|
2015-10-22 15:41:20 +08:00 |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
2015-10-22 09:20:19 +08:00 |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
2015-10-21 14:52:00 +08:00 |
 guange
|
acbd690bc6
|
添加转换页面
|
2015-10-18 21:04:04 +08:00 |
|
lizanle
|
bbd3999ab2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-15 17:06:53 +08:00 |
|
lizanle
|
e3a660cf18
|
添加学校
|
2015-10-15 17:06:42 +08:00 |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
2015-10-15 16:22:49 +08:00 |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 17:20:11 +08:00 |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
2015-10-12 17:19:55 +08:00 |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
2015-10-12 15:51:47 +08:00 |
|
huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
2015-10-08 14:23:32 +08:00 |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
2015-09-24 16:46:08 +08:00 |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
2015-09-24 16:30:14 +08:00 |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
2015-09-24 10:15:23 +08:00 |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
2015-09-23 15:44:48 +08:00 |
|
lizanle
|
9443c139f0
|
update forum
|
2015-09-18 17:44:16 +08:00 |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
2015-09-17 20:20:20 +08:00 |
|
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
2015-09-17 16:53:38 +08:00 |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
2015-09-17 16:07:41 +08:00 |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
2015-09-17 14:41:03 +08:00 |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
2015-09-16 17:35:26 +08:00 |
|
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
2015-09-15 10:31:59 +08:00 |
|
huang
|
cc3990de44
|
修改发系统消息后跳转路劲
|
2015-09-11 09:45:28 +08:00 |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:37:53 +08:00 |
|
cxt
|
21565b74fe
|
冲突
|
2015-09-01 16:37:43 +08:00 |
|
guange
|
8ad521d4ab
|
merge
|
2015-09-01 16:19:48 +08:00 |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
2015-09-01 16:18:03 +08:00 |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 15:45:49 +08:00 |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:34:31 +08:00 |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
2015-09-01 15:34:22 +08:00 |
|
sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
2015-09-01 15:28:03 +08:00 |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
2015-09-01 15:17:40 +08:00 |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
|
guange
|
8f426ca040
|
merge
|
2015-08-29 18:22:33 +08:00 |
|
sw
|
a23ec96508
|
学校首页报404
|
2015-08-29 10:07:36 +08:00 |
|
sw
|
51bf1cd678
|
作业搜索支持enter键
|
2015-08-29 09:53:16 +08:00 |
|
guange
|
e8fe397158
|
added
|
2015-08-28 17:20:39 +08:00 |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
2015-08-28 16:47:43 +08:00 |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
2015-08-28 12:04:49 +08:00 |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
2015-08-28 11:32:57 +08:00 |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
2015-08-28 10:00:48 +08:00 |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
2015-08-27 16:03:41 +08:00 |
|
guange
|
b9e08b22cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-26 20:37:49 +08:00 |
|
guange
|
631283ae79
|
remove grack
|
2015-08-26 20:37:43 +08:00 |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 17:31:37 +08:00 |
|
sw
|
049e27f15f
|
发布作业功能
|
2015-08-26 17:29:47 +08:00 |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
2015-08-26 16:33:21 +08:00 |
|
lizanle
|
ccfd69602c
|
服务协议
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
2015-08-24 23:53:28 +08:00 |
|
huang
|
4fd90464d9
|
Merge branch 'sw_new_course' into dev_hjq
|
2015-08-24 11:38:50 +08:00 |
|
huang
|
e129404b4c
|
解决图标点两次的问题
|
2015-08-24 11:11:45 +08:00 |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
2015-08-24 11:04:19 +08:00 |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
2015-08-24 10:39:52 +08:00 |
|
guange
|
3a601bbd2c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-21 19:23:17 +08:00 |
|
sw
|
2a522f144e
|
编辑个人简介
|
2015-08-21 16:29:25 +08:00 |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
|
lizanle
|
705d31b1d0
|
资源库 修改
|
2015-08-20 17:38:30 +08:00 |
|
lizanle
|
76c2c47adf
|
资源库
|
2015-08-20 10:14:26 +08:00 |
|
lizanle
|
76be15f79b
|
资源库
|
2015-08-18 11:53:54 +08:00 |
|
lizanle
|
25460cd255
|
资源库
|
2015-08-18 09:31:03 +08:00 |
|
guange
|
d36da76685
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-08-15 19:47:53 +08:00 |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
2015-08-15 17:10:02 +08:00 |
|
cxt
|
da20f6bc89
|
超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业
|
2015-08-15 17:06:50 +08:00 |
|
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +08:00 |
|
huang
|
2c865069d3
|
所有消息显示功能
|
2015-08-13 22:33:08 +08:00 |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-10 09:12:57 +08:00 |
|
lizanle
|
5d82f3336e
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
2015-08-10 09:12:26 +08:00 |
|
huang
|
e70748fd81
|
去掉项目辅助工具（dts、yun）
|
2015-08-01 09:57:44 +08:00 |
|
sw
|
3e5af49281
|
点击测试时增加事件的发送
|
2015-07-30 20:36:00 +08:00 |
|
sw
|
a68fcf74aa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-29 18:26:21 +08:00 |
|
sw
|
ce89c7d119
|
用户留言后界面的刷新，留言的分页显示
|
2015-07-29 18:26:04 +08:00 |
|
sw
|
9c704b7dc1
|
个人主页留言静态页面
更新css
路由及相关代码整理
|
2015-07-29 10:34:04 +08:00 |
|
lizanle
|
db2a030981
|
导入其他问卷
|
2015-07-29 10:10:41 +08:00 |
|
sw
|
6091369e02
|
增加学校logo的上传功能，以及实时预览效果
|
2015-07-27 18:20:20 +08:00 |
|
sw
|
7c818ce59a
|
admin界面增加学校列表显示，以及按名称过滤功能
|
2015-07-27 16:07:29 +08:00 |
|
huang
|
069dad053b
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/projects_controller.rb
app/views/projects/_tools_expand.html.erb
config/locales/projects/zh.yml
|
2015-07-21 10:40:02 +08:00 |
|
huang
|
654a8078de
|
添加软件知识库
|
2015-07-20 16:28:35 +08:00 |
|
huang
|
8f1a7f47d1
|
dts测试添加测试进度效果
|
2015-07-20 16:03:33 +08:00 |
|
huang
|
e0687c0ab3
|
云化部署
|
2015-07-20 09:31:14 +08:00 |
|
huang
|
c198a03a90
|
DTS测试工具
|
2015-07-19 20:08:57 +08:00 |
|
huang
|
415f457dd4
|
dts接口（未完）
|
2015-07-18 19:13:33 +08:00 |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
2015-07-17 17:38:07 +08:00 |
 yutao
|
00c50d8114
|
个人主页->访客
|
2015-07-14 15:16:15 +08:00 |
|
sw
|
aa5255c430
|
创建作品之后再调用编程作业接口，参数传递增加作品的ID
|
2015-07-10 17:20:04 +08:00 |
|
sw
|
4b275bcbdf
|
根据返回值，作业获取question的id
|
2015-07-10 11:36:44 +08:00 |
|
yutao
|
5c011fd342
|
个人主页
|
2015-07-09 15:27:49 +08:00 |
|
sw
|
5e90684677
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/homework_common_controller.rb
|
2015-07-06 10:44:07 +08:00 |
|
guange
|
f56e48d60a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-07-04 22:31:07 +08:00 |
|
sw
|
2344e3d07f
|
admin用户导出缺失文件列表功能
|
2015-07-02 10:41:08 +08:00 |
|
guange
|
6fa67051e1
|
本项目的成员可以使用自己的用户名和密码克隆
|
2015-07-01 22:54:07 +08:00 |
|
sw
|
f9880a00fd
|
admin界面增加课程列表及相关路由
|
2015-07-01 16:41:17 +08:00 |
|
sw
|
c2e21f7a0c
|
缺评列表导出
|
2015-06-30 15:30:51 +08:00 |
|
sw
|
810561c31b
|
老师才可以查看缺评情况
|
2015-06-19 10:26:56 +08:00 |
|
sw
|
43363e8bcb
|
缺评情况功能
|
2015-06-18 17:56:28 +08:00 |
|
sw
|
61eb3ecc62
|
1、新建作业上一步下一步改为页面刷新
2、下一步路由改为post
|
2015-06-16 14:45:57 +08:00 |
|
sw
|
857d3d5f62
|
问卷调查结果导出功能
|
2015-06-09 17:03:28 +08:00 |
|
sw
|
59c4e04e37
|
删除bid相关路由
|
2015-06-05 09:57:33 +08:00 |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
2015-06-04 15:55:41 +08:00 |
|
sw
|
b935f50b36
|
课程内作业列表、新建作业等路由关闭，相关页面、方法删除
|
2015-06-02 15:20:44 +08:00 |
|
sw
|
cc5171bc1d
|
解决冲突
|
2015-06-02 14:48:48 +08:00 |
|
guange
|
b6d22cfb31
|
添加文件预览接口
|
2015-06-01 23:02:55 +08:00 |
|
sw
|
4d43cd2765
|
点赞功能
|
2015-05-28 16:10:40 +08:00 |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
2015-05-27 19:39:06 +08:00 |
|
sw
|
fea784cbcc
|
1、添加评分回复路由改变
2、删除回复功能及界面刷新
|
2015-05-27 15:11:11 +08:00 |
|
sw
|
a0324f5e39
|
增加评分回复，以及相关显示
评分回复真实信息显示
评分回复以及回复删除
|
2015-05-27 11:25:32 +08:00 |
|
sw
|
c289af2e7c
|
评分
|
2015-05-23 11:24:24 +08:00 |
|
yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程”
|
2015-05-20 11:56:34 +08:00 |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
2015-05-19 17:12:43 +08:00 |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
2015-05-06 11:04:57 +08:00 |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
2015-04-23 17:43:10 +08:00 |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-17 15:07:01 +08:00 |
 z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
2015-04-16 17:28:08 +08:00 |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-16 10:26:03 +08:00 |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
2015-04-15 19:57:16 +08:00 |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
2015-04-14 10:17:42 +08:00 |
|
sw
|
988f8b7918
|
增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
|
2015-04-09 10:33:15 +08:00 |
|
lizanle
|
5299d2d332
|
删除demo代码
|
2015-04-03 15:13:51 +08:00 |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
2015-04-02 17:20:52 +08:00 |
|
z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
2015-03-31 15:57:15 +08:00 |
|
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
2015-03-27 18:17:46 +08:00 |
|
sw
|
2bb7153131
|
去掉作业打包下载功能
|
2015-03-26 14:17:26 +08:00 |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
2015-03-25 10:41:42 +08:00 |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
2015-03-19 17:41:45 +08:00 |
|
guange
|
6c87cd40c1
|
加入git回调接口
|
2015-03-17 20:52:12 +08:00 |
|
lizanle
|
926283398b
|
路由修改
|
2015-03-17 09:41:30 +08:00 |
|
lizanle
|
6bafec03e9
|
添加路由
|
2015-03-16 15:25:41 +08:00 |
|
z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 15:36:16 +08:00 |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
2015-03-07 15:36:00 +08:00 |
 alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 10:52:20 +08:00 |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
2015-03-07 09:32:27 +08:00 |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
2015-03-06 15:36:47 +08:00 |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
2015-03-05 17:37:33 +08:00 |
|
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
2015-03-05 17:03:44 +08:00 |
|
sw
|
5f8595d874
|
admin页面增加组织列表
|
2015-03-05 15:27:22 +08:00 |
|
sw
|
3b4bf8b99d
|
增加组织的index界面，以及index界面到组织首页的跳转
|
2015-03-05 14:15:07 +08:00 |
|
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
2015-02-09 10:28:33 +08:00 |
|
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
2015-01-31 17:14:01 +08:00 |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
2015-01-31 15:43:35 +08:00 |
|
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 17:58:58 +08:00 |
|
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
2015-01-30 17:58:41 +08:00 |
|
alan
|
f2a3ce0ece
|
修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-30 16:05:36 +08:00 |
|
huang
|
29df528af1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
2015-01-30 14:27:56 +08:00 |
|
huang
|
d0a675f2b8
|
企业版模块
|
2015-01-30 14:11:35 +08:00 |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
2015-01-28 12:38:32 +08:00 |
|
sw
|
950d831108
|
Merge branch 'api' into szzh
|
2015-01-27 14:51:15 +08:00 |
|
lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
2015-01-27 14:46:04 +08:00 |
|
sw
|
97c7ccac16
|
增加关闭问卷功能
|
2015-01-27 09:45:15 +08:00 |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
2015-01-23 10:33:07 +08:00 |
|
sw
|
90a81ee1f1
|
增加网站项目首页加入项目的功能
|
2015-01-22 17:03:01 +08:00 |
|
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
2015-01-21 17:51:12 +08:00 |
|
lizanle
|
6c0f47d96d
|
日志路由
|
2015-01-22 16:40:22 +08:00 |
|
sw
|
7b9d88ecfe
|
问卷调查增加重新发布功能
|
2015-01-20 11:42:28 +08:00 |
|
lizanle
|
027f6592ef
|
日志查看路由
|
2015-01-19 14:07:27 +08:00 |
|
sw
|
79ad33a90f
|
增加发布问卷的路由
|
2015-01-16 15:57:49 +08:00 |
|
sw
|
c4bedfb369
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
app/controllers/poll_controller.rb
|
2015-01-15 18:22:05 +08:00 |
|
sw
|
d55492b07a
|
增加修改单选题的路由、action、以及js
|
2015-01-15 18:17:45 +08:00 |
|
z9hang
|
77dc9607df
|
简答题答题
|
2015-01-15 17:36:30 +08:00 |
|
sw
|
3fab26214f
|
删除单选题后页面数据的删除，增加删除题目的路由及相关方法
|
2015-01-15 17:15:29 +08:00 |
|
sw
|
a99d7c5145
|
1、分离出新建问卷问题页面
2、增加修改问题相关路由及action
|
2015-01-15 14:40:17 +08:00 |
|
z9hang
|
8dab2057a9
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
config/routes.rb
|
2015-01-15 09:42:41 +08:00 |
|
z9hang
|
6d82e79e7f
|
答题相关方法添加
|
2015-01-15 09:41:19 +08:00 |
|
sw
|
eb2498c62c
|
1.增加新增单选题、新增选项、删除选项等js
2.修改问卷layout增加
3.增加新增单选题确定按钮的路由以及相关action
|
2015-01-14 14:23:41 +08:00 |
|
sw
|
311d90d565
|
1.增加点击单选、多选、单行文本、多行文本的js
2.分割问卷标题头
3.增加新增问题的路由及action
|
2015-01-13 20:13:50 +08:00 |
|
sw
|
fc72d6f9a9
|
1.增加问卷统计、问卷答卷等页面跳转，并增加对应路由
2.调整页面样式
3.动态分页
|
2015-01-13 15:59:02 +08:00 |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
2015-01-13 15:12:05 +08:00 |
|
sw
|
d0a6fa64e5
|
修改路由
|
2015-01-12 16:27:47 +08:00 |
|
sw
|
c964194d85
|
增加问卷调查相关的路由、action、以及部分对应的页面
|
2015-01-12 16:02:15 +08:00 |
|
huang
|
f7c1b76b3d
|
用户反馈弹框模块！
|
2015-01-10 15:39:02 +08:00 |
|
z9hang
|
35dce16924
|
课程成员列表excel导出
|
2014-12-30 17:49:48 +08:00 |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-19 23:12:32 +08:00 |
|
alan
|
f9a86356ad
|
添加《重新发送激活邮件》功能to注册模块
Signed-off-by: alan <547533434@qq.com>
|
2014-12-19 10:51:53 +08:00 |
|
alan
|
1965b75d92
|
添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-18 18:24:37 +08:00 |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-17 17:36:12 +08:00 |
|
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
2014-12-17 16:41:28 +08:00 |
|
alan
|
5c33c578bb
|
增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-08 16:50:20 +08:00 |
|
alan
|
c9b84d0a35
|
增加《学生加入，退出分组》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-04 22:02:10 +08:00 |
|
alan
|
9765f11f7e
|
增加<修改，添加分组>功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-04 19:09:10 +08:00 |
|
alan
|
615bc7d444
|
增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-03 19:17:10 +08:00 |
www
|
53ecf8718f
|
[api]用户认证完成
|
2014-11-27 19:43:04 +08:00 |
|
z9hang
|
68505239f9
|
课程资源搜索功能，暂时屏蔽排序功能
|
2014-11-21 11:38:53 +08:00 |
|
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
2014-11-20 17:44:30 +08:00 |
|
z9hang
|
eeda25add1
|
设置资源公开与私有功能
|
2014-11-19 11:03:23 +08:00 |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
2014-11-19 10:07:49 +08:00 |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
2014-11-18 18:02:01 +08:00 |
|
alan
|
ad6b32ff50
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-11 17:01:29 +08:00 |
|
alan
|
2cea3178d6
|
添加邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
2014-11-11 17:01:07 +08:00 |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
2014-11-08 16:40:36 +08:00 |
|
sw
|
be500eb0d2
|
增加开启匿评关闭匿评弹出框动态显示
|
2014-11-07 10:02:13 +08:00 |
|
alan
|
591fc409b3
|
修改bug<forge网站的项目缺陷的关联问题机制有问题>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-05 15:01:36 +08:00 |
|
alan
|
495c4db43e
|
增加功能<增加学生列表是否公开功能>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-03 17:00:01 +08:00 |
|
alan
|
8cec84dca7
|
添加<公共贴吧 无帖子置顶功能 建议增加>，<管理员可以根据贴吧的热度选择将贴吧置顶>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-03 15:16:56 +08:00 |
 gonglexin
|
e8e7708d6e
|
作业匿评功能
|
2014-11-02 14:38:43 +08:00 |
|
z9hang
|
96626eeb6b
|
恢复respond_path路由并修改部分respond_path
恢复homework_list.html.erb文件
|
2014-11-02 10:20:28 +08:00 |
|
sw
|
8a7757f3c2
|
1.整理踩、赞页面代码
2.增加作业点赞功能
3.作业列表界面增加是否已经点赞判断
|
2014-11-02 09:39:18 +08:00 |
|
z9hang
|
5cbbb98536
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
2014-11-01 15:14:50 +08:00 |
|
z9hang
|
79b7373446
|
留言修改
|
2014-11-01 15:06:03 +08:00 |
|
sw
|
2dc79889b9
|
1.增加访问界面时根据角色不同显示不同界面
2.增加学生创建作业、删除作业功能
3.修改学生创建作业时的路由
|
2014-11-01 14:33:50 +08:00 |
|
sw
|
58d2306728
|
增加学生进入课程作业界面后相关的路由、界面动态切换显示
|
2014-11-01 11:02:13 +08:00 |
|
sw
|
e6fdda1702
|
修改未批、已批、全部作业、留言action的路由
|
2014-10-31 10:21:38 +08:00 |
|
sw
|
3fa5a4b3c5
|
1.增加课程留言界面的路由
2.增加点击已批作业、未批作业、全部作业、留言的ajax调用
3.实现点击已批作业、未批作业、全部作业、留言时界面切换
|
2014-10-30 16:33:14 +08:00 |
|
sw
|
afa1ef22d5
|
1.未批作业改为动态页面
2.优化分页查询代码
3.修改页面css样式
4.增加查找未批作业路由以及相应的action
|
2014-10-30 15:12:45 +08:00 |
|
alan
|
7487c538f3
|
Signed-off-by: alan <547533434@qq.com>
|
2014-10-30 10:06:35 +08:00 |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
2014-10-23 11:30:34 +08:00 |
|
z9hang
|
f15c870053
|
1、代码优化。2、项目新建项目后个人主页中项目tab页点击报错问题
|
2014-10-21 10:40:03 +08:00 |
|
z9hang
|
e4ff85894d
|
1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
|
2014-10-17 15:02:09 +08:00 |
|
z9hang
|
2cabec22f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-10-16 15:07:53 +08:00 |
|
z9hang
|
258967263e
|
1、代码优化。2、很多页面标题不正确问题
|
2014-10-16 15:07:36 +08:00 |
|
sw
|
4c41c10e0d
|
首页增加加入课程按钮，用户可以输入课程ID以及课程密码加入对应的课程，已过期课程会给出对应提示
|
2014-10-16 10:56:13 +08:00 |
|
sw
|
97f66a2b08
|
Merge branch 'develop' into szzh
|
2014-10-14 17:18:15 +08:00 |
|
z9hang
|
af59cef90b
|
网站页脚配置功能
|
2014-10-13 17:38:59 +08:00 |
|
sw
|
7a710a4a8f
|
去除掉部分无用预览按钮
|
2014-10-13 09:40:49 +08:00 |
|
z9hang
|
ddca1a0316
|
#1331 创新竞赛：点击竞赛“ 2014 年 Android 程序设计竞赛 ”返回404错误 原因，1、路由缺失，补上路由。2、更多链接处加上参数。3、对应show_contest_user方法中一个@users写错成@uers修正之
|
2014-10-08 14:57:26 +08:00 |
|
alan
|
02470491bd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/index.html.erb
|
2014-09-17 15:33:47 +08:00 |
|
alan
|
f44dbf76ac
|
测试course路由
Signed-off-by: alan <547533434@qq.com>
|
2014-09-17 15:17:43 +08:00 |
|
sw
|
98b6be61ba
|
1.修复回复贴吧信息错误后错误信息不及时清除的BUG
2.修复课程讨论区新建帖子跳转页面为回复的BUG
3.修复新建作业后报错的BUg
解决方案：路由错误
|
2014-09-17 12:31:53 +08:00 |
|
alan
|
dea1a299af
|
修改competition的view文件，将其中不规范的代码进行修改，并将其中所有的link_to
修改成"link_to ‘welcome’ home_path, {option}" 的形式；
统一route风格
match 'path', :to => 'controller#action'
如果 path = controller#action 则 match 'path'
Example:
match 'welcome/course', :to => 'welcome#course' 变成 match 'welcome/cource'
Signed-off-by: alan <547533434@qq.com>
|
2014-09-12 16:45:03 +08:00 |
|
alan
|
64eb4d362c
|
将contest主页中通知公告的颜色改成蓝色
Signed-off-by: alan <547533434@qq.com>
|
2014-09-11 00:33:12 +08:00 |
linhk
|
9f3392eba8
|
删除主留言时确认删除的提示信息
|
2014-08-23 16:41:07 +08:00 |