 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 |
|
huang
|
5e5634bee8
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
82cfeaf409
|
Merge branch 'hjq_new_course' into szzh
|
10 years ago |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
10 years ago |
|
cxt
|
7b4b575240
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
eb63ac59f2
|
作品提交不成功
|
10 years ago |
|
huang
|
9841dbeb05
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
huang
|
a3a05b1656
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
fb616eebf9
|
Merge branch 'hjq_new_course' into szzh
|
10 years ago |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
10 years ago |
 Tim
|
13e289dfb5
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
|
10 years ago |
|
Tim
|
aa63221639
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
huang
|
e9b54ad012
|
删除附件的时候减掉得分
|
10 years ago |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
Tim
|
4493261797
|
自动生成文件
|
10 years ago |
|
huang
|
01e8730b25
|
issue回复添加到积分统计
|
10 years ago |
|
huang
|
286418b63c
|
修改课程讨论区500问题
|
10 years ago |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
10 years ago |
|
cxt
|
0ffce929f4
|
项目讨论区的动态点赞
|
10 years ago |
|
huang
|
bcee2924bb
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
6daa04b413
|
登录页面提示修改
|
10 years ago |
|
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
10 years ago |
|
huang
|
e520a3dde2
|
Merge branch 'hjq_new_course' into develop
|
10 years ago |
|
huang
|
f3402e4fa4
|
项目得分新计算
|
10 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
307d382568
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
20a657508d
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/forge_activity.rb
db/schema.rb
|
10 years ago |
