 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 |
|
huang
|
067426824b
|
news.rb回调修改
|
2016-09-14 15:12:04 +08:00 |
|
daiao
|
e508cba951
|
1.游客进入班级，资源出现了两个入口
|
2016-09-14 15:10:26 +08:00 |
 yuanke
|
154b77a3a7
|
微信班级名改为课程名。班级名
|
2016-09-14 15:10:24 +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 |
|
huang
|
a309bf4f73
|
课程首页show方法优化
|
2016-09-14 11:31:48 +08:00 |
|
huang
|
2222776a26
|
课程推荐代码简化
|
2016-09-14 11:02:28 +08:00 |
|
daiao
|
3e38b09219
|
修复：项目动态附件，组织列表，贴吧列表交流，贴吧吧主，贴吧发帖人，贴吧最后回复，详情页面问题跟踪，项目动态的指派的地方的用户改为显示用户姓名
|
2016-09-14 10:42:30 +08:00 |
|
yuanke
|
cb6a3e7161
|
微信公众号留言回复修改
|
2016-09-14 10:26:18 +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
|
64f9ed3e42
|
Merge branch 'rep_quality' into develop
|
2016-09-13 15:20:02 +08:00 |
|
huang
|
390f68aad6
|
作品列表页面性能提升（主要是数据库查询减少，建立相关索引）
|
2016-09-13 14:57:45 +08:00 |
|
daiao
|
8626692367
|
项目issue：编辑issue后点击确定按钮，却还是返回的编辑模式
|
2016-09-13 14:47:05 +08:00 |
|
yuanke
|
f882c0e8c3
|
微信动态BUG修改
|
2016-09-13 14:11:41 +08:00 |
|
yuanke
|
22da03a1e0
|
微信注册后跳入编辑资料界面，进入别的页面无姓名则跳入编辑资料界面
|
2016-09-13 13:44:26 +08:00 |
|
yuanke
|
4ea468eacb
|
Merge branch 'weixin_guange' into develop
|
2016-09-12 17:44:04 +08:00 |
|
yuanke
|
168a47fabb
|
微信通知显示被删除修改
|
2016-09-12 17:34:55 +08:00 |
|
yuanke
|
7c9f5a4f2d
|
微信通知已被删除加上日志
|
2016-09-12 16:40:31 +08:00 |
|
cxt
|
3f497bafd4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-09-09 18:02:55 +08:00 |
|
cxt
|
61836dbe93
|
组织动态报500
|
2016-09-09 18:02:47 +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 |
|
huang
|
3a6237a6e4
|
修复里程碑样式问题
|
2016-09-09 16:32:15 +08:00 |
|
yuanke
|
80ab8801ce
|
Merge branch 'weixin_guange' into develop
|
2016-09-09 16:05:32 +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 |
|
huang
|
00e6549bec
|
解决issue详情性能N+1问题
|
2016-09-09 15:56:40 +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 |
|
yuanke
|
564da2ed72
|
微信课件下载修改
|
2016-09-09 15:36:15 +08:00 |
|
cxt
|
355f0580cb
|
作业状态的api
|
2016-09-09 15:28:32 +08:00 |
|
daiao
|
de769454a7
|
修复公共贴吧：回复非汉字类型内容超出边框的问题
|
2016-09-09 15:16:08 +08:00 |
|
yuanke
|
9997de0d96
|
微信课件下载不需要登录
|
2016-09-09 15:14:24 +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
|
e0e66b00b9
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-09-09 09:51:25 +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 |
|
daiao
|
2ee9c22186
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
|
2016-09-09 09:16:49 +08:00 |
|
daiao
|
aa27d7def2
|
修复编辑issue，更新附件时，自动回复提示问题（不同Issue下，重名不显示，同意issue下，会更新创建时的附件）
|
2016-09-09 09:16:22 +08:00 |
|
yuanke
|
d6ae177885
|
Merge branch 'weixin_guange' into develop
|
2016-09-09 09:05:59 +08:00 |
|
huang
|
8bb2b5e8d9
|
change sonar reuslts
|
2016-09-09 09:00:21 +08:00 |
|
yuanke
|
4adc988ec1
|
微信图片url修改
|
2016-09-09 08:35:08 +08:00 |
|
yuanke
|
7a71a7bd47
|
Merge branch 'weixin_guange' into develop
|
2016-09-08 18:54:18 +08:00 |
|
yuanke
|
a6b03ed9f1
|
微信头像刷新修改
|
2016-09-08 18:53:36 +08:00 |
|
yuanke
|
5b8ecf6657
|
微信头像刷新修改
|
2016-09-08 18:50:09 +08:00 |
|
Tim
|
2c719feacd
|
无用的内联样式
|
2016-09-08 18:34:35 +08:00 |
|
yuanke
|
8c71cf1946
|
Merge branch 'weixin_guange' into develop
|
2016-09-08 18:18:13 +08:00 |
|
yuanke
|
5c626f94b5
|
微信二级回复框不显示修改
|
2016-09-08 18:04:37 +08:00 |
|
yuanke
|
2ad432c5ce
|
调试
|
2016-09-08 17:51:36 +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 |
|
yuanke
|
be0158fbb0
|
微信二级回复BUG修改
|
2016-09-08 14:10:58 +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 |
|
yuanke
|
18fbf305c1
|
微信上传头像大小限制为1M
|
2016-09-07 16:16:53 +08:00 |
|
cxt
|
49e8a6f1ff
|
作业匿评时：学生点击作业列表中“追加附件”，进入作品列表后要默认打开自己提交的作品且弹出追加附件的弹框
|
2016-09-07 15:45:12 +08:00 |
|
cxt
|
775ed19129
|
admin界面-班级列表：课程列表中不显示已经删除的班级，全部班级列表中显示已经删除的班级
|
2016-09-07 15:26:15 +08:00 |
|
yuanke
|
d8a4eb56cf
|
微信上传头像修改
|
2016-09-07 15:14:46 +08:00 |
|
yuanke
|
c234a8d2cb
|
个人资料修改功能
|
2016-09-07 14:19:07 +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 |