 huang
|
4c71e525a7
|
资源新样式增加后，重命名功能
|
2016-05-17 15:30:10 +08:00 |
 cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
 Tim
|
70ff3e2c19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-17 11:24:42 +08:00 |
|
Tim
|
0b2fe1d88a
|
分组作业样式
|
2016-05-17 11:24:29 +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 |
 yuanke
|
c0de43ecc0
|
修改KE字体间距问题，代码测试出错提示。
|
2016-05-17 10:31:10 +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 |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
2016-05-16 16:57:18 +08:00 |
|
cxt
|
9caf9cbf2f
|
消息列表的消息，在点击时，要弹出新的浏览器页面
|
2016-05-16 16:16:24 +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 |
|
cxt
|
dc6c5fe18b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-13 14:33:16 +08:00 |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
2016-05-13 14:33:06 +08:00 |
|
Tim
|
1833f15e19
|
课程资源库导入资源样式修改
|
2016-05-13 14:23:51 +08:00 |
|
huang
|
91f3fddb16
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 14:23:48 +08:00 |
|
huang
|
0feb1280fd
|
名师更多列表
及相关入口路由
|
2016-05-13 14:23:36 +08:00 |
|
Tim
|
4ea7d5ed57
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 14:08:48 +08:00 |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
2016-05-13 14:08:34 +08:00 |
|
huang
|
e90da9d812
|
teachers页面
|
2016-05-13 14:00:05 +08:00 |
|
huang
|
3853d5b7ad
|
右三模式定制
|
2016-05-13 13:39:44 +08:00 |
|
huang
|
457bac0b9d
|
0
|
2016-05-13 11:30:49 +08:00 |
|
huang
|
7bd047f7e4
|
组织模式二中名师榜样式
|
2016-05-13 11:25:05 +08:00 |
|
huang
|
f7a888ac3d
|
名师默认创建
|
2016-05-13 11:11:09 +08:00 |
|
cxt
|
979598f334
|
课程问答区帖子的发送防止连续提交
|
2016-05-13 11:06:47 +08:00 |
|
cxt
|
345e1c0a48
|
评分的回复连续点击多次防止提交多次表单
|
2016-05-13 10:57:45 +08:00 |
|
cxt
|
f1821e54e1
|
通知和新闻详情页面的回复点击多次不会提交表单多次
|
2016-05-13 10:56:48 +08:00 |
|
huang
|
61803aa696
|
删除名师榜的时候局部刷新
|
2016-05-13 10:54:33 +08:00 |
|
huang
|
e8d76f449f
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 10:50:47 +08:00 |
|
huang
|
1673ae451b
|
名师榜新增一个后就不能再新增
|
2016-05-13 10:50:34 +08:00 |
 Linda
|
aec7366594
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-13 10:31:12 +08:00 |
|
Linda
|
a2418396dd
|
邦本库zip下载样式界面
|
2016-05-13 10:30:38 +08:00 |
|
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
2016-05-13 10:29:22 +08:00 |
|
cxt
|
cc92105da9
|
作品列表添加序号及样式调整
|
2016-05-13 09:58:24 +08:00 |
|
huang
|
37ee03374e
|
完成设置名师功能
|
2016-05-13 09:53:22 +08:00 |
|
cxt
|
f74e5eb6ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:49:13 +08:00 |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
2016-05-12 17:49:07 +08:00 |
|
Tim
|
2ac201ffdd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:41:42 +08:00 |
|
Tim
|
565d5e3bcc
|
作业测验列表html代码重构，添加序号列
|
2016-05-12 17:41:27 +08:00 |
|
huang
|
2be8e64748
|
内容和查看更多重复问题
|
2016-05-12 16:00:23 +08:00 |
|
cxt
|
d4c1f27533
|
私有作业请求分享时，强制要求写请求分享的说明文字
|
2016-05-12 15:29:20 +08:00 |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
2016-05-12 15:02:23 +08:00 |
|
cxt
|
ac5a9c87ac
|
消息通知中的“同意|拒绝”调整宽度
|
2016-05-12 14:59:12 +08:00 |
|
cxt
|
ca5f03f2ea
|
作业回复的消息通知，评阅作品的消息通知修改
|
2016-05-12 14:13:34 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
2016-05-12 10:29:43 +08:00 |
|
cxt
|
9ec488684b
|
分享申请的消息更改
|
2016-05-12 09:30:06 +08:00 |
|
huang
|
3dde8bd25a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-11 16:21:17 +08:00 |
|
huang
|
52c8593b09
|
组织教师列表sql优化
|
2016-05-11 16:20:55 +08:00 |
|
Tim
|
b649882a23
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-11 15:52:09 +08:00 |
|
Tim
|
7957beb64a
|
发送至按钮样式控制
|
2016-05-11 15:51:59 +08:00 |
|
cxt
|
fdefbf3795
|
作品打分连续点击不会多次提交
|
2016-05-11 15:31:33 +08:00 |
|
cxt
|
d232a5241e
|
新建课程报404
|
2016-05-11 11:47:16 +08:00 |
|
cxt
|
320c3881ef
|
多次点击发送按钮不应新建多个作业
|
2016-05-11 10:48:04 +08:00 |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
2016-05-11 09:18:55 +08:00 |
|
huang
|
c28c947abc
|
项目动态中添加作者
|
2016-05-10 17:07:47 +08:00 |
|
huang
|
a4a211448c
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-10 16:26:20 +08:00 |
|
huang
|
f4b10d45d2
|
版本库鼠标经过的时候显示具体时间
|
2016-05-10 16:26:05 +08:00 |
|
Tim
|
d7add63f56
|
二级栏目列表页回复不可点击
|
2016-05-10 16:03:50 +08:00 |
|
txz
|
67380d58d4
|
博客锁定置顶位置
|
2016-05-10 15:27:43 +08:00 |