 huang
|
fea21fe7cd
|
Merge branch 'develop' into rep_quality
|
9 years ago |
 yuanke
|
70a762220a
|
组织、项目的资源文件增加描述修改及上传文件时候添加描述，并且所有操作对超级管理员开放
|
9 years ago |
 cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
9 years ago |
|
yuanke
|
049a21c7d0
|
不上线的先还原
|
9 years ago |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
9 years ago |
|
cxt
|
03b92f8570
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
1023b94f0d
|
新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项
|
9 years ago |
|
huang
|
9b6f40bb02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
5a7f7da1f7
|
新建贴吧和组织配置默认选项暂时还原。
|
9 years ago |
|
huang
|
d75a8bc35a
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
9 years ago |
|
cxt
|
caa966c85a
|
分组作业的作品列表提示的修改
分组作业提交作品时的最小人数限制不起作用
|
9 years ago |
|
cxt
|
c50d307e89
|
分组作业添加成员后再次打开，数据未保存
|
9 years ago |
|
huang
|
5515fb660f
|
完成资源更新的时候 描述继承问题，并且可以修改描述
|
9 years ago |
|
huang
|
d21df48961
|
代码质量分析弹框及参数传入
|
9 years ago |
|
cxt
|
6100abe0da
|
课程大纲
|
9 years ago |
|
huang
|
9029fd91e0
|
rails 代码中调用shell命令调用
|
9 years ago |
|
huang
|
0c25e3b13d
|
版本库质量分析 ssh链接
|
9 years ago |
|
yuanke
|
e86419c28b
|
组织配置里面栏目类型默认为帖子
|
9 years ago |
|
cxt
|
3a8a61e404
|
在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序
|
9 years ago |
|
cxt
|
be47331213
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
c9021eb70f
|
版本库附件打包下载从配置文件获取
|
9 years ago |
|
cxt
|
9d36c74d7f
|
作业回复的删除
|
9 years ago |
|
cxt
|
24f5e245df
|
鼠标经过消息通知时弹窗显示最新的5条未读消息
|
9 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
90aaaa544a
|
最新动态按创建时间排序
|
9 years ago |
|
huang
|
2f9dcc8a31
|
文章点击500问题
|
9 years ago |
|
huang
|
49406681ef
|
详情页面留言为空的问题
|
9 years ago |
|
huang
|
67f0cad331
|
组织网站动态新页面
|
9 years ago |
|
huang
|
e4f48f046b
|
子页面没有内容显示
|
9 years ago |
|
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
a8b68d64ee
|
导航权限控制
|
9 years ago |
|
huang
|
3e2810129b
|
课程留言动态过滤掉
|
9 years ago |
|
cxt
|
768d91278d
|
微信提示信息的修改
|
9 years ago |
|
huang
|
c5bccf1adb
|
组织动态按更新时间排序
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
huang
|
acf4a64e6a
|
二级帖子子页面
|
9 years ago |
|
huang
|
59988f17da
|
帖子目录界面
|
9 years ago |
|
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
9 years ago |
|
huang
|
b8d49f0079
|
0
|
9 years ago |
|
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
d3c6c0ca99
|
二级目录未登录时回复提示
|
9 years ago |
|
huang
|
c6d36bd738
|
未登录留言判断
|
9 years ago |
|
cxt
|
6a25adb37e
|
最新动态改成我的动态，提示修改
|
9 years ago |
|
cxt
|
fe22cfa5c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
e4ff4ad156
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
57f3cf713c
|
去掉搜索
|
9 years ago |
|
cxt
|
07941233d8
|
题库点击发送到后，先输入一个不存在的课程ID，点击确定，在出现请先选择课程的提示后删除输入的ID，此时会显示出该用户所有的课程，包括已经删除的
|
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 |
|
huang
|
5ec9e31626
|
精品项目，精品课程按照动态数排序
|
9 years ago |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
9 years ago |
|
huang
|
ca3b072f85
|
热门项目按照项目得分排序及设置界面中默认设置
|
9 years ago |
|
huang
|
432baebdc3
|
组织默认activite status
|
9 years ago |
|
huang
|
6fbad6d53d
|
右二优化
|
9 years ago |
|
huang
|
257165dbaf
|
模式二中添加课程定配
|
9 years ago |
|
huang
|
e2848f4dec
|
创建栏目时默认状态
|
9 years ago |
|
huang
|
52bc4aab81
|
右二（未完）
|
9 years ago |
|
huang
|
31f3d74b0f
|
组织栏目中，匿名用户可以回复
|
9 years ago |
|
huang
|
76732a3034
|
新模式有一
|
9 years ago |
|
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
cxt
|
b72ad364db
|
微信模板消息：用户绑定成功、作业消息、个人留言、班级通知
|
9 years ago |
|
huang
|
e5eeba90f6
|
组织精品课程，热门项目
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
cxt
|
32dca93b59
|
统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名
|
9 years ago |
|
cxt
|
fa73171818
|
点击“课程活跃度”和“课程英雄榜”跳到学生列表，并分别以“活跃度”、“英雄榜”倒序排列
|
9 years ago |
guange
|
814fde878e
|
从后台获取openid即可
|
9 years ago |
|
guange
|
e01da32c75
|
tempate=>file
|
9 years ago |
|
guange
|
ac5d91a428
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
1c5a31e8f1
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
49a1a9de32
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
e73c946806
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
7b5a7a93f5
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
6e44e8355c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
7f811d7551
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
ed84783f26
|
私有课程作业的公开作品
|
9 years ago |
|
huang
|
8f897cbf89
|
组织管理员模式，二级目录局部刷新
|
9 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
9 years ago |
|
guange
|
858ad47338
|
作业长度定为50
|
9 years ago |
|
guange
|
acc323e46d
|
issue7890解决
|
9 years ago |
|
huang
|
46e4f2c143
|
组织新base框架
|
9 years ago |
|
guange
|
8b623e3a0c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
4561bdfd0d
|
code=>params[:code]
|
9 years ago |
|
guange
|
622d71c476
|
已绑定成功的，直接提示
|
9 years ago |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
a207f48b94
|
Merge branch 'hjq_mail' into develop
Conflicts:
app/models/news.rb
|
9 years ago |
|
huang
|
9e17db376a
|
解决组织一级目录二级目录匿名用户问题
|
9 years ago |
|
cxt
|
3b84cd3ed2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1fa6ac89ce
|
微信的配置
|
9 years ago |
|
huang
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
cxt
|
6fea9c2ba8
|
微信文字和图片的显示
|
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
|
b48b1c97b3
|
weixin
|
9 years ago |
|
guange
|
e4653426d2
|
将openid存到session
|
9 years ago |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
9 years ago |
|
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
9 years ago |
|
huang
|
72ae31b7f9
|
作业导出资源代码回复
|
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
|
7b7f9cf8f2
|
删除wechat无用代码
|
9 years ago |
|
huang
|
909d40b4eb
|
默认显示公共资源
|
9 years ago |
|
huang
|
a4f2ebb73b
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
9 years ago |
|
cxt
|
ccf29c980a
|
作业列表搜索作业：搜索结果中包括不包含关键字的作业、作业回复框加载不出
|
9 years ago |
|
huang
|
bc0e24d39e
|
资源引用代码注释
|
9 years ago |
|
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
9 years ago |
|
huang
|
0e03798f6e
|
组织框架结构（yeild）修改
|
9 years ago |
|
cxt
|
6586dfaf91
|
作品搜索时，复制的姓名或学号或邮箱因为包含空格，而搜索不到相关结果
|
9 years ago |
|
cxt
|
820e594fec
|
题库的私有作业显示作业详情
|
9 years ago |
|
huang
|
eead7962cf
|
资源申请权限控制
|
9 years ago |
|
huang
|
66709b16e5
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
9 years ago |
|
huang
|
acb6d5892d
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
9 years ago |
|
cxt
|
f517fc5a11
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
18054dd96d
|
私有资源不能下载
|
9 years ago |
|
cxt
|
6479ace5e1
|
作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制
|
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
|
1c400669aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
5114c12c17
|
注释掉为完成的代码
|
9 years ago |
|
huang
|
dddd7e0ea2
|
下载
|
9 years ago |
|
huang
|
b1e0618742
|
导入资源不能用的问题
|
9 years ago |
|
huang
|
352b40dd96
|
默认为“公共资源”
|
9 years ago |
|
huang
|
80f829c018
|
解决搜索不能用的问题
|
9 years ago |
|
huang
|
92f55e0dc1
|
公共资源库，点击底部不能发送的问题
|
9 years ago |
|
cxt
|
b03b9a3c27
|
课程：问卷导入时显示的数据未进行过滤
|
9 years ago |
|
huang
|
f806dbf587
|
资源发送至组织和课程
|
9 years ago |
|
huang
|
e0370e3e32
|
私有资源中发送文件
|
9 years ago |
|
cxt
|
df70c33bcd
|
学生列表活跃度为0
|
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
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
9 years ago |
|
huang
|
0b2f6c9a53
|
私有资源的搜索和排序
|
9 years ago |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
9 years ago |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
9 years ago |
|
huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
9 years ago |
|
cxt
|
31d94dc052
|
发布可引用的作业至课程，作业的原作者不应收到微信消息提醒
|
9 years ago |
|
cxt
|
3b3cafbc81
|
微信模板消息的还原
|
9 years ago |
