 guange
|
ed649e0724
|
@颜色修改
|
2015-12-17 15:54:29 +08:00 |
 lizanle
|
1809a93770
|
editor修改
|
2015-12-17 15:41:36 +08:00 |
|
lizanle
|
4bc68081ee
|
editor修改
|
2015-12-17 15:15:00 +08:00 |
|
lizanle
|
8d58b045f1
|
文件链接却弹出图片框 bug
|
2015-12-17 09:55:02 +08:00 |
|
lizanle
|
66f88cdf5a
|
issue 文件
|
2015-12-16 16:55:07 +08:00 |
|
lizanle
|
b13ae8f599
|
issue
|
2015-12-16 15:55:40 +08:00 |
 cxt
|
dc0f004021
|
关联项目的提示信息
|
2015-12-16 15:47:30 +08:00 |
|
lizanle
|
2aa241bffa
|
issue
|
2015-12-16 11:50:30 +08:00 |
|
cxt
|
bfde278340
|
学生作品列表的样式调整
|
2015-12-16 11:02:52 +08:00 |
|
lizanle
|
02a9f08fe6
|
表单长度对齐
|
2015-12-16 10:19:48 +08:00 |
|
lizanle
|
68aceaa7df
|
issue下载
|
2015-12-15 18:43:58 +08:00 |
|
guange
|
4ce9eb428e
|
at样式问题
|
2015-12-15 16:28:11 +08:00 |
|
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-15 16:03:26 +08:00 |
|
cxt
|
0deffdba33
|
在线测验学生答题时可点击保存也可点击提交
|
2015-12-15 15:21:52 +08:00 |
|
guange
|
da5709e3f0
|
.
|
2015-12-15 14:52:24 +08:00 |
|
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
|
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
|
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
|
cxt
|
af0e592d8a
|
匿评日期的设置
|
2015-12-14 17:03:20 +08:00 |
|
cxt
|
d7b690e53a
|
匿评设置时匿评关闭日期可以等于匿评开启日期
|
2015-12-14 16:54:28 +08:00 |
 ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
2015-12-14 16:41:18 +08:00 |
 huang
|
a791c39b4b
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:12:25 +08:00 |
|
cxt
|
dfd0c95f2a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:11:48 +08:00 |
|
huang
|
616679e9c1
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:07:57 +08:00 |
|
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-11 16:58:19 +08:00 |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
2015-12-11 16:30:50 +08:00 |
|
cxt
|
d4bde8e73c
|
调整学生作品列表的样式
|
2015-12-11 16:05:18 +08:00 |
|
lizanle
|
d1423ebc7e
|
ke高度小修改。
|
2015-12-11 15:41:41 +08:00 |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
2015-12-11 14:59:52 +08:00 |
|
cxt
|
f880ccd749
|
分组作业
|
2015-12-11 14:57:09 +08:00 |
|
huang
|
35c918cb40
|
Merge branch 'hjq_new_course' into develop
|
2015-12-11 11:02:09 +08:00 |
|
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
2015-12-11 09:42:19 +08:00 |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
2015-12-10 18:59:54 +08:00 |
|
ouyangxuhua
|
48e7aa78d1
|
项目加载更多样式问题
|
2015-12-10 17:00:24 +08:00 |
|
ouyangxuhua
|
0a85fbf613
|
1.配置栏目列表，增加类型一列；
2.暂时隐藏类型为“资源”的栏目的链接
|
2015-12-10 15:53:05 +08:00 |
|
ouyangxuhua
|
1a7a97dbc5
|
引用了ke的页面下方存在一个可见的uploadbutton
|
2015-12-09 15:53:36 +08:00 |
|
cxt
|
53f9141cf1
|
分组作业动态
|
2015-12-09 10:29:54 +08:00 |
|
guange
|
3476731b83
|
将at js data整合到文件中
|
2015-12-09 09:59:13 +08:00 |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
|
huang
|
3459164e64
|
过滤条件样式
|
2015-12-07 17:25:32 +08:00 |
|
huang
|
5f6d9f2425
|
项目动态新样式
|
2015-12-07 17:14:13 +08:00 |
|
cxt
|
cb7ad682cf
|
Merge branch 'develop' into cxt_course
|
2015-12-07 15:21:43 +08:00 |
|
guange
|
57d05d147e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-12-07 15:06:15 +08:00 |
|
guange
|
71a5504017
|
去除at功能,合并
|
2015-12-07 15:05:51 +08:00 |
|
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
2015-12-07 14:31:08 +08:00 |
|
guange
|
1a2aff99be
|
调整显示的格式
|
2015-12-07 14:18:01 +08:00 |
|
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
2015-12-07 12:53:51 +08:00 |
 Tim
|
75d79c6c47
|
问题跟踪样式调整
|
2015-12-07 10:14:39 +08:00 |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
2015-12-07 09:47:18 +08:00 |
|
guange
|
7e5a7fce29
|
加入atwho
|
2015-12-06 15:04:07 +08:00 |
|
guange
|
af31946586
|
issue列表开启AT功能
|
2015-12-06 15:03:12 +08:00 |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
2015-12-05 11:39:40 +08:00 |
|
ouyangxuhua
|
01b82e59d8
|
实现组织首页功能
|
2015-12-05 11:30:05 +08:00 |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
2015-12-04 17:34:48 +08:00 |
|
Tim
|
7e86d8fdf1
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 16:49:37 +08:00 |
|
Tim
|
d115a97f78
|
追加附件效果调整
|
2015-12-04 16:49:14 +08:00 |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
2015-12-04 16:43:48 +08:00 |
|
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
2015-12-04 10:59:14 +08:00 |
|
cxt
|
fd51b02e16
|
添加修订附件
|
2015-12-03 18:33:08 +08:00 |
|
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
2015-12-03 09:17:36 +08:00 |
|
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
2015-12-02 11:14:46 +08:00 |
|
lizanle
|
8f4c915c57
|
博客的非空验证bug
|
2015-12-01 17:33:18 +08:00 |
|
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
2015-11-30 11:07:53 +08:00 |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
|
huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
2015-11-27 17:17:21 +08:00 |
|
Tim
|
06ca4c8f4b
|
作品列表样式调整
|
2015-11-27 16:52:28 +08:00 |
|
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
2015-11-27 15:21:32 +08:00 |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
2015-11-27 15:19:13 +08:00 |
|
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
2015-11-27 14:56:30 +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 |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
2015-11-27 13:52:40 +08:00 |
Gan Yi.ang
|
ee85cc35ed
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 11:27:03 +08:00 |
|
Gan Yi.ang
|
1115d54d9a
|
非trustie用户changesets_latest_coimmit
|
2015-11-27 11:25:16 +08:00 |
|
Tim
|
2d14b66336
|
作品列表样式调整
|
2015-11-27 10:56:46 +08:00 |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
2015-11-27 10:49:41 +08:00 |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
2015-11-27 09:50:17 +08:00 |
|
cxt
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
2015-11-26 16:57:51 +08:00 |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
2015-11-26 16:29:50 +08:00 |
|
Tim
|
a0c73a5a54
|
单选题样式调整
|
2015-11-26 10:27:32 +08:00 |
|
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
2015-11-25 15:16:33 +08:00 |
|
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
2015-11-25 09:38:13 +08:00 |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
2015-11-24 17:29:57 +08:00 |
|
Tim
|
269d2f992e
|
组织列表搜索框调整后注释
|
2015-11-24 15:02:25 +08:00 |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-20 20:25:17 +08:00 |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
2015-11-20 14:30:54 +08:00 |
|
cxt
|
acaac93da1
|
tijiao
|
2015-11-20 11:08:50 +08:00 |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
2015-11-19 15:03:56 +08:00 |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
2015-11-18 16:52:03 +08:00 |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
2015-11-18 16:05:08 +08:00 |
|
lizanle
|
47bae2dd79
|
去掉段落的字符之间的间距
|
2015-11-18 15:18:31 +08:00 |
|
ouyangxuhua
|
b231b44e81
|
1.项目和课程中，添加翻页提醒；
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
|
2015-11-18 11:12:40 +08:00 |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
2015-11-18 10:57:17 +08:00 |
|
cxt
|
265fe08b2c
|
在线测验
|
2015-11-18 10:49:57 +08:00 |
|
lizanle
|
7c1e9f0042
|
MathJax这些资源不能少。少了会在一些浏览器上出bug
|
2015-11-18 09:58:09 +08:00 |
|
cxt
|
cc08e5e32e
|
保存测验信息
|
2015-11-17 18:22:31 +08:00 |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
2015-11-17 17:34:50 +08:00 |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
2015-11-17 16:48:03 +08:00 |
|
lizanle
|
94831443a5
|
MathJax的js
|
2015-11-17 15:24:06 +08:00 |
|
cxt
|
034a92bb7b
|
新建测验页面
|
2015-11-17 15:18:07 +08:00 |
|
ouyangxuhua
|
687c0c8306
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/org_document_comments/edit.html.erb
|
2015-11-16 15:50:46 +08:00 |
|
cxt
|
c50bcf9331
|
对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中”
|
2015-11-16 10:56:00 +08:00 |
|
lizanle
|
56613b6358
|
增加项目的显示
|
2015-11-14 10:45:49 +08:00 |
|
ouyangxuhua
|
b6d785bda0
|
修改编辑组织文章样式问题
|
2015-11-13 19:10:44 +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
|
3451ced888
|
添加我的组织页面及修改bug
|
2015-11-13 16:34:00 +08:00 |
|
lizanle
|
c2e783d78b
|
设置 删除 编辑按钮做成项目一样的
|
2015-11-12 19:19:01 +08:00 |
|
lizanle
|
b24fadea05
|
设置 删除 编辑按钮做成项目一样的
|
2015-11-12 19:15:35 +08:00 |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
2015-11-12 17:52:47 +08:00 |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-12 17:20:11 +08:00 |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
2015-11-12 16:52:42 +08:00 |
|
lizanle
|
6b7dd81509
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-12 16:35:30 +08:00 |
|
lizanle
|
506709b474
|
个人资源库，课程 资源文件上传
1.单个上传
2.给出明确的提示
3.按钮联动
|
2015-11-12 16:35:13 +08:00 |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
2015-11-12 09:32:00 +08:00 |
|
Tim
|
aed305f5bf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 17:16:37 +08:00 |
|
Tim
|
7dd299255b
|
博客页面微调
|
2015-11-11 17:16:19 +08:00 |
|
lizanle
|
4b26af8920
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-11 16:03:00 +08:00 |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
2015-11-11 16:02:37 +08:00 |
|
Tim
|
465c5958f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 15:36:06 +08:00 |
|
Tim
|
b8999e1c6e
|
博客标题输入框宽度调整
|
2015-11-11 15:35:47 +08:00 |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
2015-11-11 11:39:02 +08:00 |
|
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
2015-11-11 11:19:10 +08:00 |
|
lizanle
|
db0978c657
|
编辑的时候报500
|
2015-11-10 17:07:37 +08:00 |
|
lizanle
|
94367eee82
|
Merge branch 'dev_zanle' into szzh
|
2015-11-10 15:26:48 +08:00 |
|
lizanle
|
c20ff6980b
|
进度条不见了bug。
|
2015-11-10 15:22:10 +08:00 |
|
lizanle
|
82c377a60a
|
在导航处上传文件不可用
|
2015-11-10 15:18:13 +08:00 |
|
lizanle
|
dcdffe5d04
|
上传文件的进度条不见了。
|
2015-11-10 14:37:16 +08:00 |
|
lizanle
|
8d94f57ec3
|
上传文件的进度条不见了。
|
2015-11-10 14:33:46 +08:00 |
|
cxt
|
0c43a703ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 14:18:53 +08:00 |
|
cxt
|
4adc6deabf
|
配置课程页面的开课学期不可更改，弹框提醒用户。
|
2015-11-10 14:18:39 +08:00 |
|
Tim
|
679ec44f8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/student_work/_evaluation_work.html.erb
|
2015-11-10 09:23:01 +08:00 |
|
Tim
|
d9610d2694
|
作品列表提示标签
|
2015-11-10 09:12:12 +08:00 |
|
lizanle
|
157ba12513
|
资源库虚线问题
|
2015-11-09 14:04:51 +08:00 |
|
cxt
|
463262e838
|
提交作品时立马弹框
|
2015-11-09 11:16:19 +08:00 |
|
cxt
|
7f63ceea76
|
作品信息确认框的附件可下载
|
2015-11-06 15:47:32 +08:00 |
|
huang
|
d2b56e2811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-06 14:40:37 +08:00 |
|
cxt
|
3e5f44784f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-06 10:24:45 +08:00 |
|
cxt
|
5e9cc27c11
|
发布作业时的发布日期若未选择则默认为当天
|
2015-11-06 09:56:37 +08:00 |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
|
Tim
|
3b6e3f6ecf
|
作品列表修改
|
2015-11-05 17:02:58 +08:00 |
|
cxt
|
b13ed0d722
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-05 16:44:32 +08:00 |
|
Tim
|
7418330fdd
|
作品列表样式调整
|
2015-11-05 15:48:58 +08:00 |
|
cxt
|
9be1fe63b4
|
默认发布日期的格式
|
2015-11-05 15:45:21 +08:00 |
|
Tim
|
060c40fa24
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-05 14:45:42 +08:00 |
|
Tim
|
223b17d8fe
|
普通作品列表、系统评分作品列表、匿评作品列表格式修改
|
2015-11-05 14:45:22 +08:00 |