 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
处理冲突
|
2016-01-13 16:28:00 +08:00 |
|
huang
|
8f989a962d
|
修改项目总分统计
|
2016-01-13 16:22:25 +08:00 |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
2016-01-13 16:15:46 +08:00 |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
2016-01-13 15:29:29 +08:00 |
|
huang
|
165d5f50c8
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/files_controller.rb
db/schema.rb
处理冲突
|
2016-01-13 13:01:26 +08:00 |
|
huang
|
64088f5a21
|
项目数据存入数据库（统计数据直接从数据库获取）
|
2016-01-13 10:08:48 +08:00 |
 cxt
|
96a28fe5b5
|
博客动态添加更新时间
|
2016-01-12 16:13:49 +08:00 |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
2016-01-12 15:53:15 +08:00 |
|
huang
|
f3b732460c
|
添加项目统计字段
|
2016-01-11 14:57:52 +08:00 |
|
huang
|
525d1544c2
|
代码样式
|
2016-01-11 10:43:48 +08:00 |
|
cxt
|
a3a16b5591
|
问题跟踪、作业列表页面“展开更多”改为“点击展开更多”
|
2016-01-11 10:21:42 +08:00 |
|
huang
|
28c3dca099
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 22:30:48 +08:00 |
|
cxt
|
bb0a03b309
|
若无任何个人留言，或者当前用户无权限看到任何个人留言，不要显示白框
|
2016-01-08 22:02:35 +08:00 |
|
huang
|
8c10ce6fee
|
修改组织500问题
|
2016-01-08 21:47:42 +08:00 |
|
cxt
|
eab8cc7231
|
复制学期的默认图片
|
2016-01-08 21:22:36 +08:00 |
|
huang
|
f9bc1efd7c
|
issue编辑的时候ajax刷新附件
|
2016-01-08 21:18:08 +08:00 |
|
huang
|
3df542ff6a
|
Merge branch 'szzh' into develop
|
2016-01-08 20:46:06 +08:00 |
|
cxt
|
cc135503c2
|
Merge branch 'cxt_course' into szzh
|
2016-01-08 20:36:08 +08:00 |
|
cxt
|
1264d5f6ca
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 20:35:19 +08:00 |
|
cxt
|
9368e3875c
|
去掉关联项目的提交次数
|
2016-01-08 20:35:05 +08:00 |
|
cxt
|
75e2eecc37
|
课程配置中点击开课学期或结束学期弹框中，“复制学期”入口要开通
|
2016-01-08 20:23:27 +08:00 |
|
huang
|
64889fd14a
|
项目资源提供新分页
|
2016-01-08 20:10:43 +08:00 |
 ouyangxuhua
|
5d819625c0
|
快捷菜单上传文件使用最新的上传方式
|
2016-01-08 20:09:57 +08:00 |
|
ouyangxuhua
|
0ac99571de
|
样式调整
|
2016-01-08 19:50:17 +08:00 |
|
cxt
|
ef441d3bca
|
关联项目样式修改
|
2016-01-08 19:43:37 +08:00 |
|
ouyangxuhua
|
3a62db6475
|
Merge branch 'dev_hjq' into szzh
|
2016-01-08 19:34:36 +08:00 |
|
ouyangxuhua
|
ceeec3af12
|
修改一些bug
|
2016-01-08 19:33:58 +08:00 |
|
cxt
|
5dbad5a672
|
已关联项目的样式修改
|
2016-01-08 19:04:22 +08:00 |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
|
huang
|
762ebb150b
|
解决课程资源重复分页问题
|
2016-01-08 18:09:11 +08:00 |
|
huang
|
0ab500986a
|
发送搜索功能
|
2016-01-08 18:03:59 +08:00 |
|
cxt
|
f1e9718f56
|
隐藏复制学期的上传图片按钮
|
2016-01-08 18:03:17 +08:00 |
|
ouyangxuhua
|
d574521b48
|
样式更新
|
2016-01-08 18:03:12 +08:00 |
|
ouyangxuhua
|
09b8373e12
|
组织配置https改成http
|
2016-01-08 17:13:34 +08:00 |
|
ouyangxuhua
|
7f465d1766
|
修改bug
|
2016-01-08 17:12:19 +08:00 |
|
huang
|
dc90976497
|
项目资源库添加 “发送”功能
|
2016-01-08 17:09:32 +08:00 |
|
huang
|
57af22e3af
|
项目资源库tag增、删、改ajax
|
2016-01-08 16:30:04 +08:00 |
|
ouyangxuhua
|
b2bad60b38
|
1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页
|
2016-01-08 16:16:57 +08:00 |
|
cxt
|
a0afe6ccbf
|
动态显示附件并统一附件样式
|
2016-01-08 16:05:36 +08:00 |
|
ouyangxuhua
|
c500fc13db
|
解决组织动态中，第二页重复显示第一页动态的问题
|
2016-01-08 15:21:24 +08:00 |
|
cxt
|
c5a10c504e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-08 14:53:20 +08:00 |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
2016-01-08 14:53:12 +08:00 |
|
huang
|
6a9ebb572b
|
资源库添加上传按钮
|
2016-01-08 14:51:47 +08:00 |
|
huang
|
6a9dc43d03
|
版权修改、issue编辑
|
2016-01-08 14:42:28 +08:00 |
|
ouyangxuhua
|
5eceb3d841
|
解决一些bug; 增加已设为首页标签
|
2016-01-08 14:42:21 +08:00 |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
2016-01-08 14:12:55 +08:00 |
|
huang
|
dd4d687559
|
修改项目资源附件统计功能
|
2016-01-08 11:11:11 +08:00 |
 Tim
|
125479f671
|
课程复制样式调整
|
2016-01-08 10:49:02 +08:00 |
|
ouyangxuhua
|
9e286ef8a5
|
对于当前用户，鼠标经过该用户头像显示详细信息时，有编辑资料按钮
|
2016-01-08 10:11:47 +08:00 |