 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 |
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
guange
|
4436e87c84
|
.
|
9 years ago |
|
cxt
|
c0e58d19fa
|
导出的作业成绩中的缺评、迟交扣分应与作品列表的一致
|
9 years ago |
Your Name
|
eae70f9c71
|
some config
|
9 years ago |
|
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
9 years ago |
|
guange
|
9a9f6400da
|
.
|
9 years ago |
|
guange
|
c522d7160c
|
.
|
9 years ago |
|
guange
|
9ec1f916b6
|
.
|
9 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
guange
|
7e2482167d
|
.
|
9 years ago |
|
guange
|
16a9f017b6
|
error
|
9 years ago |
 yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
guange
|
485d0e3743
|
ticket处理
|
9 years ago |
|
Your Name
|
06fe02890f
|
index for sonar result
|
9 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
9 years ago |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
9 years ago |
|
Your Name
|
128f6721be
|
stoped the zhizhen
|
9 years ago |
|
Your Name
|
de80403e8d
|
add address to config
|
9 years ago |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
9 years ago |
|
Your Name
|
e6b263feb5
|
issues from sonar
|
9 years ago |
|
guange
|
52d4d36097
|
邀请码页面
|
9 years ago |
|
cxt
|
e457593416
|
作品列表--导出作业成绩：excel中增加缺评扣分、迟交扣分情况
|
9 years ago |
|
Your Name
|
53b9cbee72
|
added hightcharts and added some api for sonar
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
Your Name
|
3fe5d9a1a3
|
get date froma sonar
|
9 years ago |
|
guange
|
d466b09f3f
|
.
|
9 years ago |
|
Your Name
|
ce6e6116b5
|
get data from sonar API
|
9 years ago |
|
guange
|
1470cafe57
|
.
|
9 years ago |
|
guange
|
9b42b4e7f7
|
.
|
9 years ago |
|
guange
|
40217d5c56
|
.
|
9 years ago |
|
guange
|
0929d2ac28
|
.
|
9 years ago |
|
guange
|
7700445c17
|
加入课程
|
9 years ago |
|
yuanke
|
9461c41fa7
|
激活留言修改
|
9 years ago |
|
yuanke
|
b68e227531
|
没激活的帐号界面
|
9 years ago |
|
guange
|
8129e29d5b
|
.
|
9 years ago |
|
guange
|
f791f37205
|
.
|
9 years ago |
|
guange
|
5b087179eb
|
.
|
9 years ago |
|
guange
|
833c5a5ede
|
.
|
9 years ago |
|
guange
|
4663f48496
|
修改跳转菜单
|
9 years ago |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
9 years ago |
|
Your Name
|
2275fe6d23
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
9 years ago |
|
Your Name
|
9e7cde6056
|
stable version for sonar
|
9 years ago |
 huang
|
494b69c89b
|
sonar数据获取
|
9 years ago |
|
huang
|
dee53a1383
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
app/views/repositories/_quality_analyses.html.erb
|
9 years ago |
|
huang
|
e3b6bd19e1
|
修改质量分支控制器名
|
9 years ago |
|
Your Name
|
26b7c3e70b
|
aqulity analysis
|
9 years ago |
|
cxt
|
7e25ec1a00
|
登录报500
|
9 years ago |
|
Your Name
|
d5631defb5
|
added xml to jenkins and added some gems
|
9 years ago |
|
guange
|
1d6d100983
|
.
|
9 years ago |
|
guange
|
6f14b61cce
|
.
|
9 years ago |
|
guange
|
4b813ef535
|
加入班级消息
|
9 years ago |
|
guange
|
c940527694
|
.
|
9 years ago |
|
guange
|
62a1b5de7c
|
加入班级更新
|
9 years ago |
|
huang
|
96e00f7bf3
|
jenkins连接
|
9 years ago |
|
guange
|
c6f04db19e
|
wechat
|
9 years ago |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
9 years ago |
|
guange
|
b7230333dc
|
code获取修改
|
9 years ago |
|
guange
|
3f98562c0f
|
打包
|
9 years ago |
|
huang
|
36e47fa8b1
|
代码质量分析，弹框参数传递
|
9 years ago |
|
guange
|
9d19caa736
|
.
|
9 years ago |
|
guange
|
7aec37bb3a
|
.
|
9 years ago |
|
guange
|
98c6548e39
|
重写登录和注册
|
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
|
fde3fd0d94
|
新建贴吧跳入该贴吧帖子列表，组织栏目配置默认选择第一个栏目类型
|
9 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
35ee17c4ca
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
d0791253d9
|
quality
|
9 years ago |
|
cxt
|
1dac05c6d1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
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 |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
9 years ago |
|
huang
|
0cba32ecd6
|
北斗单点登录引起的500问题
|
9 years ago |
|
huang
|
4c066f9ad3
|
初始化单点登录用户同步用户角色
|
9 years ago |
|
guange
|
80be46dc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
4b4a48b0c4
|
sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开
|
9 years ago |
|
yuanke
|
025d07e6a4
|
代码测试编译信息长度限制不小心注释了
|
9 years ago |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
9 years ago |
|
huang
|
09c462ebad
|
资源代码还原
|
9 years ago |
|
yuanke
|
24b969e781
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
e24470db4c
|
代码测试截取ERROR_MSG时只在编译错误下截取
|
9 years ago |
|
guange
|
8411a08ddb
|
修改错别字
|
9 years ago |
|
huang
|
37b93a4595
|
文章回复不能用的问题
|
9 years ago |
|
huang
|
aef178183c
|
我的资源附件不能删的问题
|
9 years ago |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
b9e5c77b91
|
资源500问题
|
9 years ago |
|
cxt
|
695e870a26
|
作品的统计不见了
|
9 years ago |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
9 years ago |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
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 |
|
huang
|
39d014355b
|
科大名师，和名师列表添加标题
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
660cf7ef73
|
名师列表局部搜索
|
9 years ago |
|
huang
|
0feb1280fd
|
名师更多列表
及相关入口路由
|
9 years ago |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
f7a888ac3d
|
名师默认创建
|
9 years ago |
|
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
9 years ago |
|
huang
|
37ee03374e
|
完成设置名师功能
|
9 years ago |
|
yuanke
|
6237bcb6cd
|
加个gem 'certified'
|
9 years ago |
|
yuanke
|
a39702f962
|
图片自动上传，代码测试编译错误过长。
|
9 years ago |
|
cxt
|
8af0459519
|
首页动态中不应出现已删除的课程动态
|
9 years ago |
|
cxt
|
582c305a47
|
申请引用过的作业在课程删除后不应该在申请题库中显示
|
9 years ago |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
9 years ago |
|
cxt
|
b3782c5d0c
|
合并代码
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
9 years ago |
|
huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
52c8593b09
|
组织教师列表sql优化
|
9 years ago |
|
cxt
|
d4a35b94f6
|
导出的作品成绩保存为数字格式
|
9 years ago |
|
huang
|
43f06c0826
|
版本库ZIP下载
|
9 years ago |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
9 years ago |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
9 years ago |
|
yuanke
|
629591ad00
|
课程、项目列表更新时间取动态表中的
|
9 years ago |
|
yuanke
|
e502aa7c43
|
KE表格项目问题，自动上传图片做了一点
|
9 years ago |
|
huang
|
99d9a28828
|
名师榜sql查询
|
9 years ago |
|
cxt
|
d303a06377
|
首页列表的排序
|
9 years ago |
|
huang
|
6474444cc7
|
用户连接 id变成用户名
|
9 years ago |
|
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
9 years ago |
|
huang
|
fc36e4c01e
|
教师列表
|
9 years ago |
|
cxt
|
1eb41478b2
|
课程动态和首页动态中的作业动态实现二级回复
|
9 years ago |
|
cxt
|
644e097dc8
|
定时更新关联项目的作业更新时间
|
9 years ago |
|
cxt
|
1b309d4bf0
|
时间的比较
|
9 years ago |
|
cxt
|
7b84c994e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
fc95d048a5
|
作业列表打不开
|
9 years ago |
|
huang
|
18b70e9dd3
|
上线问题
|
9 years ago |
|
cxt
|
e03bc42c53
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/words_controller.rb
|
9 years ago |
|
cxt
|
2a55d8f0c3
|
作业的回复更新作业的updated_at字段
|
9 years ago |
|
cxt
|
9526962c69
|
翻页时不更新作业动态
|
9 years ago |
|
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
9 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
b0f407aae5
|
去掉导出的作业成绩中的作品描述的html代码
|
9 years ago |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
620cc83d4b
|
"从题库选用作业"暂时只提供公共作业和我的作业
|
9 years ago |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
9 years ago |
|
huang
|
ae298f9b55
|
帖子详情页面添加编辑功能
|
9 years ago |
|
huang
|
a5be092c16
|
二级目录帖子列表中添加编辑功能
|
9 years ago |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
huang
|
aefcb78926
|
新base
|
9 years ago |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
885b6f6092
|
隐藏掉“综合”选项，分页每页显示20个
|
9 years ago |
|
cxt
|
0fafbffa49
|
项目的更新加到作业的最后更新时间中
|
9 years ago |
|
huang
|
d0db711449
|
编辑功能
|
9 years ago |
|
huang
|
02d6186045
|
二级域名讨论帖子添加删除链接
|
9 years ago |
|
huang
|
e0c011948c
|
二级域名的隐藏和显示
|
9 years ago |
|
yuanke
|
b82a1c1162
|
讨论区计算回复数的一个BUG
|
9 years ago |
|
guange
|
72f5f5b795
|
加入组织
|
9 years ago |
|
huang
|
79cd36f297
|
二级域名排序
|
9 years ago |
|
guange
|
17282083a6
|
merge
|
9 years ago |
|
guange
|
88fd2cbfb6
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
9 years ago |
|
guange
|
dfdd301f2f
|
sso同步登录功能完成
|
9 years ago |
|
huang
|
6d28d0becd
|
二级域名的删除功能
|
9 years ago |
|
huang
|
2920f21c95
|
二级域名编辑功能自动刷新
|
9 years ago |
|
huang
|
d86fec6f03
|
模式6没有内容的显示
|
9 years ago |
|
huang
|
33bf4fafa6
|
模式4没有内容的显示情况
|
9 years ago |
|
huang
|
04b2aee166
|
板块一没有图片的显示情况
|
9 years ago |
|
guange
|
df41f7328f
|
json解析换成rails的
|
9 years ago |
|
huang
|
2996daef71
|
二级域名局部刷新
|
9 years ago |
|
guange
|
eaad006d17
|
safe base64
|
9 years ago |
|
cxt
|
06586f9e4b
|
导出作业成绩中添加作品描述的导出
|
9 years ago |
|
guange
|
e9834f108a
|
修改pwd
|
9 years ago |
|
yuanke
|
9dc92fe817
|
列表优化
|
9 years ago |
|
guange
|
ff23df4f12
|
oss之前不用检验登录
|
9 years ago |
|
cxt
|
6c184b9248
|
题库的分享请求
|
9 years ago |
|
huang
|
8dfe95dfd1
|
配置页面新建二级域名样式
|
9 years ago |
|
guange
|
e8adcf8cc7
|
添加sso model
|
9 years ago |
|
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
9 years ago |
|
guange
|
0635c1e98b
|
添加单点登录controller
|
9 years ago |
|
cxt
|
467af47386
|
私有题库的作业详情页面不显示
|
9 years ago |
|
huang
|
578982faba
|
subdomain 404跳转
|
9 years ago |
|
yuanke
|
411ae6f89e
|
1.修改贴吧分页显示问题2列表优化
|
9 years ago |
|
huang
|
fd543828ac
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/controllers/sub_document_comments_controller.rb
app/views/sub_document_comments/_show_newstyle.html.erb
app/views/sub_document_comments/show.html.erb
|
9 years ago |
|
huang
|
557e731343
|
模式二添加回复功能，模式一回复超过三行则隐藏
|
9 years ago |
|
cxt
|
70910c5238
|
“我的作业”中不应出现已删除课程的作业
|
9 years ago |
 Tim
|
399f757811
|
0
|
9 years ago |
|
huang
|
39dd62580a
|
完成2级目录详情页面
|
9 years ago |
|
huang
|
a9059c4c2e
|
帖子添加编辑删除功能
|
9 years ago |
|
huang
|
48002eb247
|
二级目录讨论区添加帖子回复功能
|
9 years ago |
|
huang
|
4489bc13d7
|
课程列表按创建时间排序
|
9 years ago |
|
yuanke
|
8b672cc7c3
|
项目、课程列表增加更新时间
|
9 years ago |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
9 years ago |
|
huang
|
5fb5a2e8bc
|
二级域名帖子列表两种形式区分
|
9 years ago |
|
yuanke
|
96e7c9d134
|
新闻排序时间改为更新时间
|
9 years ago |
|
cxt
|
c49627913b
|
更改评分设置中的教师优先，评分未更新
|
9 years ago |
|
yuanke
|
d5805e8103
|
课程、项目列表不显示已删除的
|
9 years ago |
|
cxt
|
6b1137980e
|
挂起的作业编辑截止日期后报500
|
9 years ago |
|
cxt
|
39c2365338
|
已拒绝的私有作业不可引用
|
9 years ago |
|
cxt
|
3f7a391214
|
课程和项目的排序
|
9 years ago |
|
yuanke
|
b199a6b8b2
|
列表人气排序修改
|
9 years ago |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
9 years ago |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
9 years ago |
|
huang
|
253189ea7a
|
帖子列表中添加分页
|
9 years ago |
|
huang
|
f6c3e89454
|
二级目录帖子详细页面
|
9 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
yuanke
|
f8abd46ae9
|
列表修改
|
9 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
9 years ago |
|
huang
|
2b4f16e5f1
|
二级目录新界面的帖子列表页面
|
9 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
9 years ago |
|
huang
|
d8480ea3c6
|
二级目录内容页面
|
9 years ago |
|
huang
|
1685449381
|
二级目录框架及结构
|
9 years ago |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
9 years ago |
|
yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
huang
|
9fbf713709
|
完成组织二级域名
|
9 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
9 years ago |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
9 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
9 years ago |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
9 years ago |
|
cxt
|
49a7e2ce1d
|
关注和绑定登录后发送欢迎消息
|
9 years ago |
|
yuanke
|
bb80cad1e3
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
yuanke
|
d34b3780c8
|
课程列表修改
|
9 years ago |
|
huang
|
c1437bb75b
|
北斗界面
|
9 years ago |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
9 years ago |
|
yuanke
|
c8eaf293e7
|
课程列表
|
9 years ago |
|
yuanke
|
81cd30cbda
|
Merge branch 'cxt_course' into yuanke_1
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
a4d250e168
|
博客列表
|
9 years ago |
|
cxt
|
379859db67
|
评分设置
|
9 years ago |
|
cxt
|
5695bcdda9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
e2b18b3f48
|
作业编辑报500
|
9 years ago |
|
huang
|
eb0e88d805
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
5c5d212193
|
博客列表
|
9 years ago |
|
huang
|
17b5832df0
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
9 years ago |
|
huang
|
aaeec3ab6c
|
版本库show页面代码简化封装
|
9 years ago |
|
cxt
|
4448cb0891
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
16348654a5
|
启用匿评和禁用匿评时修改评分设置
|
9 years ago |
|
huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
yuanke
|
eddea2eabd
|
Merge branch 'yuanke' into yuanke_1
|
9 years ago |
|
huang
|
42076a137d
|
项目统计添加判断
|
9 years ago |
|
yuanke
|
5a5afd6d24
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
d538d1967b
|
解决管理员界面代码测试列表404的问题
|
9 years ago |
|
cxt
|
7a90c0ea10
|
评分设置修改多项时不应发多条模板消息
|
9 years ago |
|
yuanke
|
85055f2a84
|
博客列表修改
|
9 years ago |
|
yuanke
|
8f62cccfd6
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
ff177557c8
|
修改代码测试列表报500
|
9 years ago |
|
yuanke
|
29115bca3a
|
博客列表修改
|
9 years ago |
|
yuanke
|
4182bb5fe7
|
111
|
9 years ago |
|
yuanke
|
c6174406fb
|
数据库语句使用rails已有的
|
9 years ago |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
9 years ago |
|
huang
|
ade19af9f2
|
未登录附件不能下载问题
|
9 years ago |
|
huang
|
200307ec9f
|
组织模块访问统计修改
|
9 years ago |
|
yuanke
|
8c5497ac45
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
fcfd17c8c9
|
修改代码评测的一个BUG
|
9 years ago |
|
yuanke
|
5aba3fb11b
|
修改查重有时候失败的问题
|
9 years ago |
|
cxt
|
51478bd232
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
9 years ago |
|
cxt
|
eeecc5ad08
|
禁用匿评的作业点击评分设置时不应出现缺评扣分的选项
|
9 years ago |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
5e5f677bab
|
动态中显示默认分支的统计
|
9 years ago |
|
huang
|
a21200ab14
|
动态中添加分支
|
9 years ago |
|
cxt
|
9fdd229b2c
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
9 years ago |
|
cxt
|
7f3fcb7d01
|
精品课程列表中的全部课程可点击动态数排序
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
9 years ago |
|
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
9 years ago |
|
cxt
|
143f3f8f9a
|
管理员界面增加精品课程的设置
|
9 years ago |
|
cxt
|
3b4f6f4846
|
添加分班和修改分班名称时刷新学生列表
|
9 years ago |
|
cxt
|
2d4f724e33
|
导出的学生列表作品排序按作业发布时间升序排列
|
9 years ago |
|
cxt
|
d91d2bfa17
|
作业下拉列表显示全部作业
|
9 years ago |
|
huang
|
fddf03d80c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
7d8715e82b
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
2a00c4ddd7
|
版本库统计show权限统计
|
9 years ago |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
19861ba8c6
|
超级管理员的组织可关联所有公开课程和项目
|
9 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
9 years ago |
|
huang
|
c87611dfec
|
动态中添加版本库统计
|
9 years ago |
|
huang
|
acf4e15f09
|
统计数左侧刷新
|
9 years ago |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
9 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
062af3c57a
|
作业积分出现负分
|
9 years ago |
|
huang
|
f9c4c4b86f
|
版本库不同分支之间的统计
|
9 years ago |
|
cxt
|
a21ea98b37
|
个人主页中的课程列表出现重复课程
|
9 years ago |
|
huang
|
426f5a76cc
|
提交列表中添加不分支的提交记录功能
|
9 years ago |
|
huang
|
f7cb451feb
|
gitlab版本库添加提交信息统计接口
|
9 years ago |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
9 years ago |
|
huang
|
04849659de
|
版本库统计
|
9 years ago |
|
huang
|
dc0b7defa1
|
版本库show页面简化及注释
|
9 years ago |
|
guange
|
055ba00de5
|
绑定成功后关闭页面
|
9 years ago |
|
huang
|
ab34fec172
|
资源导入的时候记数没有自动增加问题
|
9 years ago |
|
huang
|
cd9ad535f5
|
1、修改默认图片
2、作品弹框问题
|
9 years ago |
|
cxt
|
e007ee58ef
|
博客动态
|
9 years ago |
|
guange
|
0731405828
|
重新再次进来的用户提示欢迎信息
|
9 years ago |
|
guange
|
aa9cb4e579
|
merge
|
9 years ago |
|
huang
|
549ee9daa2
|
上传非图片格式的不显示问题
|
9 years ago |
|
huang
|
23a4a29c76
|
关联项目、课程中过滤掉私有课程、项目
|
9 years ago |
|
huang
|
623114dc41
|
解决删除项目的私有资源显示在我的资源中的问题
|
9 years ago |
|
huang
|
a6f6f63d6d
|
图片上传添加提示
|
9 years ago |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
9 years ago |
|
guange
|
ff93e9f79b
|
修改返回为json
|
9 years ago |
|
guange
|
1926f0ba53
|
修改openid路由
|
9 years ago |
|
guange
|
a25fe6cef8
|
修改openid路由
|
9 years ago |
|
guange
|
9c93b3f9a6
|
修改openid调用位置
|
9 years ago |
|
huang
|
e4b5a4df05
|
500wenti
|
9 years ago |
|
huang
|
86aecd21b9
|
上传图片
|
9 years ago |
|
huang
|
0459856a2c
|
上线logo更换
|
9 years ago |
|
huang
|
ac1b3338c5
|
logo图标替换
|
9 years ago |
|
huang
|
218a6b9358
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
c00c674c34
|
Merge branch 'develop' into hjq_beidou
Conflicts:
app/controllers/organizations_controller.rb
|
9 years ago |
|
huang
|
9e7c595e55
|
组织发送动态的显示
|
9 years ago |
|
huang
|
a9412b959e
|
动态一致问题
|
9 years ago |
|
huang
|
25da925497
|
课程列表显示内容统一
|
9 years ago |
|
huang
|
92a08dc606
|
作业500问题
admin组织编辑500问题
|
9 years ago |
|
huang
|
4cca290592
|
组织编辑500问题
作业列表500问题
|
9 years ago |
|
huang
|
10371e8bdd
|
添加附件图片功能
|
9 years ago |
|
huang
|
ebb2f30f3b
|
配置完点确定，自动跳转
|
9 years ago |
|
huang
|
4797cbe65d
|
模式默认选中
|
9 years ago |
|
huang
|
756a2db4aa
|
组织配置样式问题
链接more空白问题
|
9 years ago |
|
huang
|
6af8c48d3b
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
f662bfa40b
|
组织科配置
|
9 years ago |
|
huang
|
1ccb3a2c41
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
c6f6030e10
|
组织新样式
|
9 years ago |
|
cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
9 years ago |
|
huang
|
da1438b04e
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
5621f01284
|
权限访问控制
|
9 years ago |
|
huang
|
8f43341f81
|
新建组织为空的情况
|
9 years ago |
|
huang
|
7c55356ace
|
组织新界面修改
|
9 years ago |
 linchun
|
d98eb8748e
|
修改管理员界面作业列表的截止时间为作业发布时间，并且按时间倒序排列
|
9 years ago |
|
huang
|
f2106d0045
|
more链接添加，区分两种模式
|
10 years ago |
|
huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
10 years ago |
 alan
|
88a4b8ce6c
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
alan
|
200561da92
|
修改《私有资源公共资源中不显示》
|
10 years ago |
|
yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
10 years ago |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
10 years ago |
 ouyangxuhua
|
2275b367f4
|
在organization控制器的show方法添加layout
|
10 years ago |
|
alan
|
eb1c6ccf85
|
Merge branch 'alan_develop' into develop
Conflicts:
app/views/users/_resource_share_for_orgs.html.erb
app/views/users/_resource_share_for_project_popup.html.erb
app/views/users/_resource_share_popup.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
10 years ago |
|
huang
|
b80bc98fcb
|
组织首页
|
10 years ago |
|
cxt
|
d1cb44cff7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
1daf620ed1
|
新建作品点取消时跳到我的作业页面
|
10 years ago |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
alan
|
dfe9cb0c68
|
Merge branch 'develop' into alan_develop
|
10 years ago |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
10 years ago |
|
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
10 years ago |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
10 years ago |
|
huang
|
b8463fcca5
|
北斗
|
10 years ago |
|
huang
|
74a4e80795
|
Merge branch 'ouyangxuhua' into hjq_beidou
|
10 years ago |
|
Tim
|
406bb7930c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/javascripts/wechat/wechat-dev.js
|
10 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
10 years ago |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
10 years ago |
|
huang
|
326730f6b1
|
北斗框架
|
10 years ago |
|
guange
|
60931dde6a
|
添加获取openid的功能
|
10 years ago |
|
yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
10 years ago |
|
yuanke
|
88ba2bf556
|
编译错误处理
|
10 years ago |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
10 years ago |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
10 years ago |
|
yuanke
|
4c47dae88b
|
Merge branch 'develop' into yuanke
|
10 years ago |
|
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
10 years ago |
|
alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
alan
|
4f5e083707
|
优化个人主页，缓存设置
|
10 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
10 years ago |
|
ouyangxuhua
|
9f8ad41533
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
10 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
10 years ago |
|
huang
|
9549d695f6
|
讨论区局部优化
|
10 years ago |
|
alan
|
aeb694a68e
|
修改《删除blog_comment时删除user_activities内容》
|
10 years ago |
|
alan
|
357c60d42e
|
Merge branch 'hjq_new_course' into alan_develop
|
10 years ago |
|
alan
|
7108e6d763
|
减少数据库查询字段
|
10 years ago |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
10 years ago |
|
huang
|
88185b1f34
|
点击作品消息，作品展开
|
10 years ago |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
10 years ago |
|
huang
|
d6f81c8978
|
课程讨论区优化
|
10 years ago |
|
huang
|
f1ffd3852f
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
185ad829cd
|
项目访问速度优化
|
10 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
10 years ago |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
alan
|
49026f0438
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
alan
|
9273e37a5b
|
优化SQL查询：1，members与users表关联查询； 2，blogs表单查询
|
10 years ago |
|
cxt
|
aa1cbcdf87
|
课程留言动态加入个人动态
|
10 years ago |
|
huang
|
12efbcb9ae
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
7967066b05
|
附件添加动态发送方式改变
|
10 years ago |
|
ouyangxuhua
|
675b1ad403
|
1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。
|
10 years ago |
|
huang
|
478311128d
|
优化project_controller show方法
|
10 years ago |
|
huang
|
341308658d
|
优化项目消息更新代码
|
10 years ago |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
10 years ago |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
10 years ago |
|
guange
|
6ae4cd0767
|
merge
|
10 years ago |
|
linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
guange
|
59923dfb03
|
merge
|
10 years ago |
|
cxt
|
74e77bf347
|
题库的来源排序不可用
题库的分布时间排序
|
10 years ago |
|
huang
|
2793a9a874
|
0
|
10 years ago |
|
huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
10 years ago |
|
cxt
|
9917e802cb
|
课程推荐的资源统计
|
10 years ago |
|
cxt
|
a482b76207
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
e34f2e45db
|
管理员界面的课程列表和项目列表分页
|
10 years ago |
|
linchun
|
d3635067b7
|
Merge remote-tracking branch 'remotes/origin/develop' into linchun
|
10 years ago |
|
linchun
|
66a7827eb2
|
组织列表增加分页功能，学校列表调整分页
|
10 years ago |
|
cxt
|
24318e3d6b
|
题库的刷新
|
10 years ago |
|
linchun
|
f8a88767c0
|
管理员用户列表增加单位信息
|
10 years ago |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
10 years ago |
|
cxt
|
119b12349b
|
作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交
|
10 years ago |
|
huang
|
4766abab7f
|
下载行为添加ID判断
|
10 years ago |
|
huang
|
b262e1b432
|
完成下载行为记录
|
10 years ago |
|
cxt
|
2466184d8a
|
编辑作业的时候，还要选择作业发布的课程不合理，影响体验
编辑作业时layout根据来源而不同
|
10 years ago |
|
huang
|
79767f4bae
|
用户行为记录
|
10 years ago |
|
cxt
|
c73637a4ca
|
作业列表按作业发布时间排序
|
10 years ago |
|
huang
|
1b0bcd0c05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
cefa6efc1b
|
项目动态中加入附件
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
10 years ago |
|
linchun
|
52af5e4303
|
修复了管理员界面多个列表的题目问题
|
10 years ago |
|
huang
|
84470af2ff
|
删除的课程和项目不在发送中显示
|
10 years ago |
|
alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
10 years ago |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
10 years ago |
|
huang
|
0a881f14e8
|
导入添加自动搜索
|
10 years ago |
|
alan
|
4d82f0c959
|
在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》
|
10 years ago |
|
linchun
|
34c9f54510
|
完成了管理员界面学校列表
|
10 years ago |
|
huang
|
064dc81ed6
|
解决公共资源删除资源后统计数字不减少的问题
（增加删除回调）
|
10 years ago |
|
ouyangxuhua
|
ea6de1407e
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
alan
|
050a266985
|
Merge branch 'FX-alan-message-access-slow' into alan_develop
|
10 years ago |
|
ouyangxuhua
|
9bac560906
|
超级管理员有编辑和删除博客的权限
|
10 years ago |
|
huang
|
9aab10c05a
|
代码更新
|
10 years ago |
|
cxt
|
879f9a0ad5
|
对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天
|
10 years ago |
|
linchun
|
69ec475752
|
组织列表时间倒序排列
|
10 years ago |
|
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
10 years ago |
|
linchun
|
7d5a5f1de2
|
完成项目资源列表中的排序（资源大小，上传时间，下载次数）
|
10 years ago |
|
linchun
|
3fcf192430
|
完成了课程资源列表的排序（上传时间，资源大小，下载次数）
|
10 years ago |
