txz
|
139a7931ee
|
点赞功能修改
|
9 years ago |
cxt
|
60c8320f82
|
praise api的修改
|
9 years ago |
txz
|
938bf48d08
|
点赞功能修改
|
9 years ago |
cxt
|
2fe32fda61
|
点赞的js
|
9 years ago |
txz
|
eb996280a6
|
点赞功能
|
9 years ago |
cxt
|
f1783c06a2
|
详情页面传参openid
|
9 years ago |
txz
|
3008c0c44d
|
activities.html冲突解决
|
9 years ago |
txz
|
0b1b08bd3d
|
点赞
|
9 years ago |
guange
|
80f47476cb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
guange
|
99f39696d0
|
点击展开功能完成
|
9 years ago |
txz
|
6d8ffabb39
|
代码优化
|
9 years ago |
guange
|
8ac8e1c9e5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
79dcd48d8c
|
重构
|
9 years ago |
txz
|
8e1473a484
|
点赞代码优化等
|
9 years ago |
txz
|
ec47fb1949
|
项目缺陷详情页面修改
|
9 years ago |
txz
|
a1ef398b9d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
txz
|
422621759e
|
项目讨论区详情修改
|
9 years ago |
cxt
|
20bb8c1e09
|
留言详情页面
|
9 years ago |
txz
|
6115e374bf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
txz
|
a1a9dbd8a3
|
项目讨论区详情页面
|
9 years ago |
guange
|
42bd2dcfc5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
guange
|
3ee79a6889
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
guange
|
70c2c9cc9f
|
把activities列表存起来,防止返回时页面变空
|
9 years ago |
txz
|
c9687a8764
|
课程通知详情页面
|
9 years ago |
txz
|
feb0014bf8
|
作业详情页面
|
9 years ago |
txz
|
18cda892d9
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
cxt
|
be30ac889b
|
冲突
|
9 years ago |
txz
|
0d04f996c5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
cxt
|
035b47d2b7
|
issue页面的调整
|
9 years ago |
guange
|
606599047d
|
详情页出错
|
9 years ago |
guange
|
23ec67b2eb
|
详情页出错
|
9 years ago |
guange
|
afd779f292
|
使用cookies存储openid
|
9 years ago |
guange
|
80d5424ff3
|
详情页出错
|
9 years ago |
guange
|
619b07b5c2
|
服务器上调试openid成功
|
9 years ago |
txz
|
50c6b565e7
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
txz
|
11651fc866
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
bb5a527f9e
|
配置新菜单
|
9 years ago |
txz
|
b2a892bd22
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
guange
|
417484f3ad
|
加入调试标志
|
9 years ago |
txz
|
48e26fce62
|
冲突解决
|
9 years ago |
txz
|
8c7de04dbf
|
项目问答详情页面
|
9 years ago |
guange
|
36f3e3a46c
|
改为angularjs实现
|
9 years ago |
guange
|
58c1b27600
|
加入openid传参
|
10 years ago |
guange
|
e1f1c6fbc0
|
openid参数
|
10 years ago |
guange
|
1926f0ba53
|
修改openid路由
|
10 years ago |
guange
|
9c93b3f9a6
|
修改openid调用位置
|
10 years ago |
guange
|
7d4de36521
|
修改openid调用位置
|
10 years ago |
guange
|
5839959f0a
|
修改openid调用位置
|
10 years ago |
cxt
|
9da89ef5e2
|
课程通知的回复
|
10 years ago |
cxt
|
d47f887fd1
|
issue回复的修改
|
10 years ago |
cxt
|
bc5e455f0f
|
解决冲突
|
10 years ago |
cxt
|
790b452a9b
|
issue回复
|
10 years ago |
txz
|
d45604c4a0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
txz
|
3b70970651
|
问题跟踪详情页面修改
|
10 years ago |
cxt
|
cc2fe6108a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
cxt
|
5e697e5367
|
作业的回复
|
10 years ago |
txz
|
0d24de7198
|
详情页面回复
|
10 years ago |
cxt
|
7dccb0d963
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
cxt
|
88c39512b9
|
journal的修改
|
10 years ago |
txz
|
58e5fe85c3
|
issue 详情页面
|
10 years ago |
txz
|
4902361b3f
|
冲突解决
|
10 years ago |
txz
|
596bf641ac
|
最新动态各详情页面
|
10 years ago |
cxt
|
b3b0488bf5
|
动态点击更多
|
10 years ago |
Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
10 years ago |
Yiang Gan
|
392c5708f2
|
作业详情页面
|
10 years ago |
Tim
|
77e11fe0fe
|
微信最新动态修改
|
10 years ago |
Yiang Gan
|
4de598873f
|
动态和作业的api
|
10 years ago |
ouyangxuhua
|
9e599da365
|
组织动态,点击展开更多没有反应问题解决
|
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 |
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 |
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 |
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 |
guange
|
59923dfb03
|
merge
|
10 years ago |
guange
|
b356c6cd1f
|
答案提交加入超时处理
|
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
|
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
|
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 |
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 |
yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
10 years ago |
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
10 years ago |
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
10 years ago |
luoquan
|
1900a824e8
|
0
|
10 years ago |
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业,设置评分等按钮点击没反应的问题修复;更新项目/课程的活动,相应地更新组织的活动的更新时间
|
10 years ago |
yuanke
|
5dcd3b6826
|
解决KE工具栏一行与两行显示不一致的情况
|
10 years ago |
cxt
|
91d000c8f3
|
编程作业:编程测试集的弹框中,多行却只显示一行
|
10 years ago |
guange
|
509d4a3df7
|
绑定提交改为ajax
|
10 years ago |
guange
|
445bae6de9
|
patch mysql5.7的create table
|
10 years ago |
cxt
|
072300331b
|
编程测试集的输入输出添加序号
|
10 years ago |
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
ouyangxuhua
|
8784c7cec6
|
超链接不能正常显示的问题
|
10 years ago |
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
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 |
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
10 years ago |
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
10 years ago |
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
10 years ago |
ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度;2.https://www.trustie.net/manual/feedback链接到帮助中心;3.编辑框显示更多选项
|
10 years ago |
ouyangxuhua
|
c857fb734b
|
快捷回复中,设置回复框的高度和宽度
|
10 years ago |
ouyangxuhua
|
89a919163c
|
一旦组织私有,就disabled掉允许游客下载选项
|
10 years ago |
cxt
|
f632a3d4fb
|
编程弹框固定位置
|
10 years ago |
cxt
|
8f1bffd28b
|
留言不能为空
|
10 years ago |
cxt
|
bb67a8f77d
|
若测试集够长,点击增加测试集,此时应该自动定位到测试集输入框
|
10 years ago |
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
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
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
10 years ago |
Tim
|
c7edf0d73b
|
弹框样式修改
|
10 years ago |
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
10 years ago |
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 years ago |
huang
|
c936304314
|
课程默认收起
|
10 years ago |
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |
guange
|
e96496ddcd
|
avatar.js和attachments.js冲突,导致头像不能上传
|
10 years ago |
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度;2.编辑博客首页转到博客首页
|
10 years ago |
cxt
|
7d663ce66f
|
动态内容统一高度
|
10 years ago |
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
huang
|
680e861620
|
项目资源搜索功能
|
10 years ago |
guange
|
d2c7d12cd9
|
merge
|
10 years ago |
guange
|
8ea9430318
|
at链接问题修改
|
10 years ago |
lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |