guange
|
e4653426d2
|
将openid存到session
|
9 years ago |
 huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
9 years ago |
 cxt
|
8257770ec9
|
课程和项目留言的点赞
|
9 years ago |
|
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
9 years ago |
|
cxt
|
5c9ec49457
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
09b831c189
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
d9bd13c2fc
|
复制课程报500
|
9 years ago |
|
huang
|
457cf72263
|
断行样式
发送JS
|
9 years ago |
|
huang
|
0a8d21ea55
|
公共资源底端发送JS
|
9 years ago |
|
huang
|
415b624e0b
|
样式问题
|
9 years ago |
|
huang
|
2abb68c00c
|
组织代码公共部分整理
|
9 years ago |
|
huang
|
b6de2dbd2d
|
发布作业导入资源
|
9 years ago |
|
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
|
huang
|
197f054c18
|
注释掉申请私有资源功能
|
9 years ago |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
9 years ago |
|
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
ed2f413949
|
代码还原
|
9 years ago |
|
cxt
|
fc3b47e3aa
|
测验统计结果的js问题
|
9 years ago |
|
huang
|
a4f2ebb73b
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
9 years ago |
 Tim
|
1c0a68e57b
|
组织配置成员tab，搜索结果太多导致换页断行问题
|
9 years ago |
|
Tim
|
65c7719ed2
|
设置大纲图标在讨论区换行显示问题
|
9 years ago |
|
cxt
|
ccf29c980a
|
作业列表搜索作业：搜索结果中包括不包含关键字的作业、作业回复框加载不出
|
9 years ago |
|
huang
|
bc0e24d39e
|
资源引用代码注释
|
9 years ago |
|
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
9 years ago |
 yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
9 years ago |
|
huang
|
0e03798f6e
|
组织框架结构（yeild）修改
|
9 years ago |
|
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
9 years ago |
|
cxt
|
2afce9d563
|
隐藏导入作业的申请题库
|
9 years ago |
|
huang
|
a60356091b
|
issue中添加类型tag
|
9 years ago |
|
cxt
|
820e594fec
|
题库的私有作业显示作业详情
|
9 years ago |
|
cxt
|
c3ec7289b7
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
huang
|
eead7962cf
|
资源申请权限控制
|
9 years ago |
|
huang
|
66709b16e5
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
27d029271b
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
86ff725b8a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
9 years ago |
|
huang
|
039d11e862
|
资源发送权限问题
|
9 years ago |
|
Tim
|
51cd9c6dd1
|
学号溢出bug
|
9 years ago |
|
huang
|
0fcd8ae86d
|
导入资源鼠标点击效果
|
9 years ago |
|
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
e512154ea9
|
古剑删除描述一致
|
9 years ago |
|
huang
|
d9241d5dca
|
组织栏目帖子设为首页后显示在栏目中
|
9 years ago |
|
Tim
|
dd4786d639
|
作品列表查看详情定位
|
9 years ago |
|
huang
|
166a97dc0c
|
注释
|
9 years ago |
|
huang
|
acb6d5892d
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
90bb940290
|
资源下载链接问题
|
9 years ago |
|
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
9 years ago |
|
Tim
|
5f4a9304fe
|
提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整
|
9 years ago |
|
huang
|
3ffe131a73
|
删除的提示
|
9 years ago |
|
huang
|
f308b24f5a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
baf7e1dbc0
|
没有连接点击不刷新页面
|
9 years ago |
|
Tim
|
1c7efa247e
|
老师提交分数后格式混乱修改
|
9 years ago |
|
cxt
|
f517fc5a11
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
56a151a7b4
|
学生打开的作品列表中不应通过下拉列表访问到挂起的作业
|
9 years ago |
|
huang
|
e10bc46361
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
9 years ago |
|
huang
|
e901becfe6
|
发送权限问题
|
9 years ago |
|
yuanke
|
c9c3aa5f31
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
bc8171501d
|
解决组织文章设为首页报500
|
9 years ago |
|
huang
|
b0e4ed5ab3
|
请求分享如果自己在项目的话则不需要申请
|
9 years ago |
|
yuanke
|
0e827abd35
|
将代码测试编译器信息的冒号改为中文的
|
9 years ago |
|
huang
|
82f4c685da
|
消息拒绝问题
|
9 years ago |
|
huang
|
18054dd96d
|
私有资源不能下载
|
9 years ago |
|
huang
|
f9e445500e
|
已经引用通过的勾选问题
|
9 years ago |
|
cxt
|
6479ace5e1
|
作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制
|
9 years ago |
|
cxt
|
8f9ead0a12
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
7b0fd246ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
da375dcb4e
|
挂起作业的作品列表中下拉列表的内容为空，截止时间和发布时间不应显示
|
9 years ago |
|
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
9 years ago |
|
huang
|
dddd7e0ea2
|
下载
|
9 years ago |
|
Tim
|
c3f63709ed
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
13f83719c1
|
作品列表改为table布局
|
9 years ago |
|
cxt
|
2895dd5342
|
作业二级回复的消息通知增加显示作业名称的tip
|
9 years ago |
|
huang
|
004c48b456
|
发送至课程项目局部刷新
|
9 years ago |
|
huang
|
f18c3ed667
|
私有资源中不添加”上传资源“的按钮
|
9 years ago |
|
huang
|
0d8d2939b3
|
资源不符合条件的不能选择框
|
9 years ago |
|
huang
|
80f829c018
|
解决搜索不能用的问题
|
9 years ago |
|
huang
|
1402f2076a
|
资源申请添加链接
|
9 years ago |
|
yuanke
|
0dd7aae08c
|
先注释自动识别URL
|
9 years ago |
|
yuanke
|
5b0ef6ada0
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
6e749f49e4
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
yuanke
|
7da1418069
|
自动识别URL
|
9 years ago |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
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
|
9 years ago |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
9 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
984f706722
|
可发送权限控制
|
9 years ago |
|
cxt
|
3ebef0eae2
|
消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面
|
9 years ago |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
9 years ago |
|
huang
|
0b2f6c9a53
|
私有资源的搜索和排序
|
9 years ago |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
9 years ago |
|
huang
|
4c68da9bee
|
修正链接资源名
|
9 years ago |
|
huang
|
bddc807057
|
修正资源库弹框位置
|
9 years ago |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
9 years ago |
|
huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
9 years ago |
|
yuanke
|
c208b79e2d
|
代码测试上面的语言右边 加上编译器信息
|
9 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
|
yuanke
|
0e016eed2a
|
KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布
|
9 years ago |
|
cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
9 years ago |
|
huang
|
615d0ddbd2
|
公共资源、私有资源请求分享界面及样式
|
9 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
ddafa79835
|
无法展开隐藏楼层
|
9 years ago |
|
cxt
|
55a98d8d6e
|
作业二级回复的消息通知
|
9 years ago |
|
huang
|
07678e367e
|
资源新样式删除功能
|
9 years ago |
|
huang
|
4c71e525a7
|
资源新样式增加后，重命名功能
|
9 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
9 years ago |
|
Tim
|
70ff3e2c19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
0b2fe1d88a
|
分组作业样式
|
9 years ago |
|
huang
|
61ba7b0c30
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
yuanke
|
c0de43ecc0
|
修改KE字体间距问题，代码测试出错提示。
|
9 years ago |
|
huang
|
e9c35ae20f
|
组织未登录情况默认图片展示
|
9 years ago |
|
huang
|
985b1e4c95
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
15ea9a9659
|
组织门户自动播放禁用
|
9 years ago |
|
Tim
|
1402ae190d
|
组织头像
|
9 years ago |
|
huang
|
20e8627b02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
326c3a84a0
|
还原域名问题
|
9 years ago |
|
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
9 years ago |
|
Tim
|
aee56c7eca
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
545e4ac380
|
禁用组织门户合作伙伴自动滚动效果
|
9 years ago |
|
huang
|
b0f9d0280f
|
0
|
9 years ago |
|
huang
|
13cc5ceaa6
|
model中添加获取二级域名的方法
|
9 years ago |
|
Tim
|
e9a3bc5094
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
9 years ago |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
9 years ago |
|
cxt
|
9caf9cbf2f
|
消息列表的消息，在点击时，要弹出新的浏览器页面
|
9 years ago |
|
Tim
|
fbbda96c60
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
fa788ced1b
|
资源库添加私有资源
|
9 years ago |
|
huang
|
6cca44df98
|
组织项目、课程动态问题
|
9 years ago |
|
huang
|
2484d642a1
|
组织500问题
|
9 years ago |
|
cxt
|
c25b63a254
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
37b93a4595
|
文章回复不能用的问题
|
9 years ago |
|
cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
5bc19d7ef0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
9 years ago |
|
huang
|
a31ffbf8fb
|
教师栏目不能添加二级域名
|
9 years ago |
|
cxt
|
821cd8ad99
|
作品列表样式调整
|
9 years ago |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
9 years ago |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
9 years ago |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
9 years ago |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
9 years ago |
|
cxt
|
bc39b68bb2
|
新建测验题目、问卷题目防止多次提交表单
|
9 years ago |
|
huang
|
6ccb79a210
|
教师列表颜色
|
9 years ago |
|
huang
|
6d484e15fd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
39d014355b
|
科大名师，和名师列表添加标题
|
9 years ago |
