huang
|
edd198e91f
|
issue刷新
|
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
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
10 years ago |
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一,分享文件、通知等均可复用
|
10 years ago |
huang
|
7de48f143e
|
issue状态修改
|
10 years ago |
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
10 years ago |
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
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 |
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
10 years ago |
cxt
|
fe0414c83f
|
组织文章和博客的点赞
|
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 |
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下,也能下载组织下的文件
|
10 years ago |
cxt
|
e293805488
|
点击在线问卷时若未登录则直接跳到登录页面
|
10 years ago |
huang
|
b93b86b9a0
|
创建课程发送board
|
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
|
c5935a6a46
|
博客动态添加点赞
|
10 years ago |
cxt
|
9cabb0248a
|
已点过赞的动态显示”已赞“
|
10 years ago |
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
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 |
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 |
cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
10 years ago |
huang
|
9bbb1e0f90
|
修改fork时候项目ID问题
|
10 years ago |
cxt
|
57cfe49602
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 years ago |
cxt
|
eb63ac59f2
|
作品提交不成功
|
10 years ago |
cxt
|
58c96a0df0
|
作业动态的点赞
|
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 |
huang
|
49d456bf21
|
修改数据统计信息
|
10 years ago |
huang
|
5fe4e9e813
|
创建项目的时候创建项目得分记录
|
10 years ago |
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
10 years ago |
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
10 years ago |
cxt
|
bf6f46174e
|
课程讨论区回复的点赞
|
10 years ago |
cxt
|
093574ebef
|
首页课程讨论区动态的点赞
|
10 years ago |
cxt
|
5c1ff1f6f7
|
关联项目时不显示已删除的项目
|
10 years ago |
guange
|
d935532f8d
|
课程讨论区at功能
|
10 years ago |
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
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
|
7697dadbea
|
版本库统计次数刷新版本库的时候自动更新
|
10 years ago |
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
10 years ago |
huang
|
165d5f50c8
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/files_controller.rb
db/schema.rb
处理冲突
|
10 years ago |
huang
|
64088f5a21
|
项目数据存入数据库(统计数据直接从数据库获取)
|
10 years ago |
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
ouyangxuhua
|
8ead573872
|
组织设置url
|
10 years ago |
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
10 years ago |
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
10 years ago |