 cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
2016-01-29 15:45:47 +08:00 |
 ouyangxuhua
|
38a87a04ba
|
1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag，增加“双击可编辑”的tips
|
2016-01-27 15:50:31 +08:00 |
|
cxt
|
af7ca36c92
|
学生加入课程或退出课程
|
2016-01-26 15:59:39 +08:00 |
 Tim
|
76063b0911
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_project_info.html.erb
|
2016-01-26 15:08:38 +08:00 |
|
Tim
|
821ade7985
|
作业列表优化，课程加入退出
|
2016-01-26 11:00:24 +08:00 |
 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
|
2016-01-21 16:10:29 +08:00 |
|
cxt
|
65563e6503
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-21 15:24:40 +08:00 |
|
huang
|
c7522067e6
|
修改base界面
|
2016-01-20 18:37:39 +08:00 |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
2016-01-20 17:05:28 +08:00 |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
2016-01-20 16:03:28 +08:00 |
|
ouyangxuhua
|
18e79ba9b3
|
未登陆情况下，可以看到组织文章列表及首页全部内容
|
2016-01-20 09:25:12 +08:00 |
|
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
|
2016-01-18 17:12:56 +08:00 |
|
cxt
|
b4521d3582
|
课程/项目首页的更多默认收起
|
2016-01-18 16:18:40 +08:00 |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
2016-01-18 10:16:29 +08:00 |
|
huang
|
8b815f95bb
|
Merge branch 'develop' into hjq_new_course
|
2016-01-18 08:55:35 +08:00 |
|
huang
|
b2746d0953
|
课程讨论区总数计入回复数
|
2016-01-15 16:30:17 +08:00 |
|
huang
|
c936304314
|
课程默认收起
|
2016-01-15 15:37:17 +08:00 |
|
huang
|
81b32ea643
|
点击铃铛弹出新tab页
|
2016-01-15 12:39:38 +08:00 |
|
huang
|
157502d450
|
精品课程
|
2016-01-15 10:35:56 +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 |
|
cxt
|
894c97304c
|
冲突
|
2016-01-14 18:24:07 +08:00 |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
2016-01-14 17:52:48 +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 |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
2016-01-14 15:02:30 +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 |
|
Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
2016-01-13 18:33:22 +08:00 |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
2016-01-13 16:59:48 +08:00 |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
2016-01-13 16:21:37 +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 |
|
ouyangxuhua
|
48f931deba
|
隐藏组织的课程/项目快捷菜单
|
2016-01-11 17:02:01 +08:00 |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
2016-01-11 16:44:52 +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 |
|
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
|
57af22e3af
|
项目资源库tag增、删、改ajax
|
2016-01-08 16:30:04 +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 |
|
ouyangxuhua
|
539d971901
|
组织页面也增加项目/课程快捷菜单
|
2016-01-07 16:37:41 +08:00 |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
2016-01-07 15:58:22 +08:00 |
|
cxt
|
151c08ac5c
|
复制学期
|
2016-01-07 15:29:25 +08:00 |
|
huang
|
d0a8b4bc18
|
项目资源云搜索
|
2016-01-06 18:07:35 +08:00 |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
2016-01-06 16:22:13 +08:00 |
|
huang
|
81bb35ac49
|
项目资源库 资源列表
|
2016-01-05 10:01:56 +08:00 |