 huang
|
b1cb4e5f94
|
完成左一的配置
|
9 years ago |
 cxt
|
5097abbe1e
|
Merge branch 'develop' into cxt_course
|
9 years ago |
 Tim
|
3b55e9e39b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/student_work/_evaluation_un_title.html.erb
app/views/student_work/_evaluation_un_work.html.erb
|
9 years ago |
|
Tim
|
513fe1a93d
|
作品列表可拖拽
|
9 years ago |
|
huang
|
2acc545896
|
完成组织左二模式
|
9 years ago |
|
huang
|
5c27aee2bd
|
模式二课程模块 定义公共方法（显示描述内容以省略号结束）
|
9 years ago |
|
huang
|
9ecdf0892b
|
完成左三模式的配置
|
9 years ago |
guange
|
814fde878e
|
从后台获取openid即可
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
a96fafd704
|
模式三（未完）
|
9 years ago |
|
cxt
|
ed84783f26
|
私有课程作业的公开作品
|
9 years ago |
|
huang
|
8d56d8556f
|
完成模式6
|
9 years ago |
|
huang
|
bb7204846f
|
新版资源类型定制模式6
|
9 years ago |
|
huang
|
6bfe344cbf
|
组织模式一左侧权限控制
|
9 years ago |
|
huang
|
8f897cbf89
|
组织管理员模式，二级目录局部刷新
|
9 years ago |
|
huang
|
c369b271a0
|
组织管理员配置后的权限控制及局部刷新
|
9 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
9 years ago |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
9 years ago |
|
cxt
|
f024764e29
|
课内学生看到的学生列表中学生“姓名”不应显示昵称
|
9 years ago |
|
huang
|
471ed7cbd2
|
组织logo获取，添加样式图片
|
9 years ago |
|
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
9 years ago |
|
huang
|
81ab73e286
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
9 years ago |
|
huang
|
698e4bd7b3
|
header
|
9 years ago |
|
Tim
|
9cc749bd57
|
门户样式统一，防止冲突
|
9 years ago |
|
huang
|
46e4f2c143
|
组织新base框架
|
9 years ago |
|
guange
|
8b623e3a0c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
bb30709fa1
|
window close
|
9 years ago |
|
guange
|
63b9aaefe2
|
window close
|
9 years ago |
|
guange
|
be94d445a9
|
window close
|
9 years ago |
|
guange
|
622d71c476
|
已绑定成功的，直接提示
|
9 years ago |
|
cxt
|
0cafebb3a2
|
新闻列表的点赞
|
9 years ago |
|
huang
|
94dd8befc8
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
f7cb9bdffd
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
12ac353de9
|
北斗新base
|
9 years ago |
 yuanke
|
e650dca1ed
|
修改用户反馈中二级回复 回复框不消失的问题
|
9 years ago |
|
cxt
|
086ccedc08
|
先隐藏作业信息，再点击查询或分班后“显示作业信息”的按钮不见了
|
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
|
227a668413
|
分组匿评的显示
|
9 years ago |
|
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
9 years ago |
|
Tim
|
5f27519c67
|
table可拖拽
|
9 years ago |
|
cxt
|
400a470a2b
|
作品列表的样式调整
|
9 years ago |
|
cxt
|
03d70e8c9a
|
作品列表：当先进行作品搜索或选择分班操作后，然后点击“隐藏作业信息”，再点击“显示作业信息”无反应 （测验列表也一起修复了）
|
9 years ago |
|
cxt
|
3b33732e6f
|
学生列表的姓名、学号、分班和加入时间做成不可点击的
|
9 years ago |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
c7bf29b0c9
|
组织切换问题
|
9 years ago |
|
huang
|
f3a1a7371d
|
资源过多最下面点击更新版本的时候弹框没有居中
|
9 years ago |
|
huang
|
fb46062640
|
项目、课程、组织资源列表发送无法弹框问题
|
9 years ago |
|
huang
|
74384d10a5
|
组织 论坛编辑
|
9 years ago |
|
huang
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
cxt
|
ff974d6901
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/views/wechats/login.html.erb
|
9 years ago |
|
cxt
|
4d5ee5a722
|
微信的欢迎图片及欢迎词的修改,测试版的配置
|
9 years ago |
|
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 |
