 cxt
|
1bd93904af
|
Merge branch 'cxt_course' into develop
|
2016-09-14 19:47:24 +08:00 |
 Tim
|
9064cf1aa2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-09-14 19:44:56 +08:00 |
|
Tim
|
e8cca255a0
|
分组作业点击展开效果
|
2016-09-14 19:44:46 +08:00 |
|
cxt
|
020018fd31
|
分组作业的作品列表样式修改
|
2016-09-14 19:31:14 +08:00 |
 huang
|
7210eefe1d
|
1156项目讨论区异常问题
|
2016-09-14 18:51:32 +08:00 |
|
cxt
|
6f4618fffb
|
分组作业可对组员单独评分
|
2016-09-14 17:38:57 +08:00 |
|
huang
|
7ea2163bce
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-14 17:36:33 +08:00 |
|
huang
|
9f5e257890
|
作品列表搜索问题
|
2016-09-14 17:36:20 +08:00 |
 daiao
|
cd59a8d597
|
Merge branch 'dev_shcool' into develop
|
2016-09-14 17:28:27 +08:00 |
|
daiao
|
bac1dc7779
|
Isuue详情页面附件上传者由登录名修改为姓名
|
2016-09-14 17:27:21 +08:00 |
|
daiao
|
4e6205e026
|
Merge branch 'dev_shcool' into develop
|
2016-09-14 17:11:12 +08:00 |
|
daiao
|
431f5ae492
|
修复帮助中心弹无效弹框
|
2016-09-14 17:09:26 +08:00 |
|
Tim
|
237d6f7d2e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-14 16:50:56 +08:00 |
|
Tim
|
7cd2a98f11
|
侧导航课程、班级名称长度控制；箭头替换；tip显示更改
|
2016-09-14 16:50:46 +08:00 |
|
cxt
|
e4efc8c302
|
作业编辑
|
2016-09-14 16:45:10 +08:00 |
|
huang
|
aeaf99f79e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-14 16:26:51 +08:00 |
|
daiao
|
bad170ce22
|
Merge branch 'dev_shcool' into develop
|
2016-09-14 16:12:44 +08:00 |
|
daiao
|
5d8ed8c054
|
修改发送附件人名样式的问题
|
2016-09-14 16:07:43 +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
|
5a25eb324b
|
Merge branch 'dev_shcool' into develop
|
2016-09-14 15:13:31 +08:00 |
|
huang
|
054dae7acb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-14 15:13:03 +08:00 |
|
daiao
|
e508cba951
|
1.游客进入班级，资源出现了两个入口
|
2016-09-14 15:10:26 +08:00 |
|
Tim
|
ffedecab7a
|
新问题反馈样式；侧导航课程、班级名称长度js控制
|
2016-09-14 15:05:08 +08:00 |
|
daiao
|
41ab10410f
|
1. PullRequest后面加入请求数目
|
2016-09-14 13:15:00 +08:00 |
|
daiao
|
3e38b09219
|
修复：项目动态附件，组织列表，贴吧列表交流，贴吧吧主，贴吧发帖人，贴吧最后回复，详情页面问题跟踪，项目动态的指派的地方的用户改为显示用户姓名
|
2016-09-14 10:42:30 +08:00 |
|
Tim
|
0444904904
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-14 08:59:25 +08:00 |
|
Tim
|
135a2b21f5
|
新问题反馈样式更新
|
2016-09-13 18:53:00 +08:00 |
|
daiao
|
f0d150ec47
|
点击首页底部的“帮助中心”，弹无效弹框
|
2016-09-13 17:05:42 +08:00 |
|
huang
|
235554a104
|
新闻首页优化
|
2016-09-13 16:34:40 +08:00 |
|
cxt
|
9002844188
|
新版发布作业
|
2016-09-13 16:18:57 +08:00 |
|
huang
|
390f68aad6
|
作品列表页面性能提升（主要是数据库查询减少，建立相关索引）
|
2016-09-13 14:57:45 +08:00 |
|
daiao
|
8626692367
|
项目issue：编辑issue后点击确定按钮，却还是返回的编辑模式
|
2016-09-13 14:47:05 +08:00 |
|
Tim
|
b9fec966c7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-09 17:58:32 +08:00 |
|
Tim
|
1fe8b35fc9
|
课程名称，班级名称过长时，省略号显示
|
2016-09-09 17:58:21 +08:00 |
|
Tim
|
34a1bb0b49
|
侧导航课程，班级名称过长显示效果
|
2016-09-09 17:54:54 +08:00 |
|
huang
|
ddb369928f
|
消息列表问题
|
2016-09-09 17:44:41 +08:00 |
|
huang
|
7fd73348a6
|
消息404问题
|
2016-09-09 17:41:09 +08:00 |
|
huang
|
59ebadd406
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_user_courses.html.erb
|
2016-09-09 17:25:51 +08:00 |
|
daiao
|
67757b90c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-09 17:25:27 +08:00 |
|
daiao
|
75908f976c
|
Merge branch 'dev_shcool' into develop
|
2016-09-09 17:23:45 +08:00 |
|
huang
|
aff9c38737
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-09 17:22:53 +08:00 |
|
huang
|
121537bfcb
|
消息404问题
|
2016-09-09 17:22:38 +08:00 |
|
daiao
|
f9a905a344
|
issue详情页面回复，点击附件直接下载（应该是预览）
|
2016-09-09 17:22:10 +08:00 |
|
Tim
|
3d68e8963a
|
侧导航课程和班级超长时，省略号显示
|
2016-09-09 17:11:51 +08:00 |
|
cxt
|
af1aa2cac4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-09 16:44:28 +08:00 |
|
cxt
|
d44aea1ce1
|
左侧班级列表的黑点改成灰色
|
2016-09-09 16:44:22 +08:00 |
|
huang
|
502bd9f451
|
里程碑样式过长问题
|
2016-09-09 16:37:24 +08:00 |
|
daiao
|
70fc7761da
|
Merge branch 'dev_shcool' into develop
|
2016-09-09 16:03:13 +08:00 |
|
daiao
|
2307c0c3c0
|
项目列表，添加“公开"字样
|
2016-09-09 16:00:51 +08:00 |
|
cxt
|
5d83c66949
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-09-09 15:58:42 +08:00 |
|
huang
|
7899bfe985
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/issues/_form.html.erb
db/schema.rb
|
2016-09-09 16:00:05 +08:00 |
|
cxt
|
0437920438
|
Merge branch 'dev_shcool' into develop
|
2016-09-09 15:58:15 +08:00 |
|
cxt
|
bc2e9f2231
|
Merge branch 'cxt_course' into develop
|
2016-09-09 15:55:54 +08:00 |
|
cxt
|
547e786a10
|
“全部”添加链接
|
2016-09-09 15:54:51 +08:00 |
|
Tim
|
f6efefd38d
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-09-09 15:50:05 +08:00 |
|
Tim
|
862bbd1a1f
|
班级名称前增加课程名，一系列更改
|
2016-09-09 15:49:31 +08:00 |
|
cxt
|
724ae058db
|
班级左侧添加“分班”入口
|
2016-09-09 15:49:24 +08:00 |
|
cxt
|
355f0580cb
|
作业状态的api
|
2016-09-09 15:28:32 +08:00 |
|
daiao
|
de769454a7
|
修复公共贴吧：回复非汉字类型内容超出边框的问题
|
2016-09-09 15:16:08 +08:00 |
|
daiao
|
96dfa4281d
|
修复：强制修改页面，左侧编辑个人资料可用
|
2016-09-09 15:03:46 +08:00 |
|
daiao
|
89f3e0ee0d
|
项目iuss:编辑issue时，弹出空白弹框的问题
|
2016-09-09 14:43:47 +08:00 |
|
huang
|
4900ff5492
|
里程碑中添加 完成者姓名
|
2016-09-09 14:36:03 +08:00 |
|
daiao
|
19d925d592
|
项目列表中公开项目无法点击
|
2016-09-09 14:22:47 +08:00 |
|
daiao
|
4959910ebe
|
ucloud无法发布新issue
|
2016-09-09 14:20:56 +08:00 |
|
Tim
|
b796ac3b53
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/exercise/_student_table.html.erb
db/schema.rb
|
2016-09-09 13:30:10 +08:00 |
|
Tim
|
a88a36bd35
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-09 13:27:53 +08:00 |
|
cxt
|
d0686b46d7
|
在线测验：如图截止时间未到，是不能点击查看作品详情的，建议去掉左侧提示“点击查看详情”，测验结果列表的样式调整
|
2016-09-09 11:09:47 +08:00 |
|
huang
|
b308100d3e
|
去掉管理员界面项目复制功能
|
2016-09-09 10:50:30 +08:00 |
|
daiao
|
d9ad0fa1d7
|
issue详情界面回复之后，图片附件是下载，而不是放大
|
2016-09-09 10:39:39 +08:00 |
|
cxt
|
b3f738ee5d
|
与班级相关平台班级名称规范调整
|
2016-09-09 10:23:18 +08:00 |
|
huang
|
c025e40905
|
解决正式版管理员界面选择跟踪标签500问题
|
2016-09-09 09:51:02 +08:00 |
|
daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
2016-09-09 09:31:17 +08:00 |
|
Tim
|
2c719feacd
|
无用的内联样式
|
2016-09-08 18:34:35 +08:00 |
|
huang
|
6dbb2e4e94
|
Pull request数量为0的时候显示在更多中
|
2016-09-08 16:03:32 +08:00 |
|
huang
|
08c64d2ac7
|
解决新建及复制issue时点击取消没反应的问题
|
2016-09-08 15:38:01 +08:00 |
|
cxt
|
cf25dc8dfd
|
首页的项目列表
|
2016-09-08 15:00:20 +08:00 |
|
cxt
|
d8e04e7923
|
暂时隐藏“复制班级”
|
2016-09-08 14:04:40 +08:00 |
|
cxt
|
ab0863c9fb
|
平台的邀请码提示
|
2016-09-08 13:59:48 +08:00 |
|
cxt
|
3efc158fb5
|
班级作业：当已经发布了作业再去编辑作业时，现在是“发布时间”就不能再编辑了，建议代码判断只有当学生已经提交了作品或关联了项目才禁止再编辑发布时间，且要给出必要提示
|
2016-09-08 10:54:41 +08:00 |
|
cxt
|
49e8a6f1ff
|
作业匿评时：学生点击作业列表中“追加附件”，进入作品列表后要默认打开自己提交的作品且弹出追加附件的弹框
|
2016-09-07 15:45:12 +08:00 |
|
cxt
|
775ed19129
|
admin界面-班级列表：课程列表中不显示已经删除的班级，全部班级列表中显示已经删除的班级
|
2016-09-07 15:26:15 +08:00 |
|
cxt
|
e6ddb3cec0
|
个人主页动态过滤中点击全部动态要显示当前用户关联的所有动态
|
2016-09-07 11:30:26 +08:00 |
|
Tim
|
95824e3b6b
|
新建课程增加名称正确错误示例，课程说明
|
2016-09-07 11:24:38 +08:00 |
|
cxt
|
e084543030
|
新建作业时给出截止日期和发布日期的提示
|
2016-09-07 10:45:22 +08:00 |
|
cxt
|
5433e6d714
|
多重角色，教师/助教查看自己作为学生身份时提交的作品，追加附件重复显示
|
2016-09-07 09:29:06 +08:00 |
|
Tim
|
99e63b1477
|
班级推荐数字block颜色字体更改；测验学号超出省略号显示
|
2016-09-06 17:22:38 +08:00 |
|
cxt
|
17f6b9c286
|
管理员界面的被留言内容加上“RE: ”
|
2016-09-06 15:17:49 +08:00 |
|
cxt
|
1e7f3db946
|
分组作业：组内每个成员都复制一份组长的作业，得分相同
|
2016-09-06 15:07:43 +08:00 |
|
daiao
|
cdd4dfcf09
|
项目列表中：私有项目对非成员显示，非成员不点击进入
|
2016-09-05 16:55:56 +08:00 |
|
cxt
|
252851b4ad
|
课程导航的修改
|
2016-09-05 16:36:43 +08:00 |
|
cxt
|
7123c66481
|
课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面
|
2016-09-05 16:20:38 +08:00 |
|
cxt
|
ad0acb5188
|
课程大纲的内容图片自适应大小
|
2016-09-05 14:31:49 +08:00 |
|
cxt
|
2974833533
|
新建班级页面--创建课程后面，增加： 然后 【刷新】
|
2016-09-05 14:14:25 +08:00 |
|
cxt
|
573eb13283
|
课程导航中的用户是创建该课程的老师，课程链接应跳到该用户的课程列表
|
2016-09-05 13:52:42 +08:00 |
|
daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
2016-09-05 13:47:39 +08:00 |
|
daiao
|
bb0bafb0fd
|
1.修复项目名称太长，导致动态显示名称与issue编辑图标按钮重叠
|
2016-09-05 13:27:41 +08:00 |
|
Tim
|
f94b048af2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-05 13:18:55 +08:00 |
|
Tim
|
9ec6074260
|
将头部帮助中心改为贴吧交流
|
2016-09-05 13:18:35 +08:00 |
|
cxt
|
36e541a6d0
|
消息列表报500
|
2016-09-05 11:30:13 +08:00 |
|
huang
|
3e17edecd1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 19:05:46 +08:00 |
|
huang
|
2cd41cde7f
|
1706项目500问题
|
2016-09-02 19:05:21 +08:00 |
|
cxt
|
c794c6197d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 18:19:43 +08:00 |
|
huang
|
7b6657a3e6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 16:51:23 +08:00 |
|
huang
|
2c03bfbf3a
|
资源提示权限控制
|
2016-09-02 16:51:05 +08:00 |
|
cxt
|
b8d04c1352
|
课程列表的主讲老师改为创建老师
|
2016-09-02 16:40:07 +08:00 |
|
cxt
|
01ca94bc98
|
未读消息弹框
|
2016-09-02 16:21:58 +08:00 |
|
daiao
|
9a3603c778
|
1.基本资料页面，身份为从业者时，直接点确定报提示问题
2.强制修改基本资料，修改资料按键错误
|
2016-09-02 16:11:14 +08:00 |
|
cxt
|
0d2a3cbe36
|
测试版消息列表报500
|
2016-09-02 16:00:54 +08:00 |
|
cxt
|
b588495847
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:26:23 +08:00 |
|
huang
|
6c0bcadf6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:27:08 +08:00 |
|
cxt
|
e949566d3d
|
合并
|
2016-09-02 15:26:00 +08:00 |
|
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
|
huang
|
58176456e1
|
Merge branch 'develop' into rep_quality
|
2016-09-02 15:23:00 +08:00 |
|
cxt
|
4cdef4a22b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 15:22:20 +08:00 |
|
cxt
|
613f974440
|
项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复
|
2016-09-02 15:22:09 +08:00 |
|
huang
|
3881e5c5c5
|
资源搜索的是时候tip局部刷新
组织资源更新公开私有问题
|
2016-09-02 14:50:06 +08:00 |
|
Tim
|
0d7e9d4f9b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 14:45:11 +08:00 |
|
Tim
|
396664d4e7
|
课程右侧增加下间距
|
2016-09-02 14:45:01 +08:00 |
|
cxt
|
e70334ea16
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-02 14:43:07 +08:00 |
|
cxt
|
51ef4a96e6
|
课程导航添加链接
|
2016-09-02 14:42:59 +08:00 |
|
Tim
|
d0a2ea02f2
|
学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示
|
2016-09-02 14:27:49 +08:00 |
|
cxt
|
ded6753ce1
|
访问他人的主页只显示他本人的动态
|
2016-09-02 14:23:02 +08:00 |
|
Tim
|
0974153364
|
课程加入路径显示
|
2016-09-02 13:49:08 +08:00 |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
2016-09-02 13:25:01 +08:00 |
|
huang
|
2e36cf6d6a
|
课程资源库添加资源提示及
|
2016-09-02 12:12:26 +08:00 |
|
huang
|
fa25a78f62
|
项目资源库 添加私有资源提示及局部过滤刷新
|
2016-09-02 11:27:35 +08:00 |
|
cxt
|
231c660744
|
老师对帖子的删除权限
|
2016-09-02 10:06:03 +08:00 |
|
cxt
|
f78595bbbb
|
管理员界面中的学校列表支持按用户数排序
|
2016-09-01 17:11:39 +08:00 |
|
huang
|
e798381feb
|
项目资源数改成实时获取
|
2016-09-01 16:39:09 +08:00 |
|
huang
|
17440ca5dc
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-01 16:04:00 +08:00 |
|
huang
|
79e30862e9
|
change sonar method into restart and cancel push events
|
2016-09-01 15:58:53 +08:00 |
|
Tim
|
4d93b860f9
|
作品信息确认时，描述文字折行
|
2016-09-01 15:35:45 +08:00 |
|
Tim
|
d080f0bb16
|
Merge branch 'cs_optimize_txz' into develop
|
2016-09-01 14:34:56 +08:00 |
|
huang
|
742c84bb26
|
项目隐藏之 issue详情页面发送隐藏课程信息
|
2016-09-01 14:30:56 +08:00 |
|
Tim
|
27a2da8b7b
|
意见反馈增加二维码
|
2016-09-01 13:56:13 +08:00 |
|
huang
|
5527b4e3a9
|
项目隐藏之 公共资源库底端发送隐藏课程信息
|
2016-09-01 12:25:35 +08:00 |
|
huang
|
4903064a5b
|
项目隐藏之 公共资源右键发送隐藏课程功能
|
2016-09-01 12:18:39 +08:00 |
|
huang
|
c51f725a78
|
项目隐藏之 项目动态中讨论区 新闻发送隐藏课程信息
|
2016-09-01 11:24:16 +08:00 |
|
huang
|
1444511fd9
|
项目隐藏之 项目讨论区详情页面 发送隐藏课程信息
|
2016-09-01 11:18:07 +08:00 |
|
huang
|
efa162fdeb
|
项目隐藏之组织资源发送
|
2016-09-01 11:16:09 +08:00 |
|
huang
|
b2aba0f0bc
|
项目隐藏之 新闻发送隐藏课程信息
|
2016-09-01 11:12:56 +08:00 |
|
huang
|
3856ed8033
|
项目隐藏之资源发送项目组织
|
2016-09-01 11:00:34 +08:00 |
|
huang
|
52a8a64a69
|
项目隐藏 项目讨论区发送中去掉课程
|
2016-09-01 10:48:13 +08:00 |
|
cxt
|
5676f0b82f
|
项目类消息为空导致消息列表报500
|
2016-08-31 17:14:32 +08:00 |
|
daiao
|
548a263f0f
|
1.修复项目新闻发送至其他项目后，位于讨论区下的bug
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
|
2016-08-31 17:09:02 +08:00 |
|
cxt
|
7efdda5b45
|
班级老师也可以点击班级logo进行编辑
|
2016-08-31 17:01:31 +08:00 |
|
huang
|
9b14b86b64
|
隐藏项目之 隐藏组织左侧的信息
|
2016-08-31 16:01:23 +08:00 |
|
huang
|
ac85eadc30
|
资源库点击切换样式
|
2016-08-31 15:42:17 +08:00 |
|
huang
|
1f6bd68e61
|
隐藏项目 组织隐藏课程信息
|
2016-08-31 15:37:28 +08:00 |
|
Tim
|
ecf7522c4b
|
Merge branch 'cs_optimize_txz' into rep_quality
|
2016-08-31 15:32:23 +08:00 |