 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
|
2016-01-15 15:42:36 +08:00 |
|
huang
|
c936304314
|
课程默认收起
|
2016-01-15 15:37:17 +08:00 |
 ouyangxuhua
|
b9359b1cee
|
显示url申请
|
2016-01-15 13:15:17 +08:00 |
|
huang
|
b6ae14a1ce
|
课程更多字体12
|
2016-01-15 12:51:50 +08:00 |
|
huang
|
81b32ea643
|
点击铃铛弹出新tab页
|
2016-01-15 12:39:38 +08:00 |
|
ouyangxuhua
|
16a3a7d06d
|
隐藏url定制
|
2016-01-14 21:42:28 +08:00 |
|
ouyangxuhua
|
7ad377f458
|
修改一些bug
|
2016-01-14 21:29:43 +08:00 |
 cxt
|
0be6e36020
|
缺陷、通知、个人留言动态的点赞
|
2016-01-14 21:07:05 +08:00 |
|
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
|
2016-01-14 18:30:05 +08:00 |
|
ouyangxuhua
|
1c62edbed4
|
项目设为私有title更新
|
2016-01-14 18:26:36 +08:00 |
|
huang
|
a114b7525d
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-14 18:25:56 +08:00 |
|
huang
|
b3e6f6acd5
|
项目删除附件问题
项目得分添加讨论回复计算
|
2016-01-14 18:25:42 +08:00 |
|
cxt
|
894c97304c
|
冲突
|
2016-01-14 18:24:07 +08:00 |
|
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
|
2016-01-14 18:22:57 +08:00 |
|
cxt
|
cef9fd96cd
|
组织帖子的动态点赞
|
2016-01-14 18:05:58 +08:00 |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
2016-01-14 17:54:16 +08:00 |
|
ouyangxuhua
|
276b07df8a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 17:53:22 +08:00 |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
2016-01-14 17:52:48 +08:00 |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
2016-01-14 17:35:25 +08:00 |
|
huang
|
a105ed6e00
|
项目得分弹出分类显示
|
2016-01-14 17:29:55 +08:00 |
|
cxt
|
58c96a0df0
|
作业动态的点赞
|
2016-01-14 16:15:40 +08:00 |
 Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-01-14 15:59:50 +08:00 |
|
cxt
|
26631e2199
|
关联项目的提交次数
|
2016-01-14 15:39:40 +08:00 |
|
cxt
|
0ffce929f4
|
项目讨论区的动态点赞
|
2016-01-14 15:22:37 +08:00 |
|
huang
|
6daa04b413
|
登录页面提示修改
|
2016-01-14 15:10:06 +08:00 |
|
ouyangxuhua
|
93570249c0
|
Merge branch 'dev_hjq' into szzh
|
2016-01-14 15:02:45 +08:00 |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
2016-01-14 15:02:30 +08:00 |
|
ouyangxuhua
|
a21465343c
|
组织栏目编辑状态样式更新
|
2016-01-14 15:01:51 +08:00 |
|
huang
|
f3402e4fa4
|
项目得分新计算
|
2016-01-14 15:00:21 +08:00 |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-14 14:40:13 +08:00 |
|
huang
|
49d456bf21
|
修改数据统计信息
|
2016-01-14 14:32:19 +08:00 |
|
ouyangxuhua
|
d6e7a2ade5
|
解决一些bug
|
2016-01-14 12:51:01 +08:00 |
|
ouyangxuhua
|
324513fc94
|
组织栏目子目录功能实现
|
2016-01-14 10:33:15 +08:00 |
|
cxt
|
bf6f46174e
|
课程讨论区回复的点赞
|
2016-01-14 10:07:46 +08:00 |
|
cxt
|
093574ebef
|
首页课程讨论区动态的点赞
|
2016-01-13 19:16:51 +08:00 |
|
Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
2016-01-13 18:33:22 +08:00 |
 guange
|
d935532f8d
|
课程讨论区at功能
|
2016-01-13 17:50:08 +08:00 |
|
cxt
|
e889f798d7
|
项目创建动态报500
|
2016-01-13 17:26:36 +08:00 |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
2016-01-13 16:59:48 +08:00 |
|
cxt
|
53a45908e9
|
关联项目的提交次数
|
2016-01-13 16:54:41 +08:00 |
|
cxt
|
efb5d05551
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-13 16:32:33 +08:00 |
|
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
2016-01-13 16:32:05 +08:00 |
|
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 |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
2016-01-13 16:21:37 +08:00 |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
2016-01-13 16:15:46 +08:00 |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
2016-01-13 15:29:29 +08:00 |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
2016-01-13 15:17:13 +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 |