 yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
2016-05-20 20:08:46 +08:00 |
 huang
|
18054dd96d
|
私有资源不能下载
|
2016-05-20 17:04:20 +08:00 |
 cxt
|
7b0fd246ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:39:16 +08:00 |
|
cxt
|
da375dcb4e
|
挂起作业的作品列表中下拉列表的内容为空，截止时间和发布时间不应显示
|
2016-05-20 15:39:07 +08:00 |
|
huang
|
1c400669aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:36:00 +08:00 |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-05-20 15:35:08 +08:00 |
|
huang
|
5114c12c17
|
注释掉为完成的代码
|
2016-05-20 15:34:35 +08:00 |
|
huang
|
dddd7e0ea2
|
下载
|
2016-05-20 15:28:09 +08:00 |
|
huang
|
b1e0618742
|
导入资源不能用的问题
|
2016-05-20 15:05:04 +08:00 |
|
huang
|
352b40dd96
|
默认为“公共资源”
|
2016-05-20 13:52:39 +08:00 |
|
huang
|
80f829c018
|
解决搜索不能用的问题
|
2016-05-20 10:48:17 +08:00 |
|
huang
|
92f55e0dc1
|
公共资源库，点击底部不能发送的问题
|
2016-05-20 10:02:59 +08:00 |
|
cxt
|
b03b9a3c27
|
课程：问卷导入时显示的数据未进行过滤
|
2016-05-20 09:59:41 +08:00 |
|
huang
|
f806dbf587
|
资源发送至组织和课程
|
2016-05-19 17:12:33 +08:00 |
|
huang
|
e0370e3e32
|
私有资源中发送文件
|
2016-05-19 17:04:46 +08:00 |
|
cxt
|
df70c33bcd
|
学生列表活跃度为0
|
2016-05-19 16:39:14 +08:00 |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
2016-05-19 16:11:06 +08:00 |
|
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
2016-05-19 16:10:18 +08:00 |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
2016-05-19 15:26:23 +08:00 |
|
huang
|
0b2f6c9a53
|
私有资源的搜索和排序
|
2016-05-19 14:28:13 +08:00 |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
2016-05-19 13:50:45 +08:00 |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
2016-05-19 11:32:58 +08:00 |
|
huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
2016-05-18 17:37:48 +08:00 |
|
cxt
|
31d94dc052
|
发布可引用的作业至课程，作业的原作者不应收到微信消息提醒
|
2016-05-18 16:28:43 +08:00 |
|
cxt
|
3b3cafbc81
|
微信模板消息的还原
|
2016-05-18 14:49:49 +08:00 |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
2016-05-17 16:30:03 +08:00 |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
|
huang
|
0cba32ecd6
|
北斗单点登录引起的500问题
|
2016-05-17 11:23:20 +08:00 |
|
huang
|
4c066f9ad3
|
初始化单点登录用户同步用户角色
|
2016-05-17 11:21:05 +08:00 |
 guange
|
80be46dc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-16 17:44:32 +08:00 |
|
guange
|
4b4a48b0c4
|
sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开
|
2016-05-16 17:44:08 +08:00 |
|
yuanke
|
025d07e6a4
|
代码测试编译信息长度限制不小心注释了
|
2016-05-16 17:02:18 +08:00 |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
2016-05-16 16:57:18 +08:00 |
|
huang
|
09c462ebad
|
资源代码还原
|
2016-05-15 08:50:10 +08:00 |
|
yuanke
|
24b969e781
|
Merge branch 'yuanke' into develop
|
2016-05-15 00:02:49 +08:00 |
|
yuanke
|
e24470db4c
|
代码测试截取ERROR_MSG时只在编译错误下截取
|
2016-05-15 00:00:16 +08:00 |
|
guange
|
8411a08ddb
|
修改错别字
|
2016-05-14 09:43:01 +08:00 |
|
huang
|
37b93a4595
|
文章回复不能用的问题
|
2016-05-13 20:01:45 +08:00 |
|
huang
|
aef178183c
|
我的资源附件不能删的问题
|
2016-05-13 19:41:07 +08:00 |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
2016-05-13 18:25:15 +08:00 |
|
huang
|
b9e5c77b91
|
资源500问题
|
2016-05-13 18:02:06 +08:00 |
|
cxt
|
695e870a26
|
作品的统计不见了
|
2016-05-13 17:30:05 +08:00 |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
2016-05-13 17:24:12 +08:00 |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
2016-05-13 17:11:53 +08:00 |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
2016-05-13 16:56:02 +08:00 |
|
huang
|
39d014355b
|
科大名师，和名师列表添加标题
|
2016-05-13 16:30:45 +08:00 |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
|
huang
|
660cf7ef73
|
名师列表局部搜索
|
2016-05-13 14:52:33 +08:00 |
|
huang
|
0feb1280fd
|
名师更多列表
及相关入口路由
|
2016-05-13 14:23:36 +08:00 |