 huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
2016-05-18 17:37:48 +08:00 |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
2016-05-18 14:49:13 +08:00 |
|
huang
|
615d0ddbd2
|
公共资源、私有资源请求分享界面及样式
|
2016-05-17 16:45:11 +08:00 |
|
huang
|
07678e367e
|
资源新样式删除功能
|
2016-05-17 15:32:18 +08:00 |
|
huang
|
4c71e525a7
|
资源新样式增加后，重命名功能
|
2016-05-17 15:30:10 +08:00 |
|
huang
|
61ba7b0c30
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-17 11:22:03 +08:00 |
|
huang
|
e9c35ae20f
|
组织未登录情况默认图片展示
|
2016-05-17 10:13:03 +08:00 |
|
huang
|
985b1e4c95
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-17 10:06:17 +08:00 |
 Tim
|
15ea9a9659
|
组织门户自动播放禁用
|
2016-05-17 10:04:23 +08:00 |
|
Tim
|
1402ae190d
|
组织头像
|
2016-05-17 10:03:26 +08:00 |
|
huang
|
20e8627b02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-17 09:52:51 +08:00 |
|
huang
|
326c3a84a0
|
还原域名问题
|
2016-05-17 09:52:26 +08:00 |
|
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
2016-05-17 09:36:55 +08:00 |
|
Tim
|
aee56c7eca
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-17 09:15:05 +08:00 |
|
Tim
|
545e4ac380
|
禁用组织门户合作伙伴自动滚动效果
|
2016-05-17 09:11:30 +08:00 |
|
huang
|
b0f9d0280f
|
0
|
2016-05-17 09:06:38 +08:00 |
|
huang
|
13cc5ceaa6
|
model中添加获取二级域名的方法
|
2016-05-17 09:02:17 +08:00 |
|
Tim
|
e9a3bc5094
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-17 09:00:40 +08:00 |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
2016-05-16 18:08:05 +08:00 |
|
Tim
|
fbbda96c60
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-16 15:00:21 +08:00 |
|
Tim
|
fa788ced1b
|
资源库添加私有资源
|
2016-05-16 15:00:08 +08:00 |
|
huang
|
6cca44df98
|
组织项目、课程动态问题
|
2016-05-16 14:53:40 +08:00 |
|
huang
|
2484d642a1
|
组织500问题
|
2016-05-16 14:19:04 +08:00 |
 cxt
|
c25b63a254
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 20:07:49 +08:00 |
|
huang
|
37b93a4595
|
文章回复不能用的问题
|
2016-05-13 20:01:45 +08:00 |
|
cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 18:28:07 +08:00 |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
2016-05-13 18:25:15 +08:00 |
|
cxt
|
5bc19d7ef0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 18:12:12 +08:00 |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
2016-05-13 18:12:06 +08:00 |
|
huang
|
a31ffbf8fb
|
教师栏目不能添加二级域名
|
2016-05-13 18:10:33 +08:00 |
|
cxt
|
821cd8ad99
|
作品列表样式调整
|
2016-05-13 17:26:17 +08:00 |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
2016-05-13 17:24:12 +08:00 |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
2016-05-13 17:11:53 +08:00 |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
2016-05-13 17:00:25 +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 |
|
cxt
|
bc39b68bb2
|
新建测验题目、问卷题目防止多次提交表单
|
2016-05-13 16:50:41 +08:00 |
|
huang
|
6ccb79a210
|
教师列表颜色
|
2016-05-13 16:47:56 +08:00 |
|
huang
|
6d484e15fd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 16:30:57 +08:00 |
|
huang
|
39d014355b
|
科大名师，和名师列表添加标题
|
2016-05-13 16:30:45 +08:00 |
|
Tim
|
d384d1e2b4
|
名师榜样式调整
|
2016-05-13 16:28:16 +08:00 |
|
Tim
|
afbe5317cb
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 16:11:35 +08:00 |
|
Tim
|
a88ab59489
|
名师榜添加右侧banner
|
2016-05-13 16:11:10 +08:00 |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
2016-05-13 15:37:04 +08:00 |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
2016-05-13 15:25:53 +08:00 |
|
huang
|
f1c0347ee2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 15:12:40 +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
|
5ae580aab0
|
添加用户连接
|
2016-05-13 15:10:34 +08:00 |
|
cxt
|
22523d25b8
|
贴吧发帖防止多次提交表单
|
2016-05-13 14:52:38 +08:00 |
|
huang
|
660cf7ef73
|
名师列表局部搜索
|
2016-05-13 14:52:33 +08:00 |
|
cxt
|
01287ff93c
|
学生打开新建的作业列表报500
|
2016-05-13 14:40:28 +08:00 |