 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
|
11 years ago |
 ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
11 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
处理冲突
|
11 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
|
11 years ago |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
11 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
11 years ago |
|
ouyangxuhua
|
307d382568
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
11 years ago |
|
Tim
|
f0347c9166
|
精品课程图标
|
11 years ago |
guange
|
d935532f8d
|
课程讨论区at功能
|
11 years ago |
|
Tim
|
88895ff262
|
英文文本强制折行修复
|
11 years ago |
|
huang
|
4b26e77478
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/models/issue.rb
app/models/message.rb
app/models/news.rb
处理冲突
|
11 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
11 years ago |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
11 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
11 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
11 years ago |
|
cxt
|
e5f8c4c4a8
|
测试结果的对齐显示
|
11 years ago |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
11 years ago |
|
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
11 years ago |
|
ouyangxuhua
|
09c7728201
|
样式更新
|
11 years ago |
|
guange
|
d4d1fe65b3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
11 years ago |
|
guange
|
e96496ddcd
|
avatar.js和attachments.js冲突,导致头像不能上传
|
11 years ago |
|
huang
|
5d68d185d5
|
资源样式冲突
|
11 years ago |
|
cxt
|
a206a1d7f1
|
样式
|
11 years ago |
|
ouyangxuhua
|
0ac99571de
|
样式调整
|
11 years ago |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
11 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
11 years ago |
|
huang
|
0ab500986a
|
发送搜索功能
|
11 years ago |
|
ouyangxuhua
|
d574521b48
|
样式更新
|
11 years ago |
|
huang
|
dc90976497
|
项目资源库添加 “发送”功能
|
11 years ago |
|
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页
|
11 years ago |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
11 years ago |
|
cxt
|
c5a10c504e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
11 years ago |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
11 years ago |
|
Tim
|
125479f671
|
课程复制样式调整
|
11 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
11 years ago |
|
cxt
|
2b75c1e11a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
11 years ago |
|
cxt
|
151c08ac5c
|
复制学期
|
11 years ago |
|
huang
|
972f2bfea8
|
完成项目资源库tag云的查询统计
|
11 years ago |
|
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
11 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
11 years ago |
|
huang
|
9464495c19
|
资源搜索
资源公开私有ajax
|
11 years ago |
|
Tim
|
e9d986b311
|
课程关联项目样式调整
|
11 years ago |
|
cxt
|
cf125159f2
|
关联项目增加提交次数
|
11 years ago |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
11 years ago |
|
huang
|
7ee4ff69b3
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
11 years ago |
|
huang
|
2efcb5b89a
|
课程讨论区添加展开、收缩
|
11 years ago |
|
Tim
|
06fa32f0e2
|
博客高度控制
|
11 years ago |
