 cxt
|
5870c3eaaf
|
子栏目讨论区列表的排序、作品内容的样式调整
|
2016-10-14 18:24:54 +08:00 |
|
cxt
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +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
|
12ad7c1612
|
班级讨论区增加二级子栏目
|
2016-10-14 14:28:19 +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
|
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
|
59f2478cae
|
首页动态过滤 “课程动态” -》“班级动态”
|
2016-10-13 11:25:26 +08:00 |
|
huang
|
dd4d20011d
|
公共资源库显示优化
|
2016-10-13 09:43:53 +08:00 |
|
cxt
|
a581f989c9
|
给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复
|
2016-10-11 14:08:44 +08:00 |
 daiao
|
61b07e3f13
|
资源库，公有资源/我的资源中，根据大小，下载数，上传时间排序时，箭头样式不对
|
2016-10-11 09:53:27 +08:00 |
|
cxt
|
87050a2adf
|
挂起的作业报500
|
2016-09-30 17:49:01 +08:00 |
|
cxt
|
ec0d21b243
|
戴傲项目相关
|
2016-09-30 17:27:30 +08:00 |
|
cxt
|
db9d4900ac
|
Merge branch 'cxt_course' into develop
|
2016-09-30 16:48:05 +08:00 |
|
cxt
|
f1b9a98084
|
编辑作业报500
|
2016-09-30 16:32:12 +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
|
17c82c5291
|
已提交作品的分组作业可扩大分组范围
|
2016-09-29 17:17:17 +08:00 |
|
huang
|
b679783cc0
|
项目动态中issue回复显示
|
2016-09-27 20:04:29 +08:00 |
|
daiao
|
1c33e6481f
|
问题issue列表及其动态的目标版本改为里程碑，
|
2016-09-27 10:48:39 +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 |
 Tim
|
0e531aa529
|
题库标题颜色加深，common.css去重
|
2016-09-26 14:27:33 +08:00 |
|
cxt
|
398a6f1da7
|
Merge branch 'cxt_course' into develop
|
2016-09-23 16:50:45 +08:00 |
|
cxt
|
0a74660cfb
|
Merge branch 'cs_optimize_txz' into develop
|
2016-09-23 16:49:04 +08:00 |
|
cxt
|
2e58a219e4
|
作业回复无法展开
|
2016-09-23 16:47:32 +08:00 |
|
daiao
|
d0ae48bbf1
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-22 16:13:45 +08:00 |
|
daiao
|
aacac0aa02
|
里程碑相关样式修改
|
2016-09-22 16:12:32 +08:00 |
|
huang
|
de0f49f850
|
ISSUE列表添加新的分页
|
2016-09-22 14:38:45 +08:00 |
|
Tim
|
dac9502f1f
|
资源库来源title显示带html代码bug修复
|
2016-09-22 14:25:09 +08:00 |
|
cxt
|
d1c284c953
|
作业详情页
|
2016-09-21 10:34:38 +08:00 |
|
Tim
|
fec493b287
|
Merge branch 'develop' into cs_optimize_txz
|
2016-09-21 09:44:59 +08:00 |
|
Tim
|
e4f6852d1b
|
我的作业页面，按钮字体大小统一，作品数宽度增加
|
2016-09-21 09:44:02 +08:00 |
|
cxt
|
ba4a1c64d9
|
作业动态的重构
|
2016-09-19 17:14:14 +08:00 |
|
daiao
|
984b540a63
|
游客身份，进入具体的班级和项目各功能入口的调整
|
2016-09-19 10:01:22 +08:00 |
|
huang
|
728e1333fc
|
issue author为空处理
|
2016-09-18 15:58:55 +08:00 |
|
cxt
|
fc630b9322
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-18 15:11:20 +08:00 |
|
cxt
|
19721e20c5
|
Merge branch 'cxt_course' into develop
|
2016-09-18 15:11:11 +08:00 |
|
cxt
|
3f7935bf85
|
班级/项目帖子锁定回复的，已有回复的二级回复按钮未屏蔽
|
2016-09-18 14:39:03 +08:00 |
 liguangye
|
53bdeed1e4
|
解决铃铛404问题
|
2016-09-18 14:20:08 +08:00 |
|
huang
|
a593fa9239
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-14 20:33:41 +08:00 |
|
huang
|
54df8307a8
|
issue 500问题
|
2016-09-14 20:33:25 +08:00 |
|
cxt
|
1bd93904af
|
Merge branch 'cxt_course' into develop
|
2016-09-14 19:47:24 +08:00 |
|
huang
|
7210eefe1d
|
1156项目讨论区异常问题
|
2016-09-14 18:51:32 +08:00 |
|
cxt
|
e4efc8c302
|
作业编辑
|
2016-09-14 16:45:10 +08:00 |
|
huang
|
89de36ec65
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-14 15:24:02 +08:00 |
|
daiao
|
3e38b09219
|
修复：项目动态附件，组织列表，贴吧列表交流，贴吧吧主，贴吧发帖人，贴吧最后回复，详情页面问题跟踪，项目动态的指派的地方的用户改为显示用户姓名
|
2016-09-14 10:42:30 +08:00 |
|
huang
|
235554a104
|
新闻首页优化
|
2016-09-13 16:34:40 +08:00 |
|
cxt
|
9002844188
|
新版发布作业
|
2016-09-13 16:18:57 +08:00 |
|
huang
|
7fd73348a6
|
消息404问题
|
2016-09-09 17:41:09 +08:00 |