 alan
|
e764075bd6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
alan
|
16831e19d9
|
merge 晓婷的课程留言
|
10 years ago |
 ouyangxuhua
|
2261081dc2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
alan
|
6862480632
|
修改当用户没有项目时，报错
|
10 years ago |
|
ouyangxuhua
|
cca2527401
|
组织栏目新建文章样式调整
|
10 years ago |
|
alan
|
4587e728d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
alan
|
05d66f41f9
|
fix bug when user don't have courses or projects
|
10 years ago |
 huang
|
8f0038c3ff
|
tag
|
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 |
|
huang
|
cca570e75c
|
课程相关优化
|
10 years ago |
|
alan
|
3b48b3add7
|
refactor cache
|
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 |
|
huang
|
e02ad85bbb
|
项目动态关联优化（主要优化查询次数）
|
10 years ago |
|
huang
|
9ce39d2f4a
|
Issue模块动态优化
|
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 |
|
ouyangxuhua
|
7b24b053a5
|
Merge branch 'develop' into ouyang
|
10 years ago |
|
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序，带过滤条件，如tag类型、搜索条件等
|
10 years ago |
|
huang
|
ff2340baf9
|
课程统计信息优化
|
10 years ago |
|
alan
|
04b4823ac2
|
user_activities 加cache
|
10 years ago |
|
huang
|
cb4b26762d
|
课程base优化
|
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
|
9cbe719c5e
|
项目动态表添加索引
|
10 years ago |
|
huang
|
88185b1f34
|
点击作品消息，作品展开
|
10 years ago |
|
huang
|
77419dc2d4
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
alan
|
11a5e0a963
|
Merge branch 'develop' into alan_develop
|
10 years ago |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
10 years ago |
|
alan
|
a0e11a787f
|
修改个人主页不能展开更多
|
10 years ago |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
10 years ago |
|
ouyangxuhua
|
589f939bbd
|
消息类型“学生再次提交作业”中的链接，应该打开学生作品
|
10 years ago |
|
huang
|
d6f81c8978
|
课程讨论区优化
|
10 years ago |
|
ouyangxuhua
|
3fc988757c
|
组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索
|
10 years ago |
|
alan
|
0d049bbe1f
|
refactor new_base_user
|
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 |
|
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
10 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
10 years ago |
|
cxt
|
fe35bb3b44
|
学生打开作品列表报500
|
10 years ago |
|
ouyangxuhua
|
6b3e9ba4b3
|
新建组织时，点击私有或者公开选项，允许游客下载选项及时响应
|
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 |
|
cxt
|
f90b25b230
|
作业附件的用户名省略号太早
|
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
|
fcb189d874
|
编辑组织栏目的顺序时，不需要弹窗
|
10 years ago |
|
ouyangxuhua
|
675b1ad403
|
1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。
|
10 years ago |
|
huang
|
478311128d
|
优化project_controller show方法
|
10 years ago |
|
huang
|
341308658d
|
优化项目消息更新代码
|
10 years ago |
|
huang
|
e20fe85ddf
|
消息去掉tip
|
10 years ago |
|
huang
|
70d594659e
|
课程英雄榜代码封装
|
10 years ago |
|
huang
|
e06695b56b
|
课程活跃度代码封装
|
10 years ago |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
10 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
4fa1288411
|
添加组织栏目后，栏目子域名输入框设置为空
|
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 |
|
ouyangxuhua
|
84703a3e01
|
组织配置中的添加成员，链接使用https://www形式
|
10 years ago |
|
cxt
|
74e77bf347
|
题库的来源排序不可用
题库的分布时间排序
|
10 years ago |
|
cxt
|
fdcd44e240
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
d967a31ec9
|
课程报500
|
10 years ago |
|
alan
|
7d4e0c5d8a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
alan
|
20cdec0cab
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
alan
|
66d2558f87
|
修复《issue具体页面样式》
|
10 years ago |
|
huang
|
2793a9a874
|
0
|
10 years ago |
|
ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
0413eb1c02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
alan
|
2b07671d95
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
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
|
e167a28d49
|
课程推荐的作业统计
|
10 years ago |
|
ouyangxuhua
|
c64910d343
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
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 |
|
ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
cxt
|
b1f3395bd1
|
修改作品描述框和名称框的提示文字
|
10 years ago |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
10 years ago |
|
huang
|
bff20ee072
|
英雄榜数据显示问题
|
10 years ago |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
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
|
8a8c9bf7c3
|
注释修改
|
10 years ago |
|
huang
|
2fe1100da6
|
去掉课程使者帖子中时间
|
10 years ago |
|
huang
|
888c024e9e
|
资源库ajax局部刷新
|
10 years ago |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
10 years ago |
