 huang
|
9113c93e49
|
项目成员列表点击跳入新的页面
|
2016-11-11 16:59:34 +08:00 |
 cxt
|
93c10515df
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:59:28 +08:00 |
|
cxt
|
7298e983fa
|
如图课程大纲中“加入班级”，输入错误的邀请码，提示“您加入的班级不存在”不合理，应该是“您输入的邀请码错误”
|
2016-11-11 16:59:15 +08:00 |
|
huang
|
f71a21155f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:54:47 +08:00 |
|
huang
|
a655e73c50
|
配置中成员链接改成登录名
|
2016-11-11 16:54:24 +08:00 |
|
cxt
|
cb5ca96bb5
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_homework.html.erb
db/schema.rb
|
2016-11-11 16:53:20 +08:00 |
|
cxt
|
16c51e1eaa
|
基于项目的分组作业没有显示项目详情
|
2016-11-11 16:50:25 +08:00 |
|
huang
|
8c48c3d420
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:46:07 +08:00 |
|
huang
|
f41a36557a
|
时间插件改为英文
|
2016-11-11 16:45:43 +08:00 |
 daiao
|
e1afe9d2d7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:36:13 +08:00 |
|
daiao
|
92531ce487
|
项目简介样式调整
|
2016-11-11 16:35:26 +08:00 |
|
huang
|
442fb8a531
|
添加fork成员列表
|
2016-11-11 16:09:43 +08:00 |
|
daiao
|
fff56c08de
|
Merge branch 'dev_newproject' into develop
|
2016-11-11 15:24:01 +08:00 |
|
cxt
|
d1bfdde261
|
班级名称命名和显示规范调整
|
2016-11-11 15:19:22 +08:00 |
|
daiao
|
812c74134a
|
Merge branch 'develop' into dev_newproject
|
2016-11-11 14:55:29 +08:00 |
|
huang
|
1fdf6e2053
|
用户动态中一些用户的url显示登录名
|
2016-11-11 14:55:19 +08:00 |
|
huang
|
50a14ad5fe
|
修改判断整数的方法
|
2016-11-11 14:26:58 +08:00 |
|
huang
|
4d1d6506fe
|
用户登录后点左侧个人主页url路径问题及用课程动态中url转换成login
|
2016-11-11 14:13:56 +08:00 |
|
huang
|
846ef5f72c
|
博客列表中用户id改成login
|
2016-11-11 14:03:09 +08:00 |
|
cxt
|
07b97c8eb9
|
学生列表增加删除功能、删除学生时删除其对应的作品
|
2016-11-11 13:58:07 +08:00 |
|
huang
|
42503fa6c6
|
课程大纲中用户url的id改成login
|
2016-11-11 13:55:38 +08:00 |
|
daiao
|
5742a9951e
|
项目-配置-成员，翻页时，当前页用蓝色颜色标识
|
2016-11-11 13:44:39 +08:00 |
|
huang
|
ae6821f252
|
组织配置中用户url为ID
|
2016-11-11 13:43:11 +08:00 |
|
huang
|
a44170217c
|
组织用户头像链接中带用户ID
|
2016-11-11 13:37:50 +08:00 |
|
huang
|
14178b0f8f
|
解决组织中成员列表用户url为ID的问题
|
2016-11-11 13:33:06 +08:00 |
|
huang
|
b633200ab6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 10:38:10 +08:00 |
|
huang
|
aab24ea34a
|
解决顶部fork路由错误，已经fork过该项目的添加提示
|
2016-11-11 10:37:20 +08:00 |
 yuanke
|
c59081c824
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-11 10:24:22 +08:00 |
|
cxt
|
0d8d2fbc90
|
班级活跃度排行去除老师和教辅
|
2016-11-11 09:29:29 +08:00 |
|
yuanke
|
eb56a134d3
|
作业微信通知消息改为异步发送并且只发送给学生
|
2016-11-11 09:28:10 +08:00 |
|
daiao
|
9bdc76b6e3
|
项目issue详情页面，点击指派给跳个人主页
|
2016-11-10 17:34:58 +08:00 |
|
cxt
|
1e0c2e5d6a
|
班级首页的活跃度和英雄榜由3个增加到6个
|
2016-11-10 17:28:14 +08:00 |
|
cxt
|
4a5e350615
|
个人主页：删除个人留言动态，却跳转到个人留言页面去了，不合理
|
2016-11-10 17:24:00 +08:00 |
|
daiao
|
ae84afe43e
|
项目issue，新建和编辑issue时，上传附件时，保存按钮不可点击
|
2016-11-10 17:16:54 +08:00 |
|
cxt
|
6cc38ee51e
|
班级留言回复中用户头像建议加链接返回该用户主页
|
2016-11-10 17:12:04 +08:00 |
|
yuanke
|
5a99b632b8
|
资源描述不变时不请求后台
|
2016-11-10 15:55:51 +08:00 |
|
daiao
|
b1e0cc7884
|
里程碑所有ISSUE 标题与指派着加链接，并对指派着为空报500处理
|
2016-11-10 15:45:00 +08:00 |
|
daiao
|
590af4ff4a
|
编辑issue，删除上传issue为实时刷新
|
2016-11-10 15:19:13 +08:00 |
|
daiao
|
5bf519bbf7
|
项目里程碑，新建里程碑弹框样式
|
2016-11-10 14:18:53 +08:00 |
|
daiao
|
4fc98308bc
|
项目简介样式问题
|
2016-11-10 13:34:43 +08:00 |
|
daiao
|
43e72813b4
|
当指派着为空时，导出统计为空
|
2016-11-10 11:11:28 +08:00 |
|
huang
|
ec39b2d52c
|
用户个人主页姓名添加url
|
2016-11-10 11:11:14 +08:00 |
|
yuanke
|
88d489b485
|
作业列表设留言at消息为已读改为delay_job执行
|
2016-11-10 10:41:35 +08:00 |
|
huang
|
3dcd38a059
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-10 10:31:40 +08:00 |
|
huang
|
ceb4bef0c4
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-10 10:28:24 +08:00 |
|
huang
|
0f328c9c58
|
解决用户ID转换成用户名后引发的问题
|
2016-11-10 10:27:57 +08:00 |
|
yuanke
|
7e657a4ad0
|
提问反馈框去掉X按钮
|
2016-11-10 09:23:12 +08:00 |
|
daiao
|
c5ab8550ff
|
项目里程碑，配置的里程碑点击编辑弹框时间样式修改
|
2016-11-10 09:12:07 +08:00 |
|
daiao
|
a8a7029746
|
班级资源库，资源描述输入非汉字类型过长时，对学生成员只显示一行内容
|
2016-11-09 16:26:50 +08:00 |
|
huang
|
6322d18325
|
里程碑编辑的时候日历不显示的问题
|
2016-11-09 16:06:41 +08:00 |
|
huang
|
e39c3cfd9c
|
解决里程碑新建里程碑的时候弹窗不显示日历
|
2016-11-09 15:57:06 +08:00 |
|
huang
|
919e973efb
|
项目配置中框框没对齐问题
|
2016-11-09 14:57:39 +08:00 |
|
huang
|
cf67c8603c
|
项目配置中 编辑里程碑的样式及日历无法显示问题
|
2016-11-09 14:55:25 +08:00 |
|
huang
|
36e363c278
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-09 14:43:16 +08:00 |
|
huang
|
8848bfb06f
|
配置中最新里程碑放置最前面
|
2016-11-09 14:42:50 +08:00 |
|
yuanke
|
77f3921d0e
|
.
|
2016-11-09 14:20:13 +08:00 |
|
yuanke
|
10f810960e
|
.
|
2016-11-09 14:15:37 +08:00 |
|
yuanke
|
59e6495610
|
...
|
2016-11-09 14:04:44 +08:00 |
|
daiao
|
2b164594f6
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-09 13:34:23 +08:00 |
|
daiao
|
f6eb96cfdc
|
项目头部点击fork弹框
|
2016-11-09 13:34:03 +08:00 |
|
yuanke
|
69996e8550
|
.
|
2016-11-09 11:29:10 +08:00 |
|
huang
|
018b982f7f
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-09 10:41:56 +08:00 |
|
huang
|
431ff8b31c
|
甘特图配置及issue导出指派人为空的问题
|
2016-11-09 10:40:59 +08:00 |
|
daiao
|
f45e9f992c
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-09 10:02:12 +08:00 |
|
daiao
|
c1cf633d2c
|
项目版本库样式调整
|
2016-11-09 10:01:56 +08:00 |
|
huang
|
a8575c3476
|
版本库查看 历史记录 下载显示及返回
|
2016-11-08 17:31:39 +08:00 |
|
huang
|
2122a06608
|
版本库大写转小写，解决路径问题
|
2016-11-08 17:12:35 +08:00 |
|
huang
|
9a9250f6e1
|
fork弹框
|
2016-11-08 16:40:25 +08:00 |
|
huang
|
dfcf93082a
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-08 16:20:30 +08:00 |
|
huang
|
14f66e1e82
|
版本库添加返回上一级目录
|
2016-11-08 16:20:07 +08:00 |
|
daiao
|
27c8d53cad
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-08 16:19:23 +08:00 |
|
daiao
|
ac60940c34
|
1.项目头部样式调整
|
2016-11-08 16:18:59 +08:00 |
|
huang
|
736c93fc13
|
解决查看文件改动的时候403问题
|
2016-11-08 15:45:32 +08:00 |
|
cxt
|
070e18a9b2
|
作业动态优化
|
2016-11-08 15:39:00 +08:00 |
|
huang
|
c27faf862f
|
版本库单个文件历史记录修改
|
2016-11-08 15:30:16 +08:00 |
|
huang
|
b5f035d286
|
版本库详情页面添加目录回退功能，部分功能及界面调整
|
2016-11-08 15:21:12 +08:00 |
|
huang
|
83f2270edc
|
完成版本库的目录选择功能
|
2016-11-08 12:19:21 +08:00 |
|
huang
|
721a916a20
|
版本库按钮调整
|
2016-11-08 10:44:57 +08:00 |
|
huang
|
c217af8cea
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-08 10:23:27 +08:00 |
|
huang
|
a3dfd03e81
|
项目顶端框架搭建及权限判断
|
2016-11-08 10:23:02 +08:00 |
|
yuanke
|
4f7531b0c4
|
修改群号
|
2016-11-08 09:28:32 +08:00 |
|
daiao
|
bdf423bc81
|
编辑issue时，删除上传的附件，未自动刷新
|
2016-11-08 09:21:45 +08:00 |
|
huang
|
cceadb02ce
|
Merge branch 'develop' into dev_newproject
|
2016-11-07 17:19:47 +08:00 |
|
huang
|
0ef3dbf5f8
|
Merge branch 'develop' into dev_newproject
|
2016-11-07 17:18:36 +08:00 |
|
cxt
|
85b1d145fe
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-11-07 17:13:10 +08:00 |
|
cxt
|
2bb018b0fe
|
导入问卷的弹框用新版样式
|
2016-11-07 17:12:29 +08:00 |
|
daiao
|
e57e439210
|
新建，编辑issue时，上传附件尽课程展示全
|
2016-11-07 17:08:24 +08:00 |
|
daiao
|
83c801878d
|
问卷答题与查看页预览答题框的宽度设为一致
|
2016-11-07 16:20:46 +08:00 |
|
daiao
|
6dbf031d3b
|
问卷编辑icon显示效果调整
|
2016-11-07 16:03:04 +08:00 |
|
cxt
|
356fbfe792
|
班级问卷：新建问卷时，如图不输入标题及描述直接点击“取消”，再点击保存或发布，却提示保存成功和发布成功
|
2016-11-07 15:44:40 +08:00 |
|
yuanke
|
788193f6e1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-07 15:35:21 +08:00 |
|
yuanke
|
cb975d1cb2
|
组织一级帖子点击BUG
|
2016-11-07 15:35:02 +08:00 |
|
daiao
|
3d2d526149
|
新建和编辑ISSUE，上传附件名称显示问题
|
2016-11-07 15:21:00 +08:00 |
|
cxt
|
87c443ab1e
|
Merge branch 'cxt_course' into develop
|
2016-11-07 14:45:08 +08:00 |
|
cxt
|
4c9a3b769e
|
分组作业老师评分时“组员同分”默认勾选
|
2016-11-07 14:43:45 +08:00 |
|
cxt
|
70a6a26819
|
班级作业：分组作业，开启了匿评后，某组再加了某组员，如图该组员看到的作业列表中不应该是“作品匿评”
|
2016-11-07 14:38:10 +08:00 |
|
yuanke
|
5ec5bc9a57
|
修改加入QQ群的链接
|
2016-11-07 14:25:41 +08:00 |
|
cxt
|
f8316ee1ee
|
分组作业的缺评扣分
|
2016-11-07 14:06:11 +08:00 |
|
daiao
|
e70c66b5ac
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/views/projects/_act_issues.html.erb
|
2016-11-07 13:30:15 +08:00 |
|
daiao
|
8b5879217d
|
调整新建项目issue页面
|
2016-11-07 13:28:50 +08:00 |