 huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
 cxt
|
a96d8ce5a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
e09f795171
|
附件的显示
|
10 years ago |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
10 years ago |
|
huang
|
448a412abf
|
issue详情页面在 user动态、project动态中修改
|
10 years ago |
 ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
10 years ago |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
10 years ago |
|
cxt
|
247924af26
|
动态内容显示不全
|
10 years ago |
|
cxt
|
f15847371c
|
附件显示过长
|
10 years ago |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
10 years ago |
|
huang
|
01016c67a9
|
issue属性局部刷新
|
10 years ago |
 Tim
|
c7edf0d73b
|
弹框样式修改
|
10 years ago |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
10 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
10 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 years ago |
|
huang
|
18c3c23d2c
|
课程推荐
|
10 years ago |
|
cxt
|
b64fc1771d
|
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 |
|
Tim
|
cd3a1e59dd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
04fded784e
|
单词折行样式
|
10 years ago |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
10 years ago |
|
cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
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 |
|
huang
|
8b815f95bb
|
Merge branch 'develop' into hjq_new_course
|
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
|
c936304314
|
课程默认收起
|
10 years ago |
|
Tim
|
50849baade
|
侧导航“+”号图标调小
|
10 years ago |
|
huang
|
157502d450
|
精品课程
|
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
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
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 |
|
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
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
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 |
|
Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
10 years ago |
|
Tim
|
f0347c9166
|
精品课程图标
|
10 years ago |
guange
|
d935532f8d
|
课程讨论区at功能
|
10 years ago |
|
Tim
|
88895ff262
|
英文文本强制折行修复
|
10 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
处理冲突
|
10 years ago |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
10 years ago |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
10 years ago |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |
|
cxt
|
e5f8c4c4a8
|
测试结果的对齐显示
|
10 years ago |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
10 years ago |
|
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
10 years ago |
|
ouyangxuhua
|
09c7728201
|
样式更新
|
10 years ago |
|
guange
|
d4d1fe65b3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
e96496ddcd
|
avatar.js和attachments.js冲突,导致头像不能上传
|
10 years ago |
|
huang
|
5d68d185d5
|
资源样式冲突
|
10 years ago |
|
cxt
|
a206a1d7f1
|
样式
|
10 years ago |
|
ouyangxuhua
|
0ac99571de
|
样式调整
|
10 years ago |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
0ab500986a
|
发送搜索功能
|
10 years ago |
|
ouyangxuhua
|
d574521b48
|
样式更新
|
10 years ago |
|
huang
|
dc90976497
|
项目资源库添加 “发送”功能
|
10 years ago |
|
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页
|
10 years ago |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
10 years ago |
|
cxt
|
c5a10c504e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
10 years ago |
|
Tim
|
125479f671
|
课程复制样式调整
|
10 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
10 years ago |
|
cxt
|
2b75c1e11a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
151c08ac5c
|
复制学期
|
10 years ago |
|
huang
|
972f2bfea8
|
完成项目资源库tag云的查询统计
|
10 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
|
10 years ago |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
10 years ago |
|
huang
|
9464495c19
|
资源搜索
资源公开私有ajax
|
10 years ago |
|
Tim
|
e9d986b311
|
课程关联项目样式调整
|
10 years ago |
|
cxt
|
cf125159f2
|
关联项目增加提交次数
|
10 years ago |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 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
|
10 years ago |
|
huang
|
2efcb5b89a
|
课程讨论区添加展开、收缩
|
10 years ago |
|
Tim
|
06fa32f0e2
|
博客高度控制
|
10 years ago |
|
cxt
|
c4886306d4
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
10 years ago |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
10 years ago |
|
huang
|
680e861620
|
项目资源搜索功能
|
10 years ago |
|
guange
|
d2c7d12cd9
|
merge
|
10 years ago |
|
guange
|
8ea9430318
|
at链接问题修改
|
10 years ago |
|
cxt
|
3ddbeae100
|
课程的“更多”模式的文字不用粗体
|
10 years ago |
|
cxt
|
a4a29b0ee9
|
关联项目的文字样式调整
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
9c34cf6c3a
|
课程/项目帖子页面，齿轮菜单内容居中显示
|
10 years ago |
|
lizanle
|
ff88d1ed2c
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
10 years ago |
|
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
Tim
|
ecd1cd6041
|
资源库样式调整
|
10 years ago |
|
ouyangxuhua
|
2271befedd
|
修正组织部分页面的样式
|
10 years ago |
|
ouyangxuhua
|
82b8cb77fd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
335ea381b4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
