 ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
9 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
9 years ago |
|
ouyangxuhua
|
18e79ba9b3
|
未登陆情况下，可以看到组织文章列表及首页全部内容
|
9 years ago |
|
ouyangxuhua
|
e70e1beb5d
|
Merge branch 'szzh' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
7acfc22ee1
|
未登陆情况下，访问组织栏目增加margin-top:10px,已使样式正常
|
9 years ago |
 cxt
|
6e56a0706a
|
动态描述中的单词折行
|
9 years ago |
|
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下，也能下载组织下的文件
|
9 years ago |
|
ouyangxuhua
|
5e102d24dd
|
解决个人博客报500的问题
|
9 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
9 years ago |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
9 years ago |
 huang
|
b2746d0953
|
课程讨论区总数计入回复数
|
9 years ago |
|
huang
|
f52e74da61
|
修改issues总数读取方式
|
9 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
|
9 years ago |
|
huang
|
86516df88a
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
huang
|
c936304314
|
课程默认收起
|
9 years ago |
|
ouyangxuhua
|
b9359b1cee
|
显示url申请
|
9 years ago |
|
huang
|
b6ae14a1ce
|
课程更多字体12
|
9 years ago |
|
huang
|
81b32ea643
|
点击铃铛弹出新tab页
|
9 years ago |
|
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
9 years ago |
|
ouyangxuhua
|
def640cd31
|
Merge branch 'dev_hjq' into develop
|
9 years ago |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
9 years ago |
|
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
9 years ago |
|
huang
|
9bbb1e0f90
|
修改fork时候项目ID问题
|
9 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
|
9 years ago |
|
ouyangxuhua
|
1c62edbed4
|
项目设为私有title更新
|
9 years ago |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
9 years ago |
|
cxt
|
894c97304c
|
冲突
|
9 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
|
9 years ago |
|
cxt
|
57cfe49602
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
9 years ago |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
276b07df8a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
9 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
处理冲突
|
9 years ago |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
9 years ago |
|
cxt
|
7b4b575240
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
eb63ac59f2
|
作品提交不成功
|
9 years ago |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
9 years ago |
|
huang
|
e9b54ad012
|
删除附件的时候减掉得分
|
9 years ago |
 Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
01e8730b25
|
issue回复添加到积分统计
|
9 years ago |
|
huang
|
286418b63c
|
修改课程讨论区500问题
|
9 years ago |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
9 years ago |
|
cxt
|
0ffce929f4
|
项目讨论区的动态点赞
|
9 years ago |
|
huang
|
6daa04b413
|
登录页面提示修改
|
9 years ago |
|
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
9 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
9 years ago |
|
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
9 years ago |
