 cxt
|
2b75c1e11a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-07 15:29:38 +08:00 |
|
cxt
|
151c08ac5c
|
复制学期
|
2016-01-07 15:29:25 +08:00 |
 Tim
|
e9d986b311
|
课程关联项目样式调整
|
2016-01-06 11:01:00 +08:00 |
|
cxt
|
cf125159f2
|
关联项目增加提交次数
|
2016-01-06 10:36:53 +08:00 |
 huang
|
7ee4ff69b3
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-05 17:03:10 +08:00 |
|
huang
|
2efcb5b89a
|
课程讨论区添加展开、收缩
|
2016-01-05 16:05:27 +08:00 |
|
Tim
|
06fa32f0e2
|
博客高度控制
|
2016-01-05 15:23:37 +08:00 |
|
cxt
|
c4886306d4
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-05 15:05:51 +08:00 |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
2016-01-05 12:59:59 +08:00 |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
2016-01-05 11:29:30 +08:00 |
 guange
|
d2c7d12cd9
|
merge
|
2016-01-04 15:53:56 +08:00 |
|
guange
|
8ea9430318
|
at链接问题修改
|
2016-01-04 15:51:24 +08:00 |
|
cxt
|
3ddbeae100
|
课程的“更多”模式的文字不用粗体
|
2016-01-04 11:32:48 +08:00 |
|
cxt
|
a4a29b0ee9
|
关联项目的文字样式调整
|
2016-01-04 11:26:42 +08:00 |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
2015-12-31 15:44:57 +08:00 |
|
cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
2015-12-31 15:39:07 +08:00 |
 ouyangxuhua
|
9c34cf6c3a
|
课程/项目帖子页面，齿轮菜单内容居中显示
|
2015-12-31 15:30:36 +08:00 |
|
lizanle
|
ff88d1ed2c
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
Conflicts:
db/schema.rb
|
2015-12-31 11:12:32 +08:00 |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
2015-12-31 11:12:09 +08:00 |
|
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
|
2015-12-31 11:11:38 +08:00 |
|
Tim
|
ecd1cd6041
|
资源库样式调整
|
2015-12-31 11:06:59 +08:00 |
|
ouyangxuhua
|
2271befedd
|
修正组织部分页面的样式
|
2015-12-31 09:50:41 +08:00 |
|
ouyangxuhua
|
82b8cb77fd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 17:28:04 +08:00 |
|
cxt
|
335ea381b4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2015-12-30 16:28:09 +08:00 |
|
cxt
|
76b95fbf93
|
课程和项目的课程简介默认可显示20行
|
2015-12-30 16:27:56 +08:00 |
|
Tim
|
077368f597
|
匿评增加系统评分显示，对应样式调整
|
2015-12-30 16:02:31 +08:00 |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
2015-12-30 15:46:01 +08:00 |
|
huang
|
743950d264
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-29 18:13:15 +08:00 |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
|
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-29 16:33:32 +08:00 |
|
huang
|
d6e765cf4a
|
修正讨论区删除跳转
|
2015-12-29 15:46:20 +08:00 |
|
huang
|
41cd038758
|
讨论区帖子添加锁定
|
2015-12-29 15:05:07 +08:00 |
|
huang
|
c29e6f1b14
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/boards/_project_show.html.erb
app/views/boards/_project_show_detail.html.erb
解决冲突
|
2015-12-29 11:09:16 +08:00 |
|
huang
|
5060ec26bb
|
项目讨论区
|
2015-12-29 11:04:20 +08:00 |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
2015-12-29 10:15:53 +08:00 |
|
ouyangxuhua
|
5334a3d40f
|
链接样式还原
|
2015-12-28 17:14:15 +08:00 |
|
ouyangxuhua
|
33ea55ecca
|
项目/课程帖子发送弹窗样式修改
|
2015-12-28 17:03:13 +08:00 |
|
lizanle
|
e35d2daa0a
|
课程资源库
|
2015-12-28 16:19:30 +08:00 |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
2015-12-28 15:32:03 +08:00 |
|
lizanle
|
3b08adfc68
|
课程资源页面修改。
|
2015-12-27 23:24:21 +08:00 |
|
cxt
|
37aee434e2
|
缺陷动态的回复图片超出边框
|
2015-12-25 19:43:49 +08:00 |
|
cxt
|
f63f38fb82
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 17:07:34 +08:00 |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
2015-12-25 17:07:27 +08:00 |
|
huang
|
533be61cf7
|
添加底部样式
|
2015-12-25 16:13:17 +08:00 |
|
huang
|
e5b4b9915d
|
添加footer图片
|
2015-12-25 16:06:24 +08:00 |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:59:33 +08:00 |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:48:41 +08:00 |
|
Tim
|
1a24505eac
|
footer新增图片，样式修改
|
2015-12-25 15:27:45 +08:00 |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
2015-12-25 14:56:08 +08:00 |
|
huang
|
a92d33300b
|
里程碑 添加 “已解决”，区分已解决和已关闭
|
2015-12-24 17:18:52 +08:00 |