 huang
|
05b206a7cf
|
收藏者列表
|
2016-10-27 12:39:44 +08:00 |
 daiao
|
025ec0c9f1
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/views/issues/index.html.erb
|
2016-10-27 11:17:23 +08:00 |
|
huang
|
0272e95eb7
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-27 11:17:15 +08:00 |
|
huang
|
c4b32438ee
|
动态样式冲突问题
|
2016-10-27 11:16:51 +08:00 |
|
daiao
|
d9189487e3
|
Isuue新建里程碑弹框
|
2016-10-27 11:15:28 +08:00 |
 cxt
|
5d7af65bac
|
问卷调查显示页面的调整
|
2016-10-27 10:55:12 +08:00 |
 Tim
|
97f35d1cc9
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-27 10:53:10 +08:00 |
|
Tim
|
e035316cc7
|
里程碑，版本库table宽度限制
|
2016-10-27 10:53:01 +08:00 |
|
cxt
|
f3d67dc26a
|
问卷类型按创建顺序排列
|
2016-10-27 10:12:50 +08:00 |
|
huang
|
3cc9899e5d
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-27 10:10:18 +08:00 |
|
huang
|
03bfbf777a
|
pull request 添加一些判断
|
2016-10-27 10:10:06 +08:00 |
|
Tim
|
e3fc304d35
|
项目动态回复栏展开更多时，回复框宽度扩展问题
|
2016-10-27 10:06:58 +08:00 |
 yuanke
|
1d674e0f6e
|
修改资料界面修改
|
2016-10-27 09:46:59 +08:00 |
|
Tim
|
409dc30e78
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-27 09:44:35 +08:00 |
|
Tim
|
2823ea4182
|
项目成员列表和关注列表增宽
|
2016-10-27 09:44:20 +08:00 |
|
huang
|
0e15ac00be
|
动态中链接为空问题
|
2016-10-27 09:27:48 +08:00 |
|
cxt
|
8cccaba9f3
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
public/stylesheets/css/courses.css
|
2016-10-27 09:04:39 +08:00 |
|
Tim
|
acda8ca15c
|
单选题增加操作栏；多选题增加选项上下限；数字随选项数实时变化js实现
|
2016-10-27 09:02:56 +08:00 |
|
huang
|
8a41bc0b23
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-26 19:12:18 +08:00 |
|
huang
|
5368d6755e
|
没有数据可供显示提示
|
2016-10-26 19:11:50 +08:00 |
|
daiao
|
7a1177c199
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-26 19:09:30 +08:00 |
|
daiao
|
c7bd0ea802
|
除去新建项目第二栏，配置页面上传图片隐藏
|
2016-10-26 19:09:16 +08:00 |
|
huang
|
7c0ff4bbe2
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-26 18:39:48 +08:00 |
|
huang
|
5c31a5379e
|
里程碑添加删除功能
|
2016-10-26 18:39:14 +08:00 |
|
daiao
|
7fd1beb8d0
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-26 18:04:25 +08:00 |
|
daiao
|
3080c8ff09
|
里程碑列表，新建弹框
|
2016-10-26 18:04:12 +08:00 |
|
huang
|
17a9d0f174
|
配置中用户链接
|
2016-10-26 17:51:06 +08:00 |
|
huang
|
a83f5317bb
|
里程碑列表页面添加删除
|
2016-10-26 16:28:40 +08:00 |
|
cxt
|
00f8c9ec0b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-10-26 16:13:07 +08:00 |
|
cxt
|
51e422c1a6
|
个人留言、课程留言的主留言增加自动保存
|
2016-10-26 16:12:51 +08:00 |
|
yuanke
|
ca5e47b705
|
修改delay_job时间上限
|
2016-10-26 16:09:31 +08:00 |
|
huang
|
c76b0d75f8
|
setting中新建里程碑bug
|
2016-10-26 16:01:20 +08:00 |
|
huang
|
f22b9eb35b
|
pull request用户链接处理
|
2016-10-26 15:45:47 +08:00 |
|
huang
|
68ff26e3ef
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-26 15:41:07 +08:00 |
|
huang
|
7035dab4ce
|
pull request 提交动态按天排序
|
2016-10-26 15:40:44 +08:00 |
|
daiao
|
a40d6933f6
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-26 15:18:42 +08:00 |
|
daiao
|
3229277737
|
里程碑编辑弹框
|
2016-10-26 15:18:07 +08:00 |
|
yuanke
|
a882a919e5
|
调试
|
2016-10-26 15:07:32 +08:00 |
|
yuanke
|
3529bb6cf1
|
.
|
2016-10-26 14:58:23 +08:00 |
|
huang
|
7b3b49d874
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-26 14:55:04 +08:00 |
|
huang
|
95eab901a9
|
modified analysis quality show
|
2016-10-26 14:54:55 +08:00 |
|
yuanke
|
513be115cd
|
调试
|
2016-10-26 14:44:44 +08:00 |
|
yuanke
|
e7bd24b552
|
.
|
2016-10-26 14:31:39 +08:00 |
|
yuanke
|
16fd8ff658
|
.
|
2016-10-26 14:00:28 +08:00 |
|
yuanke
|
653f485064
|
异步发送微信消息加点日志
|
2016-10-26 13:46:23 +08:00 |
|
huang
|
5a45ac2af6
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-26 13:45:35 +08:00 |
|
huang
|
5eb82de6e0
|
pull request权限判断
|
2016-10-26 13:45:15 +08:00 |
|
yuanke
|
de5fb72ff3
|
调试
|
2016-10-26 13:41:58 +08:00 |
|
yuanke
|
c5ac0ed6b7
|
调试
|
2016-10-26 13:37:49 +08:00 |
|
yuanke
|
afa72a8acc
|
.
|
2016-10-26 11:30:44 +08:00 |
|
yuanke
|
a9136bd8d0
|
班级微信通知改为异步发送
|
2016-10-26 11:18:05 +08:00 |
|
Tim
|
d7194d908c
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 17:46:44 +08:00 |
|
Tim
|
bb071b8e5e
|
代码提交带动页面宽度扩展
|
2016-10-25 17:46:33 +08:00 |
|
huang
|
b93b4ca3f3
|
quality analisis css of list
|
2016-10-25 17:27:38 +08:00 |
|
huang
|
412b37d643
|
modified quality analysis error list
|
2016-10-25 17:08:05 +08:00 |
|
daiao
|
6833cc5105
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 16:39:01 +08:00 |
|
daiao
|
2608348c92
|
项目Issue列表样式调整
|
2016-10-25 16:38:45 +08:00 |
|
huang
|
7ffb010b4f
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 16:10:19 +08:00 |
|
huang
|
715de1b7f3
|
pull request js问题调试
|
2016-10-25 16:09:57 +08:00 |
|
Tim
|
d44744cfd7
|
在线测验问答题支持回车
|
2016-10-25 15:55:48 +08:00 |
|
Tim
|
5b2df31c95
|
在线测验多选题题目支持换行
|
2016-10-25 15:47:26 +08:00 |
|
daiao
|
c6bc304c04
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 15:38:01 +08:00 |
|
daiao
|
9042304794
|
项目ISSUE编辑和新建页面
|
2016-10-25 15:37:49 +08:00 |
|
Tim
|
26b39c5d20
|
在线测验单选题高度自适应
|
2016-10-25 15:36:55 +08:00 |
|
huang
|
187a96b251
|
pull request评论局部刷新及样式
|
2016-10-25 15:34:32 +08:00 |
|
cxt
|
7f99e82181
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/student_work/_student_work_list.html.erb
|
2016-10-25 15:29:46 +08:00 |
|
cxt
|
95c7dcea3a
|
作业列表的样式调整
|
2016-10-25 15:28:41 +08:00 |
|
huang
|
35c8157efa
|
修改版本库显示代码样式，改成与编辑器显示一致
|
2016-10-25 15:10:23 +08:00 |
|
huang
|
a0ff6a0cb1
|
完成项目讨论区的拉宽工作
|
2016-10-25 14:47:05 +08:00 |
|
Tim
|
46fa91b6e9
|
分组作业评分弹框打开，”大作品评分即组长的评分“提示显示
|
2016-10-25 14:10:52 +08:00 |
|
huang
|
21d34bb4d4
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 14:05:24 +08:00 |
|
huang
|
2702b5a197
|
项目收藏结构修改
|
2016-10-25 14:05:07 +08:00 |
|
cxt
|
891c0018e5
|
多层回复时的展现方式调整
|
2016-10-25 13:56:25 +08:00 |
|
Tim
|
a33e6a1578
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 13:36:28 +08:00 |
|
Tim
|
d72993b76c
|
日历tip文字加大
|
2016-10-25 13:36:18 +08:00 |
|
huang
|
8d53893a9b
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 13:32:41 +08:00 |
|
huang
|
f41696eaee
|
版本库创建跳转及显示
|
2016-10-25 13:32:22 +08:00 |
|
cxt
|
15b6aaf2a2
|
新建班级、新建课程增加tip说明
|
2016-10-25 13:21:01 +08:00 |
|
daiao
|
b097f678a8
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 11:23:43 +08:00 |
|
daiao
|
a0ba21b397
|
新版Issue编辑和新建页面
|
2016-10-25 11:23:02 +08:00 |
|
huang
|
4bb13a0d3c
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 11:11:40 +08:00 |
|
huang
|
a86ad7d99a
|
项目配置各种局部刷新（新建编辑提示等）
|
2016-10-25 11:11:25 +08:00 |
|
Tim
|
e3ddfd1841
|
日历与甘特图宽度扩展
|
2016-10-25 10:42:29 +08:00 |
|
Tim
|
8876dcdcec
|
讨论区帖子编辑页面宽度扩展
|
2016-10-25 09:43:19 +08:00 |
|
Tim
|
968a132d80
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 09:30:56 +08:00 |
|
Tim
|
1738fee99f
|
资源库宽度扩展
|
2016-10-25 09:30:40 +08:00 |
|
daiao
|
1652ec9195
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 09:28:28 +08:00 |
|
daiao
|
e3f0f222e6
|
新版Issue新建页面
|
2016-10-25 09:28:09 +08:00 |
|
Tim
|
5f233d2f10
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-25 09:12:15 +08:00 |
|
Tim
|
1023f5301e
|
讨论区列表、讨论区详情、讨论区回复宽度扩展
|
2016-10-25 09:11:56 +08:00 |
|
huang
|
7a78bbdc45
|
新建版本、新建版本库正则JS撇配
|
2016-10-24 17:35:26 +08:00 |
|
cxt
|
c962e3c18b
|
导入问卷后进入问卷再回退，再点击该问卷，页面报404
|
2016-10-24 17:35:06 +08:00 |
|
cxt
|
cfeece0c76
|
新建班级样式调整
|
2016-10-24 17:21:09 +08:00 |
|
huang
|
651ea5d189
|
配置页面，里程碑编辑删除局部刷新以及标题为空JS判断
|
2016-10-24 16:36:08 +08:00 |
|
cxt
|
3d3b46f7f3
|
问卷：没有选定时，其它 选项的输入框禁用。选择了才可用
|
2016-10-24 16:01:46 +08:00 |
|
huang
|
38d30c1cca
|
项目配置页面冗余代码清理
|
2016-10-24 15:42:57 +08:00 |
|
huang
|
d385123a93
|
里程碑添加导出功能
|
2016-10-24 15:42:22 +08:00 |
|
huang
|
bb250af86c
|
里程碑导航js
|
2016-10-24 14:54:33 +08:00 |
|
huang
|
d97c559e9c
|
PULL Request部分功能
|
2016-10-24 14:34:54 +08:00 |
|
cxt
|
c2a7ec4fc7
|
游客身份，隐藏讨论区二级栏目新建帖子的入口
|
2016-10-24 14:10:37 +08:00 |
|
cxt
|
fcb1d4d115
|
打开分班名称编辑框后，点击其他分班名称或全部、未分班，数据刷新，但是编辑框未收起，应该收起
|
2016-10-24 14:02:09 +08:00 |
|
huang
|
76a3686f9f
|
项目动态message板块回复样式
|
2016-10-24 13:30:45 +08:00 |
|
huang
|
a9cac4abf1
|
项目动态中message动态和users中动态分离
|
2016-10-24 12:15:27 +08:00 |
|
huang
|
db50d32f78
|
二级回复样式
|
2016-10-24 11:33:06 +08:00 |
|
Tim
|
c44911c54f
|
項目討論區留言路徑跳轉更改
|
2016-10-24 11:26:12 +08:00 |
|
cxt
|
e5377b63d9
|
问卷导入弹框页显示文字错误，“课程”→“班级”
|
2016-10-24 11:20:30 +08:00 |
|
cxt
|
9c4eed3cdd
|
分组作业的作品列表显示“X组已交”
|
2016-10-24 11:17:23 +08:00 |
|
cxt
|
40a895a786
|
issue动态附件点击后下载更新为直接查看
|
2016-10-24 10:57:40 +08:00 |
|
huang
|
7eeefecdef
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-24 10:57:34 +08:00 |
|
huang
|
be396d2ead
|
项目动态中message模块二级回复框架
|
2016-10-24 10:57:18 +08:00 |
|
cxt
|
3bc11cd5be
|
班级左侧导航的小分班增加“添加成员”的快捷按钮
|
2016-10-24 09:45:49 +08:00 |
|
daiao
|
d2e6333ed6
|
里程碑列表 样式调整
|
2016-10-21 20:01:20 +08:00 |
|
yuanke
|
b7cd1e8fa2
|
Merge branch 'cxt_course' into develop
|
2016-10-21 19:59:37 +08:00 |
|
cxt
|
fefc1bf800
|
分組作业的动态和详情的调整、作品列表增加项目提示和老师加入项目的功能
|
2016-10-21 19:58:02 +08:00 |
|
Tim
|
ba1ef995fd
|
组织标题长单词显示不全bug
|
2016-10-21 19:38:52 +08:00 |
|
Tim
|
ef141d82c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-21 19:33:18 +08:00 |
|
Tim
|
a9a36d655e
|
提价作业界面长单词不折行bug
|
2016-10-21 19:33:08 +08:00 |
|
yuanke
|
5811f3944e
|
小班导出列表500BUG
|
2016-10-21 19:25:09 +08:00 |
|
yuanke
|
992f8f5f75
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-21 19:14:18 +08:00 |
|
yuanke
|
f785fe4fbd
|
修改路由
|
2016-10-21 19:14:07 +08:00 |
|
daiao
|
ce3845f110
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-21 19:05:14 +08:00 |
|
daiao
|
e23b01f90c
|
项目里程碑详情页面的issue统计页面
|
2016-10-21 19:04:58 +08:00 |
|
Tim
|
f730b48eac
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-10-21 18:40:43 +08:00 |
|
Tim
|
82dcd5db00
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-21 18:39:06 +08:00 |
|
Tim
|
dbadf409df
|
作品完整性校验描述scroll显示
|
2016-10-21 18:38:53 +08:00 |
|
huang
|
d61ffc958e
|
pull request
|
2016-10-21 17:53:23 +08:00 |
|
yuanke
|
bb5d957ec5
|
Merge branch 'cxt_course' into develop
|
2016-10-21 17:46:29 +08:00 |
|
cxt
|
4da113dc19
|
讨论区增加“添加子栏目”按钮跳到设置页面的添加子栏目
|
2016-10-21 17:40:19 +08:00 |
|
cxt
|
3d29eb2be0
|
分班批量添加学生、小班页面
|
2016-10-21 17:34:02 +08:00 |
|
huang
|
bdfa28e762
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-21 17:14:22 +08:00 |
|
huang
|
5ebd829dbf
|
pull request列表及详情页面（详情未完）
|
2016-10-21 17:14:04 +08:00 |
|
Tim
|
6b6584d764
|
分组作业关联项目提示
|
2016-10-21 17:12:05 +08:00 |
|
daiao
|
fa453090aa
|
项目里程碑详情页面
|
2016-10-21 16:16:26 +08:00 |
|
yuanke
|
7f99c2fdc5
|
Merge branch 'weixin_guange' into develop
|
2016-10-21 15:39:28 +08:00 |
|
Tim
|
20bba5bfe5
|
课程中不能删除创建班级教室title模拟
|
2016-10-21 15:37:26 +08:00 |
|
yuanke
|
a363b89e32
|
点联系我们提示文字修改
|
2016-10-21 15:22:08 +08:00 |
|
Tim
|
912f70420a
|
讨论区帖子标题为长英文不折行bug修复
|
2016-10-21 14:56:48 +08:00 |
|
yuanke
|
0d885100b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-21 14:35:36 +08:00 |
|
huang
|
49c77312da
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-21 14:23:20 +08:00 |
|
daiao
|
624cba3228
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-21 14:22:44 +08:00 |
|
daiao
|
64dd693e6f
|
项目里程碑详情页面
|
2016-10-21 14:22:14 +08:00 |
|
huang
|
6481978def
|
Merge branch 'rep_quality' into develop
|
2016-10-21 14:20:32 +08:00 |
|
huang
|
d024bb1236
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-21 14:18:52 +08:00 |
|
huang
|
76b2ca1d7c
|
pull_request index页面
|
2016-10-21 14:18:34 +08:00 |
|
yuanke
|
108c28be9d
|
Merge branch 'weixin_guange' into develop
|
2016-10-21 14:12:19 +08:00 |
|
yuanke
|
1f0e8649b9
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-21 14:07:14 +08:00 |
|
yuanke
|
8e35158fe9
|
增加统计功能
|
2016-10-21 14:06:45 +08:00 |
|
huang
|
6b8184ed49
|
issue模块新版二级回复ajax刷新
|
2016-10-21 13:27:41 +08:00 |
|
huang
|
3ccff07bf0
|
项目动态issue模块删除的时候样式
|
2016-10-21 11:26:15 +08:00 |
|
huang
|
1f4e8ca931
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-21 11:20:08 +08:00 |
|
huang
|
ac54d02bdc
|
pull request 列表页面
|
2016-10-21 11:19:56 +08:00 |
|
Tim
|
f4690f0cab
|
回复，二级回复，删除时，回复框宽度控制
|
2016-10-21 11:09:54 +08:00 |
|
huang
|
56cf1f9ba3
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-21 10:33:01 +08:00 |
|
huang
|
733a91d160
|
新版pull 新建功能
|
2016-10-21 10:32:38 +08:00 |
|
Tim
|
4156815394
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-21 09:23:14 +08:00 |
|
Tim
|
45d846ea79
|
讨论区动态宽度扩展
|
2016-10-21 09:22:54 +08:00 |
|
cxt
|
f9505a24b9
|
题库发送的提示语不正确：应该是目标班级，而不是目标课程：
|
2016-10-21 08:59:16 +08:00 |
|
cxt
|
f6e86866cb
|
个人主页调整
|
2016-10-21 08:55:17 +08:00 |
|
huang
|
4b2f0d4bca
|
里程碑完成百分比四舍五入
|
2016-10-20 18:14:09 +08:00 |
|
huang
|
a3da43b793
|
里程碑列表
|
2016-10-20 18:08:24 +08:00 |
|
cxt
|
b0d089f85c
|
编程作业报500
|
2016-10-20 17:46:33 +08:00 |
|
cxt
|
0ccb6b884a
|
编辑作业时分组作业的评分比例
|
2016-10-20 17:31:48 +08:00 |
|
cxt
|
ab0280aa30
|
样式调整
|
2016-10-20 17:19:08 +08:00 |
|
cxt
|
5bfb99083c
|
主页中间导航过长
|
2016-10-20 17:17:19 +08:00 |
|
cxt
|
7cc96b1569
|
样式调整
|
2016-10-20 16:57:19 +08:00 |
|
cxt
|
07458b35d9
|
学生列表的排序箭头方向错误
|
2016-10-20 16:27:41 +08:00 |
|
cxt
|
e8d7e64f80
|
主页子页面链接
|
2016-10-20 16:18:45 +08:00 |
|
cxt
|
bee1597167
|
删除的个人主页报500
|
2016-10-20 15:01:05 +08:00 |
|
cxt
|
453e91dcfb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-20 14:24:13 +08:00 |
|
cxt
|
269083c4a6
|
分组作业的评分设置
|
2016-10-20 14:24:07 +08:00 |
|
huang
|
cfbabf3eac
|
样式
|
2016-10-20 14:06:57 +08:00 |
|
huang
|
df5458675e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-20 13:34:16 +08:00 |
|
huang
|
16b6c55637
|
注释掉id转换成登录名
|
2016-10-20 13:34:02 +08:00 |
|
daiao
|
b45aec9134
|
项目配置-里程碑，版本库页面调整
|
2016-10-20 13:33:25 +08:00 |
|
cxt
|
59f0101a62
|
个人主页的链接改成登录名
|
2016-10-20 13:32:33 +08:00 |
|
huang
|
786110f711
|
还原
|
2016-10-20 13:31:05 +08:00 |
|
yuanke
|
e802629d27
|
Merge branch 'develop' into weixin_guange
Conflicts:
app/models/student_work.rb
app/models/student_work_test.rb
app/views/blog_comments/show.html.erb
public/javascripts/homework.js
|
2016-10-20 13:28:23 +08:00 |
|
huang
|
1b8bf05be5
|
用户ID装换成用户名
|
2016-10-20 13:26:11 +08:00 |
|
cxt
|
f085b79999
|
个人主页的调整
|
2016-10-20 10:50:59 +08:00 |
|
cxt
|
dff47b586e
|
主页宽度调整、主页配置菜单调整
|
2016-10-20 09:26:01 +08:00 |
|
cxt
|
70c7b0d12c
|
设为主页后页面未刷新
|
2016-10-19 20:44:14 +08:00 |
|
cxt
|
e5cfcdc038
|
个人主页列表的翻页
|
2016-10-19 20:33:39 +08:00 |
|
cxt
|
dde8be3f94
|
主页内容自动识别链接
|
2016-10-19 20:13:26 +08:00 |
|
cxt
|
35caacf067
|
首页取消、添加关注不可用
|
2016-10-19 20:03:34 +08:00 |
|
cxt
|
251465ceb5
|
袁可 编程
|
2016-10-19 19:41:02 +08:00 |
|
cxt
|
85f489eb97
|
主页页面设为主页或取消首页后跳转至主页列表、已设为主页的始终显示在前方
|
2016-10-19 19:38:44 +08:00 |
|
cxt
|
bebff7b24a
|
“个人主页列表"变细体、编辑时也可设为主页
|
2016-10-19 19:05:42 +08:00 |
|
cxt
|
6109a1602b
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-19 18:11:02 +08:00 |
|
cxt
|
26121d895f
|
袁可 编程测试
|
2016-10-19 18:09:29 +08:00 |
|
cxt
|
800aaf8853
|
隐藏博客首页
|
2016-10-19 18:07:19 +08:00 |
|
cxt
|
e102815f60
|
个人主页
|
2016-10-19 18:03:59 +08:00 |
|
daiao
|
cf4d908c5e
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 17:43:12 +08:00 |
|
daiao
|
1c80a89b8d
|
项目配置样式调整
|
2016-10-19 17:43:05 +08:00 |
|
huang
|
fbb2bfce91
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 17:35:46 +08:00 |
|
huang
|
601de5d67f
|
项目base中统计数字四舍五入，数字中添加链接
|
2016-10-19 17:35:33 +08:00 |
|
daiao
|
269c061053
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 16:56:36 +08:00 |
|
daiao
|
a9fa958f7f
|
项目配置，信息与模块样式调整
|
2016-10-19 16:56:25 +08:00 |
|
huang
|
2425f7e159
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 16:35:45 +08:00 |
|
huang
|
a722cb0031
|
超过1w的用k+
|
2016-10-19 16:35:26 +08:00 |
|
Tim
|
6b04c9144e
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 16:29:15 +08:00 |
|
Tim
|
783ef3eae1
|
创建项目动态宽度调整
|
2016-10-19 16:29:04 +08:00 |
|
huang
|
da78adc697
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 15:52:11 +08:00 |
|
huang
|
c34209534d
|
版本库展开文件目录异步刷新
|
2016-10-19 15:51:55 +08:00 |
|
Tim
|
a3126870a1
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 15:48:00 +08:00 |
|
Tim
|
ae9a6eb928
|
版本库查看文件页面宽度调整
|
2016-10-19 15:47:50 +08:00 |
|
daiao
|
c829749849
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 15:35:49 +08:00 |
|
daiao
|
7499f4659d
|
项目配置，成员界面，点击操作-编辑按钮，角色出现下拉列表框
|
2016-10-19 15:35:37 +08:00 |
|
huang
|
5571fb0f90
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 15:18:56 +08:00 |
|
huang
|
97172ed76f
|
版本库异步加载
|
2016-10-19 15:18:26 +08:00 |
|
Tim
|
af5db3713c
|
issue详情页面，属性页面，回复页面，二级回复页面宽度调整
|
2016-10-19 14:57:31 +08:00 |
|
huang
|
cff887a2be
|
删除项目的时候删除版本库功能
|
2016-10-19 11:23:15 +08:00 |
|
Tim
|
e4a6a5f58d
|
项目issue状态宽度调整
|
2016-10-19 11:17:34 +08:00 |
|
yuanke
|
b907b626a9
|
代码测试结果不全分数100分的BUG修复
|
2016-10-19 10:27:40 +08:00 |
|
Tim
|
10e9194032
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 10:18:50 +08:00 |
|
Tim
|
6fbb6629d7
|
动态issue回复宽度扩展
|
2016-10-19 10:17:56 +08:00 |
|
huang
|
89292054c8
|
项目动态讨论区模块独立出来
|
2016-10-19 09:57:17 +08:00 |
|
huang
|
3750252f39
|
项目创建信息与用户动态中分支
|
2016-10-19 09:35:53 +08:00 |
|
huang
|
83eaa4d9db
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 09:30:37 +08:00 |
|
huang
|
0305676896
|
项目动态附件信息分离
|
2016-10-19 09:30:22 +08:00 |
|
Tim
|
b9703a4125
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-18 17:30:18 +08:00 |
|
Tim
|
a58cebdf5c
|
提交改动页面宽度扩展
|
2016-10-18 17:30:07 +08:00 |
|
daiao
|
daf0263be9
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-18 17:22:52 +08:00 |
|
daiao
|
61ad05a379
|
项目配置界面
|
2016-10-18 17:09:00 +08:00 |
|
Tim
|
ba7c9a33b6
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-18 15:40:35 +08:00 |
|
huang
|
23ff82a8cd
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 15:24:49 +08:00 |
|
huang
|
b8d86fcd42
|
版本库界面及样式
|
2016-10-19 15:24:36 +08:00 |
|
huang
|
bb9ba14c47
|
base
|
2016-10-19 14:47:22 +08:00 |
|
huang
|
1379959af8
|
Merge branch 'develop' into dev_newproject
|
2016-10-19 14:46:02 +08:00 |
|
huang
|
bf3506002b
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-19 14:43:25 +08:00 |
|
huang
|
590e639112
|
新版项目issue模块
|
2016-10-19 14:43:07 +08:00 |
|
Tim
|
aa379980d7
|
版本库显示页面宽度扩展
|
2016-10-18 15:40:23 +08:00 |
|
daiao
|
32c5d7a13b
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-18 15:19:34 +08:00 |
|
daiao
|
bdbd2e9cf7
|
项目配置组织与里程碑界面
|
2016-10-18 15:17:36 +08:00 |
|
yuanke
|
c0e6085e74
|
注册时登录名改为只能字母和数字、字母开头4-15长度
|
2016-10-18 14:47:06 +08:00 |
|
Tim
|
5844af922e
|
项目动态宽度扩展
|
2016-10-18 13:34:28 +08:00 |
|
Tim
|
622fa382ca
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-10-18 11:30:57 +08:00 |
|
huang
|
fce6c407c8
|
Merge branch 'rep_quality' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/layouts/base_projects.html.erb
app/views/projects/settings/_new_edit.html.erb
public/stylesheets/css/project.css
|
2016-10-19 11:27:49 +08:00 |
|
huang
|
e3ef502be2
|
版本库删除功能
|
2016-10-19 10:09:38 +08:00 |
|
huang
|
72ce5a51ed
|
新版项目顶部样式JS控制
|
2016-10-19 10:01:14 +08:00 |
|
huang
|
e276559286
|
项目show附件类型新版块
|
2016-10-19 09:24:07 +08:00 |
|
huang
|
a0811ec14c
|
project show中添加邀请码
|
2016-10-19 09:14:32 +08:00 |
|
huang
|
207273839b
|
Merge branch 'dev_newrep' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/projects/settings/_new_repositories.html.erb
|
2016-10-19 08:53:38 +08:00 |
|
Tim
|
fb9e1a02df
|
项目动态宽度调整
|
2016-10-18 11:30:42 +08:00 |
|
cxt
|
8648ea605f
|
问卷导出的统计结果：“其他”选项要标出来，多行主观题要对各小题标识出来
|
2016-10-18 11:14:29 +08:00 |
|
yuanke
|
e999cac944
|
取消博客的设为首页功能
|
2016-10-18 10:09:25 +08:00 |
|
cxt
|
750a9c9d38
|
问卷答题报网络异常
|
2016-10-15 19:34:58 +08:00 |
|
Tim
|
bde2f6b65d
|
项目上传资源弹框样式js控制；更新版本弹框资源名长度控制
|
2016-10-15 16:45:41 +08:00 |
|
Tim
|
6ae066937d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-15 15:48:02 +08:00 |
|
Tim
|
16bedc3d8f
|
项目资源库弹窗位置及样式js控制
|
2016-10-15 15:47:48 +08:00 |
|
cxt
|
61bfe405f3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-15 15:35:13 +08:00 |
|
Tim
|
ee03cda8a6
|
班级资源库弹窗样式及位置js控制
|
2016-10-15 15:34:33 +08:00 |
|
cxt
|
a709f5c720
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-15 15:16:39 +08:00 |
|
cxt
|
a289a2cee0
|
班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果
|
2016-10-15 15:16:21 +08:00 |
|
Tim
|
0c481de79d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-15 13:41:45 +08:00 |
|
Tim
|
bc37d09edf
|
更新资源版本title长度限制
|
2016-10-15 13:41:33 +08:00 |
|
huang
|
106e77409b
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
2016-10-15 12:36:42 +08:00 |
|
huang
|
8005958f03
|
删除版本刷新
|
2016-10-15 12:35:36 +08:00 |
|
huang
|
6dbb50f803
|
确定按钮变成手型
|
2016-10-15 11:34:06 +08:00 |
|
huang
|
50ba2fb04f
|
多个历史版本和没有历史版本删除附件提醒
|
2016-10-15 11:31:15 +08:00 |
|
huang
|
da7de2c2a2
|
更新版本中隐藏删除
|
2016-10-15 11:12:12 +08:00 |
|
huang
|
5532ec3b86
|
Merge branch 'develop' into dev_newproject
Conflicts:
app/views/issues/index.html.erb
app/views/layouts/base_projects.html.erb
public/stylesheets/css/project.css
|
2016-10-15 10:53:01 +08:00 |
|
daiao
|
f8638d173a
|
项目配置，成员列表功能
|
2016-10-15 10:48:24 +08:00 |
|
huang
|
f1e4628e75
|
组织添加历史版本删除功能
|
2016-10-15 09:17:47 +08:00 |
|
huang
|
7e1d871cf0
|
更新资源刷新
|
2016-10-15 09:04:19 +08:00 |
|
daiao
|
d3575b288e
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
db/schema.rb
|
2016-10-15 09:00:03 +08:00 |
|
huang
|
3db29cd40b
|
J解决重复提交问题
|
2016-10-14 21:10:58 +08:00 |
|
daiao
|
3ceee6522b
|
还原新建贴吧报贴吧名已存在的问题
|
2016-10-14 21:05:40 +08:00 |
|
daiao
|
64d446e480
|
还原组织一级栏目列表
|
2016-10-14 20:35:51 +08:00 |
|
cxt
|
d5eea455e9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 20:31:53 +08:00 |
|
Tim
|
162838dae6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 20:31:04 +08:00 |
|
Tim
|
9ce87808c8
|
里程碑编辑页面样式添加
|
2016-10-14 20:30:52 +08:00 |
|
huang
|
3a1ab607fa
|
附件重复提交问题
|
2016-10-14 20:25:14 +08:00 |
|
huang
|
91ee5a0d9f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 19:21:54 +08:00 |
|
huang
|
80bf13c516
|
资源库删除历史版本功能
|
2016-10-14 19:21:41 +08:00 |
|
Tim
|
71f43c757f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 18:25:44 +08:00 |
|
Tim
|
981e1eb358
|
问卷宽度减少，编辑按钮可见
|
2016-10-14 18:25:35 +08:00 |
|
cxt
|
5870c3eaaf
|
子栏目讨论区列表的排序、作品内容的样式调整
|
2016-10-14 18:24:54 +08:00 |
|
huang
|
0760836f29
|
项目base优化
|
2016-10-14 17:23:51 +08:00 |
|
cxt
|
2d7c7dc05d
|
左侧讨论区子栏目的样式修改
|
2016-10-14 17:13:26 +08:00 |
|
cxt
|
89307f9e84
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 17:05:55 +08:00 |
|
cxt
|
5b5bfe005e
|
新增栏目名称过长时添加失败
|
2016-10-14 17:05:47 +08:00 |
|
Tim
|
7f7f786aa0
|
资源库描述文字折行
|
2016-10-14 16:59:50 +08:00 |
|
Tim
|
75a68e9844
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 16:34:09 +08:00 |
|
Tim
|
a302dcca04
|
匿评分数tip
|
2016-10-14 16:33:56 +08:00 |
|
cxt
|
ce1da89e02
|
Merge branch 'cxt_replies' into develop
|
2016-10-14 16:18:43 +08:00 |
|
cxt
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +08:00 |
|
cxt
|
2d508254ac
|
51、94用户个人主页报500
|
2016-10-14 16:16:35 +08:00 |
|
Tim
|
8aaab44697
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 16:13:44 +08:00 |
|
Tim
|
2955d07f7c
|
分数显示tip
|
2016-10-14 16:13:30 +08:00 |
|
huang
|
446f0d142c
|
Merge branch 'rep_quality' into develop
|
2016-10-14 16:11:49 +08:00 |
|
cxt
|
38d43cfb67
|
必答不应换行
|
2016-10-14 16:11:46 +08:00 |
|
huang
|
caa54c77a2
|
解决issue的冲突
|
2016-10-14 16:00:40 +08:00 |
|
cxt
|
9810539e84
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/poll/_show_head.html.erb
|
2016-10-14 15:58:11 +08:00 |
|
cxt
|
45008d9868
|
班级问卷：鼠标点击描述框，光标却自动定位到第二行了
|
2016-10-14 15:55:47 +08:00 |
|
Tim
|
0859f86518
|
空问卷头部编辑按钮位置更改
|
2016-10-14 15:46:15 +08:00 |
|
huang
|
b9d87b1b29
|
Merge branch 'develop' into rep_quality
Conflicts:
public/stylesheets/css/project.css
|
2016-10-14 15:43:45 +08:00 |
|
cxt
|
6b7ca9c84d
|
问卷调查：编辑（笔）图标按钮建议改成当鼠标移上去时才显示、多选题不显示的bug
|
2016-10-14 15:30:44 +08:00 |
|
Tim
|
e72b2de6e2
|
长单词强制折行
|
2016-10-14 15:29:07 +08:00 |
|
cxt
|
5f04baf572
|
博客动态回复显示：“展开更多”、“收起回复”点击无反应
|
2016-10-14 15:09:47 +08:00 |
|
huang
|
0c137515c1
|
项目、组织存在历史版本一键删除功能
|
2016-10-14 15:08:29 +08:00 |
|
cxt
|
f87e335acf
|
课程大纲、作业二级回复不可用
|
2016-10-14 15:01:36 +08:00 |
|
huang
|
333c9c6db0
|
项目历史版本一键删除功能
|
2016-10-14 15:01:22 +08:00 |
|
Tim
|
2735aca331
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-10-14 14:51:09 +08:00 |
|
Tim
|
86de58f793
|
问卷问题增加支持折行输入功能；输入随文字高度自适应js；问卷折行输入按格式输出css支持及格式调整
|
2016-10-14 14:50:51 +08:00 |
|
huang
|
b408b6ef97
|
组织历史版本删除功能
|
2016-10-14 14:46:48 +08:00 |
|
cxt
|
d7a17868ad
|
去掉问卷描述的字数限制
|
2016-10-14 14:38:26 +08:00 |
|
huang
|
4646f20bba
|
项目版本库历史版本删除功能及弹框样式
|
2016-10-14 14:28:51 +08:00 |
|
cxt
|
12ad7c1612
|
班级讨论区增加二级子栏目
|
2016-10-14 14:28:19 +08:00 |
|
huang
|
db63a5514d
|
项目资源库历史版本更新及局部刷新
|
2016-10-14 13:45:47 +08:00 |
|
daiao
|
c26af37456
|
管理员界面项目列表可以按状态进行搜索功能；游客身份，班级留言右侧“+"隐藏
|
2016-10-14 09:29:53 +08:00 |
|
huang
|
dcbeea6dff
|
版本库可见权限优化
|
2016-10-14 09:01:25 +08:00 |
|
daiao
|
2324ad31e2
|
Merge branch 'develop' into dev_newproject
Conflicts:
app/views/issues/index.html.erb
public/stylesheets/css/common.css
public/stylesheets/css/project.css
|
2016-10-13 17:00:53 +08:00 |
|
daiao
|
5ae89613ec
|
项目配置成员界面
|
2016-10-13 16:57:43 +08:00 |
|
yuanke
|
bb0833c054
|
issue
|
2016-10-13 14:51:35 +08:00 |
|
yuanke
|
7dc0ba005e
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/views/issues/index.html.erb
app/views/users/_course_newslist.html.erb
|
2016-10-13 14:37:37 +08:00 |
|
cxt
|
f56fc5a44d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-13 14:25:36 +08:00 |
|
cxt
|
252da9c3d3
|
Merge branch 'cs_optimize_txz' into develop
|
2016-10-13 14:24:01 +08:00 |
|
yuanke
|
1afa774fa9
|
Merge branch 'weixin_guange' into develop
|
2016-10-13 14:23:52 +08:00 |
|
cxt
|
d2b6d81373
|
Merge branch 'cxt_replies' into develop
Conflicts:
app/views/blog_comments/show.html.erb
app/views/blogs/_article.html.erb
app/views/org_document_comments/show.html.erb
|
2016-10-13 14:22:05 +08:00 |
|
cxt
|
5fb7da4681
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/css/public.css
|
2016-10-13 14:17:54 +08:00 |
|
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 |
|
daiao
|
e2be4a9e7f
|
后台作业列表：作业班级为空时，作业列表样式错误
|
2016-09-29 16:55:32 +08:00 |
|
daiao
|
b807fc7766
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-29 16:24:04 +08:00 |
|
daiao
|
06ea193eb4
|
修复资源库公共资源无法右键删除、重命名
|
2016-09-29 16:23:53 +08:00 |
|
Tim
|
c245d2fecd
|
页面头部贴吧交流改为帮助中心
|
2016-09-29 15:49:53 +08:00 |
|
Tim
|
858348298b
|
项目加载慢时，有白色块显示bug修复
|
2016-09-29 14:24:42 +08:00 |
|
cxt
|
fc78ba3c68
|
组员作品添加评分按钮
|
2016-09-29 14:11:45 +08:00 |
|
cxt
|
4da5144cd5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-09-29 11:29:49 +08:00 |
|
cxt
|
f6296377bd
|
班级内的分班
|
2016-09-29 11:29:37 +08:00 |
|
Tim
|
daa887fe0a
|
issue列表样式调整
|
2016-09-28 16:56:46 +08:00 |
|
daiao
|
a6114796b7
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-28 16:52:17 +08:00 |
|
daiao
|
fdca4ea968
|
项目与班级资源库导入资源重名时导入异常
|
2016-09-28 16:52:02 +08:00 |
|
huang
|
25b2602d3e
|
版本库路径唯一
|
2016-09-28 16:51:25 +08:00 |
|
huang
|
bd383f5010
|
项目历史版本库提示删除一级setting中控制权限判断
|
2016-09-28 16:04:53 +08:00 |
|
Tim
|
3f559a04bb
|
issue列表边框颜色更改；issue题目宽度增长；回复数和编辑删除位置调整及显隐js实现
|
2016-09-28 15:20:42 +08:00 |
|
huang
|
a95e8aece4
|
隐藏项目信息的时候显示公共贴吧
|
2016-09-28 13:39:35 +08:00 |
|
daiao
|
4ea76f4dbc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-28 11:44:55 +08:00 |
|
huang
|
58b66b5d0b
|
https改成自动获取
|
2016-09-28 11:43:10 +08:00 |
|
huang
|
b8ab3dc497
|
点数字不还原
|
2016-09-28 11:39:11 +08:00 |
|
huang
|
382c414341
|
Merge branch 'rep_quality' into develop
|
2016-09-28 11:04:03 +08:00 |
|
Tim
|
ca81b1a3ba
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-28 11:01:39 +08:00 |
|
Tim
|
30c3ce86d5
|
wiki新建，显示页面宽度调整
|
2016-09-28 11:01:30 +08:00 |
|
huang
|
b573563a52
|
Merge branch 'rep_quality' into develop
|
2016-09-28 10:59:55 +08:00 |
|
daiao
|
b22b444a7b
|
修改issue开始时间与结束时间判断，并将导出excel的作者改为发布人
|
2016-09-28 10:58:31 +08:00 |
|
Tim
|
69a9171430
|
分班列表样式调整；作业动态翻页居中
|
2016-09-28 10:47:58 +08:00 |
|
huang
|
6ece9c0463
|
性能优化
|
2016-09-28 10:40:56 +08:00 |
|
daiao
|
86b03542c8
|
里程碑版本点击空白页
|
2016-09-28 10:04:20 +08:00 |
|
cxt
|
03fac1900e
|
分班
|
2016-09-28 10:00:01 +08:00 |
|
huang
|
0391503257
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-28 09:33:46 +08:00 |
|
huang
|
9a89590ca9
|
issue总数实时刷新
|
2016-09-28 09:33:31 +08:00 |
|
yuanke
|
3b85d9e6bd
|
课程、项目二级回复样式
|
2016-09-27 21:03:40 +08:00 |
|
yuanke
|
5d234dc849
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-27 20:50:08 +08:00 |
|
yuanke
|
f48d3f2c3c
|
课程回复按钮样式
|
2016-09-27 20:48:38 +08:00 |
|
huang
|
27f45b5ea0
|
Merge branch 'rep_quality' into develop
|
2016-09-27 20:07:34 +08:00 |
|
daiao
|
d57f80e703
|
用户反馈回复
|
2016-09-27 20:06:48 +08:00 |
|
huang
|
b679783cc0
|
项目动态中issue回复显示
|
2016-09-27 20:04:29 +08:00 |
|
huang
|
e49f9b49b2
|
Merge branch 'rep_quality' into develop
|
2016-09-27 19:48:10 +08:00 |
|
daiao
|
7c76584e14
|
issue功能优化
|
2016-09-27 19:44:24 +08:00 |
|
huang
|
d656d3e94c
|
项目评分为0 的时候显示
|
2016-09-27 19:43:11 +08:00 |
|
huang
|
fb02a1cf13
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-27 19:41:22 +08:00 |
|
huang
|
7ef7c0c6f0
|
issue过滤条件导出功能
|
2016-09-27 19:41:10 +08:00 |
|
yuanke
|
8b8d878564
|
项目关注列表和成员列表调整宽度
|
2016-09-27 19:28:40 +08:00 |
|
yuanke
|
d976dbf673
|
作业详情页的显示调整
|
2016-09-27 18:31:31 +08:00 |
|
huang
|
c76cfad51a
|
Merge branch 'rep_quality' into develop
|
2016-09-27 18:03:02 +08:00 |
|
huang
|
19c1a0d843
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 18:01:41 +08:00 |
|
huang
|
b96ab3676c
|
issue过滤条件
|
2016-09-27 18:01:26 +08:00 |
|
daiao
|
e730312ec3
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 17:01:20 +08:00 |
|
daiao
|
8fb440c593
|
项目issue功能修改
|
2016-09-27 17:01:04 +08:00 |
|
yuanke
|
89d91f69c2
|
Merge branch 'weixin_guange' into develop
|
2016-09-27 16:20:07 +08:00 |
|
Tim
|
a87e95d0a9
|
课程留言，项目用户反馈样式同步
|
2016-09-27 15:19:04 +08:00 |
|
huang
|
98f47d8b81
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 15:11:06 +08:00 |
|
huang
|
70d58ea28e
|
版本库导出代码统计功能
|
2016-09-27 15:10:52 +08:00 |
|
daiao
|
42ce066cf6
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 14:27:54 +08:00 |
|
daiao
|
a020ab8cd3
|
Issue导出excel带html标签问题
|
2016-09-27 14:27:32 +08:00 |
|
Tim
|
edd03d05d0
|
日历中issue号与完成度超出边框问题修复
|
2016-09-27 14:03:26 +08:00 |
|
huang
|
3d75f708a1
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 13:37:46 +08:00 |
|
huang
|
e7bfc9ee60
|
版本库导出样式
|
2016-09-27 13:37:34 +08:00 |
|
huang
|
405f4e0a20
|
注释掉甘特图的放大缩小功能
|
2016-09-27 13:36:04 +08:00 |
|
daiao
|
d2d0c263d7
|
修改项目issue导出excel的时间输出格式及目标版本
|
2016-09-27 12:08:03 +08:00 |
|
huang
|
c339b3e4a3
|
去掉甘特图中导出pdf功能
|
2016-09-27 11:59:48 +08:00 |
|
daiao
|
871b228743
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 10:48:51 +08:00 |
|
daiao
|
1c33e6481f
|
问题issue列表及其动态的目标版本改为里程碑，
|
2016-09-27 10:48:39 +08:00 |
|
Tim
|
cb21fb8d3d
|
质量分析和分析结果页面宽度调整
|
2016-09-27 10:43:10 +08:00 |
|
huang
|
ca30aefced
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 10:38:47 +08:00 |
|
huang
|
a06b5f0bb9
|
去掉不需要评审
|
2016-09-27 10:38:35 +08:00 |
|
daiao
|
323648a6ef
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 09:57:53 +08:00 |
|
daiao
|
50741ad2a6
|
选中日期后，点清除或所有失效的问题
|
2016-09-27 09:57:44 +08:00 |
|
huang
|
11c3c95c63
|
module中的样式
|
2016-09-27 09:49:03 +08:00 |
|
huang
|
173a0971ac
|
项目上传图片小的问题
|
2016-09-27 09:31:59 +08:00 |
|
huang
|
07ca97510c
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-27 09:21:55 +08:00 |
|
huang
|
cc30093e5c
|
关注、添加成员样式一致
|
2016-09-27 09:21:41 +08:00 |
|
daiao
|
b2ed335146
|
修改issue指派给我名称显示问题
|
2016-09-27 09:16:11 +08:00 |
|
huang
|
e7344b6540
|
项目访问数一致问题
|
2016-09-27 09:13:40 +08:00 |
|
huang
|
db54d6e0d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-09-26 22:21:45 +08:00 |
|
huang
|
528aeaff89
|
Merge branch 'rep_quality' into develop
|
2016-09-26 22:20:08 +08:00 |
 guange
|
497ff2023d
|
merge
|
2016-09-26 21:59:53 +08:00 |
|
guange
|
433f42edbf
|
.
|
2016-09-26 21:58:59 +08:00 |
|
huang
|
5afaeeb76d
|
issue列表数字不准确性判断
|
2016-09-26 21:54:05 +08:00 |
|
guange
|
f3ac21ed42
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-26 21:19:42 +08:00 |
|
guange
|
9620603f17
|
issue条件选择错误
|
2016-09-26 21:19:10 +08:00 |
|
huang
|
5531a236fa
|
统计数字实时刷新
|
2016-09-26 21:02:12 +08:00 |