 cxt
|
39151c0e65
|
班级-多重角色的显示错误：当一个成员的身份是：助教和学生时，角色切换按钮显示的是“学生身份”和“教师身份” 正确的应该是“学生身份”和“助教身份”
|
2016-10-13 14:14:32 +08:00 |
|
cxt
|
b8296f3e7e
|
首页的课程列表显示缺漏
|
2016-10-13 14:08:20 +08:00 |
|
cxt
|
018a27f307
|
课程大纲的教师团队：创建班级数与参与班级数均为该老师在本课程下的创建班级数与参与班级数
|
2016-10-13 14:05:50 +08:00 |
|
cxt
|
b240f801b8
|
创建班级，和班级设置里面，开始学期和结束学期的范围，请往前扩大3年
|
2016-10-13 11:30:41 +08:00 |
|
cxt
|
59f2478cae
|
首页动态过滤 “课程动态” -》“班级动态”
|
2016-10-13 11:25:26 +08:00 |
|
cxt
|
d87e4f368a
|
学生答完问卷后的显示界面调整，提交问卷时的必答题的判断，新建题目时先不输入标题会提示“标题不能为空”、接着输入标题后依然提示“标题不能为空”
|
2016-10-13 11:22:38 +08:00 |
 huang
|
e2ee75d8c1
|
项目宽版架构优化（主要是model及与课程等模块的分离）
|
2016-10-13 10:52:48 +08:00 |
|
huang
|
39cc6c36ea
|
issue详情显示调整
|
2016-10-13 10:17:54 +08:00 |
|
cxt
|
8b4c02ec98
|
问卷增加其他选项、多行主观题的改版
|
2016-10-13 10:17:09 +08:00 |
 yuanke
|
0265b6bfb7
|
搜索分页修改
|
2016-10-13 09:52:05 +08:00 |
 Tim
|
746e27903e
|
版本显示与提交变更页面宽度调整
|
2016-10-13 09:49:34 +08:00 |
|
huang
|
dd4d20011d
|
公共资源库显示优化
|
2016-10-13 09:43:53 +08:00 |
|
yuanke
|
068a66ac35
|
搜索修改
|
2016-10-13 09:42:53 +08:00 |
 daiao
|
07b98bae5e
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-13 09:28:47 +08:00 |
|
daiao
|
a0aa34b533
|
项目设置，模块页面
|
2016-10-13 09:28:33 +08:00 |
|
yuanke
|
9911faaa49
|
优化下回复相关的微信动态
|
2016-10-13 09:25:18 +08:00 |
|
huang
|
edf2a059e8
|
Merge branch 'develop' into rep_quality
|
2016-10-13 09:00:35 +08:00 |
|
yuanke
|
5ac30fe09c
|
Merge branch 'cxt_replies' into weixin_guange
|
2016-10-13 08:49:20 +08:00 |
|
yuanke
|
a7aa0b3a84
|
微信回复加上root_id
|
2016-10-13 08:47:55 +08:00 |
|
Tim
|
8459779e6f
|
个人主页签名折行显示
|
2016-10-12 17:26:53 +08:00 |
|
huang
|
b9b20ccc59
|
项目配置，各个页面高度JS控制
|
2016-10-12 17:18:35 +08:00 |
|
yuanke
|
e52026142a
|
主页搜索功能的下一页修改
|
2016-10-12 17:10:38 +08:00 |
|
Tim
|
63a496d0d3
|
博客详情页面全文显示
|
2016-10-12 17:04:16 +08:00 |
|
daiao
|
065ec67417
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-12 17:03:33 +08:00 |
|
huang
|
4348ae653f
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-12 17:03:05 +08:00 |
|
huang
|
10778fabc9
|
新版版本库界面代码整理
|
2016-10-12 17:02:51 +08:00 |
|
daiao
|
4093847017
|
Merge branch 'develop' into dev_newproject
|
2016-10-12 16:29:14 +08:00 |
|
daiao
|
b925ee312e
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-12 16:28:02 +08:00 |
|
daiao
|
9b5999eed1
|
项目Issue列表功能
|
2016-10-12 16:27:50 +08:00 |
|
huang
|
50f9c5244d
|
项目配置--版本库代码简化及界面
|
2016-10-12 16:09:17 +08:00 |
|
Tim
|
af4ace1319
|
将匿评和分数提示弹框在右侧固定位置显示
|
2016-10-12 16:00:10 +08:00 |
|
huang
|
fabe6bd999
|
项目配置过短的时候JS控制底端留白
|
2016-10-12 14:38:46 +08:00 |
|
huang
|
2126364a19
|
新版项目配置及JS
|
2016-10-12 14:13:52 +08:00 |
|
cxt
|
399b982e0d
|
問卷
|
2016-10-12 13:34:09 +08:00 |
|
huang
|
7800ba9701
|
项目动态头部
|
2016-10-12 11:09:41 +08:00 |
|
huang
|
57d1397597
|
版本库界面优化（未完）
|
2016-10-12 10:45:14 +08:00 |
|
Tim
|
c693afdee8
|
project.css去重，提取到public.css
|
2016-10-11 17:26:36 +08:00 |
|
cxt
|
a581f989c9
|
给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复
|
2016-10-11 14:08:44 +08:00 |
|
huang
|
a206a471af
|
Merge branch 'dev_newproject' into dev_newrep
Conflicts:
app/controllers/repositories_controller.rb
app/views/layouts/base_projects.html.erb
|
2016-10-11 10:58:37 +08:00 |
|
huang
|
dd452f9efe
|
Merge branch 'dev_daiao_temp' into develop
|
2016-10-11 10:32:26 +08:00 |
|
huang
|
7e0a5952f2
|
issue列表新界面
|
2016-10-11 10:24:38 +08:00 |
|
huang
|
227965aafe
|
新版base完成
|
2016-10-11 10:16:17 +08:00 |
|
huang
|
3c15c4f315
|
版本库权限，及项目收藏用户列表
|
2016-10-11 10:03:00 +08:00 |
|
daiao
|
61b07e3f13
|
资源库，公有资源/我的资源中，根据大小，下载数，上传时间排序时，箭头样式不对
|
2016-10-11 09:53:27 +08:00 |
|
huang
|
188db13c33
|
项目导航权限判断
|
2016-10-11 09:31:17 +08:00 |
|
huang
|
e9a1582b71
|
项目添加收藏功能
|
2016-10-11 09:30:45 +08:00 |
|
cxt
|
405e2cfb9b
|
问卷单选题
|
2016-10-11 08:51:00 +08:00 |
|
daiao
|
850a88c6b0
|
组织帖子，回复有时不可用
|
2016-10-10 17:31:39 +08:00 |
|
cxt
|
c06e2bf4c6
|
新建班级
|
2016-10-10 15:43:30 +08:00 |
|
cxt
|
5a725dd074
|
去掉公共贴吧为空时的提示信息
|
2016-10-10 15:39:53 +08:00 |
|
cxt
|
3217f84df2
|
问卷的单选题
|
2016-10-10 14:13:20 +08:00 |
|
yuanke
|
163abb70de
|
课程搜索只能搜索title
|
2016-10-10 14:00:10 +08:00 |
|
huang
|
17743457e1
|
项目menu导航
|
2016-10-10 10:41:41 +08:00 |
|
yuanke
|
b94553edcd
|
搜索修改及代码优化
|
2016-10-10 09:38:21 +08:00 |
|
huang
|
bd29a637b6
|
新版项目
|
2016-10-09 17:24:37 +08:00 |
|
cxt
|
4de0105d99
|
问卷头部的修改
|
2016-10-09 17:05:32 +08:00 |
|
daiao
|
41ee915ece
|
数据为空时，帮助中心，问题和建议报500
|
2016-10-09 16:55:41 +08:00 |
|
cxt
|
9f72539845
|
本地版新建班级报500
|
2016-10-09 16:11:34 +08:00 |
|
yuanke
|
9ca685ea94
|
搜索课程
|
2016-10-09 16:10:33 +08:00 |
|
cxt
|
2cc2d8e562
|
课程班级列表的“加入班级”样式调整
|
2016-10-09 16:05:36 +08:00 |
|
yuanke
|
c4de8cf948
|
调试
|
2016-10-09 16:00:41 +08:00 |
|
cxt
|
38589641a3
|
删除未命名的问卷
|
2016-10-09 15:44:16 +08:00 |
|
huang
|
acb6fcfc81
|
Merge branch 'develop' into dev_newrep
|
2016-10-09 15:36:49 +08:00 |
|
huang
|
125a389448
|
数据为空的时候“帮助中心”500问题
|
2016-10-09 15:33:22 +08:00 |
|
yuanke
|
85e0a1df67
|
搜索课程
|
2016-10-09 15:20:52 +08:00 |
|
huang
|
2e94fbee81
|
项目、课程、组织资源描述过长不能提交的问题
|
2016-10-09 15:09:18 +08:00 |
|
yuanke
|
5d5306dede
|
搜索课程
|
2016-10-09 15:05:50 +08:00 |
|
yuanke
|
fdcb13a3de
|
搜索
|
2016-10-09 13:57:27 +08:00 |
|
yuanke
|
11edc93c0f
|
搜索课程
|
2016-10-09 13:48:38 +08:00 |
|
huang
|
d827b3e519
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-09 13:44:46 +08:00 |
|
huang
|
5f1458483c
|
修改attachment字段类型，解决字段长不能上传的问题
|
2016-10-09 13:44:32 +08:00 |
|
yuanke
|
c90d8d6bea
|
搜索课程
|
2016-10-09 13:32:31 +08:00 |
|
yuanke
|
28d6bca3df
|
搜索课程
|
2016-10-09 13:29:13 +08:00 |
|
yuanke
|
9dd6a65316
|
搜索课程
|
2016-10-09 13:16:03 +08:00 |
|
yuanke
|
1fe2f8946b
|
搜索课程.
|
2016-10-09 12:10:34 +08:00 |
|
yuanke
|
f380c64653
|
搜索课程
|
2016-10-09 11:27:35 +08:00 |
|
cxt
|
3b44f05b2b
|
博客的详情页回复分页、博客列表的回复数未统计二级回复
|
2016-10-09 11:12:44 +08:00 |
|
yuanke
|
cd34388909
|
搜索课程
|
2016-10-09 11:01:52 +08:00 |
|
yuanke
|
eb3a463166
|
Merge branch 'develop' into weixin_guange
|
2016-10-09 10:36:18 +08:00 |
|
yuanke
|
d407b5ab10
|
搜索中加入课程
|
2016-10-09 10:35:43 +08:00 |
|
cxt
|
c1e2642a61
|
课程大纲上传的附件允许所有人下载
|
2016-10-09 09:56:36 +08:00 |
|
cxt
|
b123192286
|
分组作业的匿评分配
|
2016-10-09 09:48:55 +08:00 |
|
huang
|
45d8e64840
|
修改gitlab tree返回类型（lastrev）
|
2016-10-09 09:30:20 +08:00 |
|
cxt
|
f0e334d33d
|
分组作业的迟交扣分和缺评扣分
|
2016-10-09 09:16:05 +08:00 |
|
daiao
|
da630a728e
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-10-09 09:02:39 +08:00 |
|
daiao
|
b259f92381
|
一级帖子栏目默认展示5个，点击可进入详情页面，
|
2016-10-09 09:02:12 +08:00 |
|
cxt
|
7a72e7e839
|
课程大纲的附件样式
|
2016-10-08 19:07:52 +08:00 |
|
cxt
|
bfb175752d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-08 18:08:18 +08:00 |
|
cxt
|
12d70c6999
|
分组作业编辑时“基于项目实施”的设置不起作用
|
2016-10-08 18:06:09 +08:00 |
|
cxt
|
f332f2a469
|
组织文章的回复作分页
|
2016-10-08 17:50:06 +08:00 |
|
Tim
|
f1e7e54816
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-08 17:38:57 +08:00 |
|
Tim
|
e675050b21
|
Merge branch 'rep_quality' into develop
|
2016-10-08 17:38:43 +08:00 |
|
Tim
|
1db5064486
|
新的合并请求样式调整
|
2016-10-08 17:37:41 +08:00 |
|
huang
|
c03384f122
|
Merge branch 'develop' into dev_newrep
|
2016-10-08 17:29:59 +08:00 |
|
huang
|
4a666d6972
|
Merge branch 'rep_quality' into develop
|
2016-10-08 17:27:30 +08:00 |
|
huang
|
f3f59c727c
|
提示语
|
2016-10-08 17:21:30 +08:00 |
|
huang
|
baf556bd39
|
提示语
|
2016-10-08 17:20:27 +08:00 |
|
Tim
|
6e93b0dc0d
|
项目去掉右侧白色块后，样式调整
|
2016-10-08 17:08:07 +08:00 |
|
cxt
|
4aca50e62d
|
超级管理员可以给课程添加教师
|
2016-10-08 16:46:59 +08:00 |
|
cxt
|
277c1468dd
|
班级设置报500
|
2016-10-08 16:41:06 +08:00 |
|
cxt
|
f7e5a41f5e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-08 16:22:47 +08:00 |
|
cxt
|
ed05880653
|
https的链接转换
|
2016-10-08 16:22:37 +08:00 |
|
huang
|
937f93e756
|
Merge branch 'develop' into dev_newrep
|
2016-10-08 16:05:47 +08:00 |
|
huang
|
b22d3c9882
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-08 16:04:55 +08:00 |
|
huang
|
30e6bd6d0e
|
超级管理员看他人的项目列表500问题
|
2016-10-08 16:04:35 +08:00 |
|
huang
|
54b66b86dc
|
0
|
2016-10-08 15:58:05 +08:00 |
|
cxt
|
9d65d61f2a
|
教师团队中只有一个教师时不应有上移功能
|
2016-10-08 15:56:43 +08:00 |
|
Tim
|
053e66c464
|
分组作业宽度调整
|
2016-10-08 15:37:55 +08:00 |
|
Tim
|
b4036ba901
|
分组作业宽度调整
|
2016-10-08 15:28:09 +08:00 |
|
cxt
|
436fb3e96e
|
班级的作业列表分页换成新样式
|
2016-10-08 15:26:47 +08:00 |
|
huang
|
84fd99ced1
|
项目base优化
|
2016-10-08 15:09:59 +08:00 |
|
Tim
|
6bb2501ca0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-08 15:08:22 +08:00 |
|
Tim
|
9ed58acc79
|
分组作业样式调整
|
2016-10-08 15:08:07 +08:00 |
|
cxt
|
937b951220
|
展开某个作品详情时收起其他作品
|
2016-10-08 15:04:01 +08:00 |
|
huang
|
b7b94fb050
|
版本库控制器代码优化一
|
2016-10-08 14:57:55 +08:00 |
|
cxt
|
6ef45a094f
|
Merge branch 'cxt_course' into develop
|
2016-10-08 14:24:47 +08:00 |
|
cxt
|
1fa07b97e3
|
新建班级时的课程下拉列表应包含所在课程教师团队的课程
|
2016-10-08 14:03:37 +08:00 |
|
cxt
|
7f3bb0be63
|
教师团队中上移、下移功能的完善
|
2016-10-08 13:54:35 +08:00 |
|
cxt
|
9e2c381b4a
|
取消班级设置页面的课程编辑
|
2016-10-08 11:22:37 +08:00 |
|
huang
|
137d62ae5d
|
Merge branch 'rep_quality' into dev_newrep
|
2016-10-08 11:14:36 +08:00 |
|
huang
|
23d5d57f5c
|
admin“隐藏项目”顶部显示“公共贴吧”
|
2016-10-08 10:49:50 +08:00 |
|
huang
|
351ca6d074
|
Merge branch 'rep_quality' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-10-08 10:41:05 +08:00 |
|
cxt
|
bee9dfa1b5
|
课程下的班级列表图片丢失
|
2016-10-08 10:38:12 +08:00 |
|
huang
|
d29fb00c30
|
解决用户首页项目列表500问题
|
2016-10-08 10:29:01 +08:00 |
|
cxt
|
843aacc143
|
课程大纲自动识别URL
|
2016-10-08 10:25:19 +08:00 |
|
cxt
|
3b8dded2bc
|
新建课程的教师团队为空
|
2016-10-08 10:21:33 +08:00 |
|
huang
|
0906da5132
|
版本库代码简化
|
2016-10-08 10:10:59 +08:00 |
|
cxt
|
ceb0913568
|
学生列表报500
|
2016-09-30 18:35:08 +08:00 |
|
cxt
|
87050a2adf
|
挂起的作业报500
|
2016-09-30 17:49:01 +08:00 |
|
cxt
|
ec0d21b243
|
戴傲项目相关
|
2016-09-30 17:27:30 +08:00 |
|
cxt
|
e5204112d0
|
教师列表报500
|
2016-09-30 17:19:57 +08:00 |
|
cxt
|
1cf3c2cd48
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-30 17:12:47 +08:00 |
|
cxt
|
b5782bae39
|
班级左侧导航的“分班”
|
2016-09-30 17:12:40 +08:00 |
|
Tim
|
918f741db0
|
总得分tip鼠标放在整行均显示
|
2016-09-30 17:09:57 +08:00 |
|
cxt
|
bcd76d2b9f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-30 17:04:25 +08:00 |
|
cxt
|
23f1c3175c
|
学生列表的导出
|
2016-09-30 17:04:19 +08:00 |
|
Tim
|
7d3847656b
|
分班名称过长折行显示问题；分班编辑按钮定位；分班icon css
|
2016-09-30 17:01:55 +08:00 |
|
cxt
|
db9d4900ac
|
Merge branch 'cxt_course' into develop
|
2016-09-30 16:48:05 +08:00 |
|
cxt
|
86e40dbdd8
|
总得分的提示为空的显示为0
|
2016-09-30 16:46:46 +08:00 |
|
cxt
|
f1b9a98084
|
编辑作业报500
|
2016-09-30 16:32:12 +08:00 |
|
cxt
|
b25e4ed5d7
|
新闻、通知的回复分页
|
2016-09-30 16:09:10 +08:00 |
|
cxt
|
b28579a3a3
|
Merge branch 'cxt_course' into develop
|
2016-09-30 14:49:57 +08:00 |
|
cxt
|
a63f58de5b
|
动态代码的优化
|
2016-09-30 14:48:42 +08:00 |
|
cxt
|
5d0e3889df
|
班级、项目、组织帖子详情回复的分页
|
2016-09-30 14:26:16 +08:00 |
|
cxt
|
7b51812ebb
|
头像处添加“我的课程”快捷入口
|
2016-09-30 13:20:35 +08:00 |
|
daiao
|
acbc94af1a
|
项目导航栏数字错误
|
2016-09-30 11:24:04 +08:00 |
|
daiao
|
0ad71e0f64
|
issue列表及左侧导航栏问题跟踪的issue的所有数字统计错误
|
2016-09-30 11:07:22 +08:00 |
|
cxt
|
a9a53caa13
|
学生提交作品后，跳转至“作品列表”，而不是“作业信息”
|
2016-09-30 10:29:42 +08:00 |
|
daiao
|
742d5b630b
|
修复课程：导入问卷一直提示未有新建问卷
|
2016-09-29 17:18:46 +08:00 |
|
cxt
|
17c82c5291
|
已提交作品的分组作业可扩大分组范围
|
2016-09-29 17:17:17 +08:00 |