 cxt
|
f0e456729e
|
过滤掉消息中的html
|
9 years ago |
|
cxt
|
89819f5ccd
|
消息列表
|
9 years ago |
 huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
8b5a2ac1cb
|
message 500
|
9 years ago |
|
cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
 Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
huang
|
0a001b4f76
|
message 500 for boliang
|
9 years ago |
|
cxt
|
3362ebe321
|
线下作业
|
9 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
 yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
a732efa6c6
|
1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复
|
9 years ago |
|
Tim
|
0b764d0dfc
|
RSide样式处理
|
9 years ago |
|
Tim
|
75475b6058
|
个人主页，课程，项目样式更新
|
9 years ago |
|
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
9 years ago |
|
cxt
|
3ccdf7f9ae
|
课程问答区，项目讨论区的帖子消息通知应直接打开对应的帖子详情界面
|
9 years ago |
|
cxt
|
2956b08f40
|
分组作业：去掉组员“追加附件”的入口
|
9 years ago |
|
cxt
|
0dd7ef4460
|
帖子列表的回复数与实际不符
|
9 years ago |
|
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
|
yuanke
|
447e624f36
|
课程大纲bug修复
|
9 years ago |
|
cxt
|
b1a77a036b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
8b87c141cc
|
bug修复
|
9 years ago |
|
cxt
|
0f8cc584a9
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
yuanke
|
1edc63721f
|
修改课程列表班级时间显示问题
|
9 years ago |
|
Tim
|
afbf62fd64
|
当课程数为0时，课程列表点击无效
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
cxt
|
afe16cc99c
|
课程大纲列表的js调整
|
9 years ago |
|
Tim
|
def0d79271
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
|
9 years ago |
|
Tim
|
7633761bbe
|
课程大纲列表展开收起js
|
9 years ago |
|
cxt
|
3b7679b254
|
课程大纲列表
|
9 years ago |
|
cxt
|
a50e15b2ab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
Tim
|
10f52f110f
|
课程大纲列表点击展开收起，配置按钮链接跳转实现
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
9 years ago |
|
cxt
|
b2f939fa92
|
代码调整
|
9 years ago |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
9 years ago |
|
Tim
|
a3738c4cb2
|
新建组织，题库和资源库弹框样式检查
|
9 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
Tim
|
a28d775cb2
|
资源库，题库样式检查
|
9 years ago |
|
Tim
|
8a6bbf50a9
|
css文件替换
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
9 years ago |
|
yuanke
|
f3014c3993
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
948ec58248
|
作业二级回复未登录显示样式问题
|
9 years ago |
|
cxt
|
7b1efe193d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
eb3694dbe6
|
消息报500
|
9 years ago |
|
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
9 years ago |
|
cxt
|
a105f4eaf0
|
课程动态中：课程讨论区、课程通知
项目动态中：项目issue、项目新闻、项目讨论区
个人动态：如上动态
未登录时不显示齿轮
|
9 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
795917688c
|
留言内容无法展开、收起
|
9 years ago |
|
cxt
|
30db43eb13
|
作业开启匿评之后，如果是普通作业，会提示学生提交的作业不会进入匿评，也不能对其他人进行匿评，如果是编程作业，在打开作业时则无此提示，应该统一，均进行提示
|
9 years ago |
|
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
9 years ago |
|
yuanke
|
a17fb86a17
|
组织回复点登录直接跳入登录页面
|
9 years ago |
|
cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
9 years ago |
|
yuanke
|
a2d1b6d646
|
组织回复点登录直接跳入登录界面
|
9 years ago |
|
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
9 years ago |
|
yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
9 years ago |
|
cxt
|
02e2831980
|
管理员界面的留言列表优化
|
9 years ago |
|
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
9d36c74d7f
|
作业回复的删除
|
9 years ago |
|
cxt
|
a1e49d9a81
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
c0d167d2e2
|
项目缺陷动态的回复不显示
|
9 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
df8df117a8
|
解决匿名用户登录问题（控制器和view）
|
9 years ago |
|
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
9 years ago |
|
huang
|
c6d36bd738
|
未登录留言判断
|
9 years ago |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
cxt
|
5097abbe1e
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
0cafebb3a2
|
新闻列表的点赞
|
9 years ago |
|
huang
|
f7cb9bdffd
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
1535c4cd07
|
编辑分组作业时的基于项目实施总是默认选中
|
9 years ago |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
9 years ago |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
9 years ago |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
c7bf29b0c9
|
组织切换问题
|
9 years ago |
|
huang
|
fb46062640
|
项目、课程、组织资源列表发送无法弹框问题
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
9 years ago |
|
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
9 years ago |
|
huang
|
457cf72263
|
断行样式
发送JS
|
9 years ago |
|
huang
|
0a8d21ea55
|
公共资源底端发送JS
|
9 years ago |
|
huang
|
415b624e0b
|
样式问题
|
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 |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
9 years ago |
|
huang
|
bc0e24d39e
|
资源引用代码注释
|
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 |
|
huang
|
eead7962cf
|
资源申请权限控制
|
9 years ago |
|
huang
|
039d11e862
|
资源发送权限问题
|
9 years ago |
|
huang
|
0fcd8ae86d
|
导入资源鼠标点击效果
|
9 years ago |
|
huang
|
e512154ea9
|
古剑删除描述一致
|
9 years ago |
|
huang
|
166a97dc0c
|
注释
|
9 years ago |
|
huang
|
90bb940290
|
资源下载链接问题
|
9 years ago |
|
huang
|
3ffe131a73
|
删除的提示
|
9 years ago |
|
huang
|
baf7e1dbc0
|
没有连接点击不刷新页面
|
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 |
|
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 |
|
cxt
|
2895dd5342
|
作业二级回复的消息通知增加显示作业名称的tip
|
9 years ago |
|
huang
|
004c48b456
|
发送至课程项目局部刷新
|
9 years ago |
|
huang
|
f18c3ed667
|
私有资源中不添加”上传资源“的按钮
|
9 years ago |
|
huang
|
0d8d2939b3
|
资源不符合条件的不能选择框
|
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 |
