 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 |
