 cxt
|
b3b0488bf5
|
动态点击更多
|
10 years ago |
 Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
10 years ago |
 huang
|
8f4ff2bf91
|
列表样式问题
|
10 years ago |
|
Yiang Gan
|
392c5708f2
|
作业详情页面
|
10 years ago |
|
huang
|
5866dfb7ff
|
登录
没内容more
logo不加链接
|
10 years ago |
|
huang
|
45343a44b8
|
修改链接
|
10 years ago |
|
huang
|
f662bfa40b
|
组织科配置
|
10 years ago |
|
huang
|
c431658333
|
setting中后台编辑
|
10 years ago |
|
Yiang Gan
|
f23c0e7602
|
最新动态修改
|
10 years ago |
 Tim
|
77e11fe0fe
|
微信最新动态修改
|
10 years ago |
|
Yiang Gan
|
6dc374cf9a
|
最新动态
|
10 years ago |
|
huang
|
0244008b32
|
一些链接和样式
|
10 years ago |
|
huang
|
7c55356ace
|
组织新界面修改
|
10 years ago |
|
Yiang Gan
|
4de598873f
|
动态和作业的api
|
10 years ago |
|
huang
|
961a264e05
|
创建时间统一date
|
10 years ago |
|
huang
|
65e80b1978
|
用户图像样式
|
10 years ago |
|
huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
10 years ago |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
10 years ago |
 ouyangxuhua
|
74d8dffc14
|
发送功能样式调整
|
10 years ago |
|
ouyangxuhua
|
9e599da365
|
组织动态，点击展开更多没有反应问题解决
|
10 years ago |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2b9ddf3594
|
组织新版
|
10 years ago |
|
huang
|
b80bc98fcb
|
组织首页
|
10 years ago |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
 yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
10 years ago |
|
ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
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 |
|
Tim
|
a9fd79ec63
|
微信动态筛选
|
10 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
10 years ago |
guange
|
d5124e128e
|
添加调试功能
|
10 years ago |
|
guange
|
60931dde6a
|
添加获取openid的功能
|
10 years ago |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
10 years ago |
|
Tim
|
4f7d698076
|
wechat init
|
10 years ago |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
10 years ago |
|
yuanke
|
63ae921c40
|
return 放错位置了
|
10 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
10 years ago |
|
yuanke
|
3c1be19702
|
修改编程提示语句
|
10 years ago |
|
yuanke
|
1f9d2ceffb
|
修改下编程的提示
|
10 years ago |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
yuanke
|
0fd164d2bb
|
修改编程的几个提示语句
|
10 years ago |
|
yuanke
|
3af257eb77
|
评测服务器有问题时得提示
|
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 |
|
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序，带过滤条件，如tag类型、搜索条件等
|
10 years ago |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
10 years ago |
|
cxt
|
f90b25b230
|
作业附件的用户名省略号太早
|
10 years ago |
|
guange
|
aaa2a0dea7
|
手机头修改
|
10 years ago |
|
guange
|
7804a1e9ec
|
url更改
|
10 years ago |
|
guange
|
908b3dfdbd
|
利用reactjs前后端分离
|
10 years ago |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
10 years ago |
|
guange
|
6ae4cd0767
|
merge
|
10 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
guange
|
59923dfb03
|
merge
|
10 years ago |
|
guange
|
b356c6cd1f
|
答案提交加入超时处理
|
10 years ago |
|
cxt
|
d2bff21de5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
54a00ca867
|
题库作业信息框的样式调整
|
10 years ago |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
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 |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
10 years ago |
 alan
|
9265186307
|
修改user动态中issue行高，使之与project中的一样
|
10 years ago |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
10 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
10 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
10 years ago |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
10 years ago |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
10 years ago |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
10 years ago |
 luoquan
|
006731ea61
|
修改以下问题：
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
|
10 years ago |
|
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
10 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
10 years ago |
|
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
10 years ago |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
10 years ago |
|
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
10 years ago |
|
luoquan
|
1900a824e8
|
0
|
10 years ago |
|
luoquan
|
1e256add7f
|
媒体播放默认样式
|
10 years ago |
|
luoquan
|
033c7991e1
|
修改媒体播放
|
10 years ago |
|
luoquan
|
ec4b7e3744
|
视频默认图标
|
10 years ago |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
10 years ago |
|
luoquan
|
62f91865e0
|
kindeditor视频添加默认图片
|
10 years ago |
|
luoquan
|
7d70e63f8d
|
代码重置
|
10 years ago |
|
luoquan
|
e80caf87b2
|
还原行距问题
|
10 years ago |
|
luoquan
|
2d14b26c11
|
还原行距问题
|
10 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
yuanke
|
28b481cf36
|
修改KE点击上传图片时选择非图片格式时的提示信息
|
10 years ago |
|
yuanke
|
6fa2fd8b47
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
10 years ago |
|
yuanke
|
9b5cd8f880
|
KE表格修改
|
10 years ago |
|
yuanke
|
5ea618b520
|
修改KE插入图片没显示完全的问题
|
10 years ago |
|
luoquan
|
a6da304b56
|
修改KE编辑换行后发布对不齐问题
|
10 years ago |
|
luoquan
|
1c6deadfd7
|
修改KE编辑的内容与发布的样式对其不一致问题
|
10 years ago |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
|
yuanke
|
0805bfce6a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
10 years ago |
|
yuanke
|
5dcd3b6826
|
解决KE工具栏一行与两行显示不一致的情况
|
10 years ago |
|
yuanke
|
e073d58169
|
KE的几个问题修改
1.我要回复
2.段落颜色
3.变粗滚动条移动
4.没默认字体
|
10 years ago |
|
cxt
|
1cccf79bd8
|
课程资源库菜单中的删除资源无法点击
|
10 years ago |
|
cxt
|
f0e3fe8ff7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
91d000c8f3
|
编程作业：编程测试集的弹框中，多行却只显示一行
|
10 years ago |
|
Tim
|
56372fbdd5
|
积分规则显示样式调整
|
10 years ago |
|
huang
|
d30e73795d
|
积分规则
|
10 years ago |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
10 years ago |
|
huang
|
596d4e17e9
|
解决样式冲突
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
9b573248d8
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_show_user_homework_form.html.erb
app/views/users/_show_user_homeworks.html.erb
|
10 years ago |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
10 years ago |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
10 years ago |
|
Tim
|
f51d16c538
|
资源库样式调整
|
10 years ago |
|
huang
|
21244a5657
|
资源库导入功能
|
10 years ago |
|
huang
|
8edaa9d2bd
|
资源库
|
10 years ago |
|
Tim
|
11592bdbcc
|
导入题库题目弹框样式更改
|
10 years ago |
|
guange
|
509d4a3df7
|
绑定提交改为ajax
|
10 years ago |
|
guange
|
445bae6de9
|
patch mysql5.7的create table
|
10 years ago |
|
cxt
|
f6f84b564e
|
在线测验的选项和候选答案的正确显示
|
10 years ago |
|
cxt
|
072300331b
|
编程测试集的输入输出添加序号
|
10 years ago |
|
guange
|
15d5fe127e
|
merge
|
10 years ago |
|
guange
|
a83cb2a1fa
|
merge
|
10 years ago |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
ouyangxuhua
|
8784c7cec6
|
超链接不能正常显示的问题
|
10 years ago |
 newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
Tim
|
e8234092ec
|
复制学期弹框调整
|
10 years ago |
|
Tim
|
100b002a1f
|
提交改动显示页面调整
|
10 years ago |
|
huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
10 years ago |
|
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
10 years ago |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
e499be999f
|
课程英雄榜的样式修改
|
10 years ago |
|
Tim
|
b376c5c6cd
|
版本库和问题跟踪的function样式冲突
|
10 years ago |
|
huang
|
ea2033eb30
|
Git文件识别，换行
|
10 years ago |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
ouyangxuhua
|
5c9d8954ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
Tim
|
87f5f9c380
|
上传头像预览图片排版，课程关联组织取消按钮
|
10 years ago |
|
huang
|
78c70dce81
|
版本库用户名长度引起的错位
|
10 years ago |
|
ouyangxuhua
|
808f9a6b7a
|
组织页面右上角样式还原
|
10 years ago |
|
Tim
|
228857f20c
|
资源历史版本样式
|
10 years ago |
|
huang
|
59d45f2d52
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
Tim
|
55b13e7dde
|
历史版本样式更改
|
10 years ago |
|
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
Conflicts:
app/views/org_document_comments/edit.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 |
|
ouyangxuhua
|
5df44ba44f
|
1.ke回复框能自动增加高度；2.组织页面右上角链接修改
|
10 years ago |
|
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题
|
10 years ago |
|
guange
|
ac121ce585
|
组织文章无法编辑问题
|
10 years ago |
|
ouyangxuhua
|
02f8007557
|
修改组织配置的样式；修改一个bug
|
10 years ago |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
10 years ago |
|
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
10 years ago |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
10 years ago |
|
Tim
|
d092891b2a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
Tim
|
83a3c879d4
|
私信配置按钮显示
|
10 years ago |
|
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
10 years ago |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
10 years ago |
|
ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项
|
10 years ago |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
10 years ago |
|
ouyangxuhua
|
c857fb734b
|
快捷回复中，设置回复框的高度和宽度
|
10 years ago |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
10 years ago |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
10 years ago |
|
ouyangxuhua
|
89a919163c
|
一旦组织私有，就disabled掉允许游客下载选项
|
10 years ago |
|
cxt
|
a04f136e9f
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
900b861f31
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
035e47510f
|
图片更改
|
10 years ago |
|
cxt
|
f632a3d4fb
|
编程弹框固定位置
|
10 years ago |
|
cxt
|
8f1bffd28b
|
留言不能为空
|
10 years ago |
|
cxt
|
4b25383531
|
学生列表的tip被遮盖
|
10 years ago |
|
cxt
|
f3a956a336
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
bb67a8f77d
|
若测试集够长，点击增加测试集，此时应该自动定位到测试集输入框
|
10 years ago |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
a96d8ce5a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
e09f795171
|
附件的显示
|
10 years ago |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
10 years ago |
|
huang
|
448a412abf
|
issue详情页面在 user动态、project动态中修改
|
10 years ago |
|
ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
10 years ago |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
10 years ago |
|
cxt
|
247924af26
|
动态内容显示不全
|
10 years ago |
|
cxt
|
f15847371c
|
附件显示过长
|
10 years ago |
|
guange
|
7e18fe19be
|
添加适合微信图文的图片
|
10 years ago |
|
guange
|
3f867a7f83
|
添加weui样式
|
10 years ago |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
10 years ago |
|
huang
|
01016c67a9
|
issue属性局部刷新
|
10 years ago |
|
Tim
|
c7edf0d73b
|
弹框样式修改
|
10 years ago |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
10 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
10 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 years ago |
|
huang
|
18c3c23d2c
|
课程推荐
|
10 years ago |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
Tim
|
cd3a1e59dd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
04fded784e
|
单词折行样式
|
10 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
10 years ago |
|
cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
cxt
|
df57b13ce0
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
