 cxt
|
ded8f48d34
|
博客的二级回复
|
9 years ago |
|
cxt
|
c46fcc48b1
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/users/_join_course_course_message.html.erb
|
9 years ago |
|
cxt
|
f0e456729e
|
过滤掉消息中的html
|
9 years ago |
 huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
cb148c3b9c
|
fixed 500
|
9 years ago |
|
cxt
|
320db4ddd9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
.access_token
|
9 years ago |
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
cxt
|
1a15c0f567
|
新建班级发布作业报500
|
9 years ago |
|
cxt
|
3362ebe321
|
线下作业
|
9 years ago |
|
cxt
|
5a22e9a147
|
作业启动匿评
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
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 |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
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 |
|
huang
|
67cad6fc25
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
374a905d1e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
9 years ago |
|
cxt
|
0e2e1b09b5
|
title修改
|
9 years ago |
|
yuanke
|
547d5409bb
|
组织中的课程字样改为班级
|
9 years ago |
 txz
|
7178c50b1d
|
branch's total commits
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
9 years ago |
Your Name
|
77387778d8
|
some css
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
Your Name
|
a08edcca8a
|
quanxian
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
|
Your Name
|
e5b93ac7ed
|
modified main method
|
9 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
c501af70ba
|
.
|
9 years ago |
|
huang
|
01bedc4bc2
|
编码问题
|
9 years ago |
|
huang
|
4a4c613c55
|
utf-8编码
|
9 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
f984a01cdc
|
跳转协议问题
|
9 years ago |
|
cxt
|
b5c9156c10
|
加入课程报403
|
9 years ago |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
|
Your Name
|
e4e0e7b166
|
helper
|
9 years ago |
|
Your Name
|
e17aa4c5d8
|
color
|
9 years ago |
|
cxt
|
bd3277681c
|
分组作业的作业成绩导出、学生列表的导出
|
9 years ago |
|
huang
|
a0635bbb2d
|
所占百分比
|
9 years ago |
|
huang
|
dcd2aa7848
|
参考临界值
|
9 years ago |
|
Your Name
|
e6b263feb5
|
issues from sonar
|
9 years ago |
|
Your Name
|
0dc1a1c047
|
get status
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
huang
|
e3b6bd19e1
|
修改质量分支控制器名
|
9 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
d0791253d9
|
quality
|
9 years ago |
|
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
9 years ago |
|
guange
|
8fd4d518b2
|
添加邀请码
|
9 years ago |
|
cxt
|
6100abe0da
|
课程大纲
|
9 years ago |
|
huang
|
90aaaa544a
|
最新动态按创建时间排序
|
9 years ago |
|
huang
|
67f0cad331
|
组织网站动态新页面
|
9 years ago |
|
huang
|
9c01bb63e7
|
配置页面管理员栏目权限控制
|
9 years ago |
|
huang
|
c5bccf1adb
|
组织动态按更新时间排序
|
9 years ago |
|
huang
|
59988f17da
|
帖子目录界面
|
9 years ago |
|
huang
|
bfa447c195
|
未登录状态下anonymos改为未登录
|
9 years ago |
|
huang
|
edbe882cc9
|
管理员栏目其它成员不可见
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
e726a362d8
|
组织配置页面状态的更新
|
9 years ago |
|
huang
|
1e34a4f174
|
显示样式一级添加二级目录权限
|
9 years ago |
|
huang
|
fa2437cdf6
|
添加课程学期
|
9 years ago |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
9 years ago |
|
huang
|
ca3b072f85
|
热门项目按照项目得分排序及设置界面中默认设置
|
9 years ago |
|
huang
|
257165dbaf
|
模式二中添加课程定配
|
9 years ago |
|
huang
|
0b3ec0322f
|
右一模式
|
9 years ago |
|
huang
|
76732a3034
|
新模式有一
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
cxt
|
0cc8cb9928
|
刚提交的回复时间显示为“刚刚”
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
a96fafd704
|
模式三（未完）
|
9 years ago |
|
huang
|
8d56d8556f
|
完成模式6
|
9 years ago |
|
huang
|
bb7204846f
|
新版资源类型定制模式6
|
9 years ago |
|
cxt
|
796125bd1c
|
修改微信端的时间提示
|
9 years ago |
|
huang
|
c369b271a0
|
组织管理员配置后的权限控制及局部刷新
|
9 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
9 years ago |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
9 years ago |
|
huang
|
afedaf3fe5
|
组织资源历史版本下载权限问题
|
9 years ago |
|
huang
|
7b6a62e972
|
历史版本下载403问题
|
9 years ago |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
9 years ago |
|
huang
|
eead7962cf
|
资源申请权限控制
|
9 years ago |
|
huang
|
b0e4ed5ab3
|
请求分享如果自己在项目的话则不需要申请
|
9 years ago |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
6aa20c9edf
|
消息通知的内容没有过滤用Tab键空格引起的特殊符号
|
9 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
9 years ago |
|
huang
|
11bc6b1e6c
|
配置500问题
|
9 years ago |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
9 years ago |
|
guange
|
f217b3f510
|
去除用户名域名
|
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 |
|
huang
|
39c753fd25
|
名师列表排序
|
9 years ago |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
3853d5b7ad
|
右三模式定制
|
9 years ago |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
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
|
5baf467d13
|
作品评分不覆盖
|
9 years ago |
|
huang
|
cabac5914c
|
学生统计数
|
9 years ago |
|
huang
|
99d9a28828
|
名师榜sql查询
|
9 years ago |
|
huang
|
5880a12290
|
sql查询
|
9 years ago |
|
huang
|
6474444cc7
|
用户连接 id变成用户名
|
9 years ago |
|
huang
|
a98678e001
|
列表中类型显示方法封装
|
9 years ago |
|
huang
|
878bcc8cf1
|
栏目创建类型添加老师、学生类型
|
9 years ago |
|
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
9 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
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
|
10d26f89d9
|
作业列表的二级回复
|
9 years ago |
|
huang
|
c3a016607b
|
解决冲突
|
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
|
0b43fb5502
|
隐藏可见及箭头的局部刷新
|
9 years ago |
|
huang
|
231f8f3526
|
二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框
|
9 years ago |
|
huang
|
a0ea2c7e5d
|
模式二3在配置整合
|
9 years ago |
|
huang
|
ccea42cc8b
|
项目和课程的动态只参与五种配置
|
9 years ago |
|
huang
|
8dfe95dfd1
|
配置页面新建二级域名样式
|
9 years ago |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
1cad1626e0
|
解决冲突
|
9 years ago |
|
yuanke
|
b199a6b8b2
|
列表人气排序修改
|
9 years ago |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
yuanke
|
f8abd46ae9
|
列表修改
|
9 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
9 years ago |
|
huang
|
1685449381
|
二级目录框架及结构
|
9 years ago |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
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
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
huang
|
d8f71da1fb
|
完成模块8配置
|
9 years ago |
|
huang
|
255d7e07bc
|
北斗新界面样式
|
9 years ago |
|
huang
|
dae6a5ecae
|
配置八种类型更新
|
9 years ago |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
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 |
|
huang
|
e8048f8eb7
|
完成版本库时间UTC与北京时间的转换
时间国际化问题
|
9 years ago |
|
cxt
|
06f15735fe
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
ef987d6bf7
|
模板消息中有html标签
|
9 years ago |
|
huang
|
ad3d27d6b0
|
版本库文件目录
|
9 years ago |
|
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
9 years ago |
|
huang
|
7259d607dc
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
8064fe6c46
|
讨论区新建帖子代码优化
|
9 years ago |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
huang
|
acf4e15f09
|
统计数左侧刷新
|
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 |
|
cxt
|
70afbb3323
|
姓名的判断、
|
9 years ago |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
9 years ago |
|
guange
|
aa9cb4e579
|
merge
|
9 years ago |
|
cxt
|
8f7c6f49b7
|
api的修改
|
9 years ago |
|
cxt
|
6c527a9a54
|
点赞的api
|
9 years ago |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
9 years ago |
 Yiang Gan
|
af2bd66847
|
回复api
|
9 years ago |
|
Yiang Gan
|
536394663a
|
微信消息模板
|
9 years ago |
|
huang
|
f662bfa40b
|
组织科配置
|
9 years ago |
|
huang
|
c431658333
|
setting中后台编辑
|
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
|
bded9f2e98
|
图片自动获取功能
|
9 years ago |
|
huang
|
7c55356ace
|
组织新界面修改
|
9 years ago |
|
Yiang Gan
|
9cebcfdd2d
|
动态api调整
|
9 years ago |
|
Yiang Gan
|
4de598873f
|
动态和作业的api
|
9 years ago |
|
huang
|
8a6a1b94ee
|
组织资源的统计与权限
|
9 years ago |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
9 years ago |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
2b9ddf3594
|
组织新版
|
9 years ago |
|
cxt
|
ed0eb4aff3
|
学生作品详情无法打开
|
9 years ago |
|
huang
|
b8463fcca5
|
北斗
|
9 years ago |
|
huang
|
8f0038c3ff
|
tag
|
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 |
 ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
huang
|
ff2340baf9
|
课程统计信息优化
|
10 years ago |
|
huang
|
cb4b26762d
|
课程base优化
|
10 years ago |
|
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
10 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
10 years ago |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
alan
|
9273e37a5b
|
优化SQL查询：1，members与users表关联查询； 2，blogs表单查询
|
10 years ago |
 linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
84703a3e01
|
组织配置中的添加成员，链接使用https://www形式
|
10 years ago |
|
ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
10 years ago |
|
huang
|
bff20ee072
|
英雄榜数据显示问题
|
10 years ago |
|
linchun
|
d3635067b7
|
Merge remote-tracking branch 'remotes/origin/develop' into linchun
|
10 years ago |
