 huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
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 |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
10 years ago |
 ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
10 years ago |
|
huang
|
8b815f95bb
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
ed26242f94
|
版本库提交次数迁移
|
10 years ago |
|
huang
|
b2746d0953
|
课程讨论区总数计入回复数
|
10 years ago |
|
huang
|
f52e74da61
|
修改issues总数读取方式
|
10 years ago |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
huang
|
86516df88a
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
huang
|
c936304314
|
课程默认收起
|
10 years ago |
 Tim
|
50849baade
|
侧导航“+”号图标调小
|
10 years ago |
|
ouyangxuhua
|
b9359b1cee
|
显示url申请
|
10 years ago |
|
huang
|
b6ae14a1ce
|
课程更多字体12
|
10 years ago |
|
huang
|
81b32ea643
|
点击铃铛弹出新tab页
|
10 years ago |
|
huang
|
18bc8215e3
|
路由冲突
|
10 years ago |
|
huang
|
c6357181c4
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
2a31cc91fe
|
Merge branch 'develop' into szzh
Conflicts:
config/routes.rb
|
10 years ago |
|
huang
|
64f972770f
|
添加board和attachment数据迁移
|
10 years ago |
|
huang
|
157502d450
|
精品课程
|
10 years ago |
|
cxt
|
902cfdcbe9
|
课程/项目的创建动态不需要显示更新时间
|
10 years ago |
|
cxt
|
c49a290d56
|
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 |
|
huang
|
5730786c1d
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
10 years ago |
|
ouyangxuhua
|
def640cd31
|
Merge branch 'dev_hjq' into develop
|
10 years ago |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
10 years ago |
|
huang
|
20d550e755
|
提交次数默认值为空的数据处理
|
10 years ago |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
10 years ago |
|
huang
|
733c65d7fd
|
Merge branch 'hjq_new_course' into develop
|
10 years ago |
|
huang
|
9bbb1e0f90
|
修改fork时候项目ID问题
|
10 years ago |
guange
|
c8b52db6f9
|
merge
|
10 years ago |
|
guange
|
c298adda7c
|
子域名路由实现
|
10 years ago |
|
huang
|
f11a458d95
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
831f678390
|
Merge branch 'szzh' into develop
|
10 years ago |
|
ouyangxuhua
|
5097f19ec8
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/layouts/_user_projects.html.erb
app/views/projects/set_public_or_private.js.erb
|
10 years ago |
|
ouyangxuhua
|
1c62edbed4
|
项目设为私有title更新
|
10 years ago |
|
huang
|
71e155d83a
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
4eb113f2c4
|
Merge branch 'develop' into szzh
|
10 years ago |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
10 years ago |
|
cxt
|
894c97304c
|
冲突
|
10 years ago |
|
cxt
|
25cc959576
|
Merge branch 'szzh' into develop
Conflicts:
app/views/layouts/_user_courses.html.erb
app/views/org_subfields/show.html.erb
app/views/organizations/_subfield_list.html.erb
app/views/users/_resource_share_for_orgs.html.erb
|
10 years ago |
|
ouyangxuhua
|
ff9ac244b7
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
3697d74d48
|
子域名路由配置
|
10 years ago |
|
cxt
|
57cfe49602
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
10 years ago |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
276b07df8a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 years ago |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
10 years ago |
