huang
|
2b21213b7f
|
公共资源库,排序
|
2016-03-15 09:26:26 +08:00 |
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
2016-03-14 17:31:53 +08:00 |
cxt
|
c770fd157c
|
题库:题目描述变窄,缺省文字:【尹刚提供】
|
2016-03-14 16:33:16 +08:00 |
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
2016-03-11 16:25:05 +08:00 |
Tim
|
de3a4718ab
|
个人,课程,项目,组织访问量添加
|
2016-03-11 15:49:24 +08:00 |
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
luoquan
|
1e256add7f
|
媒体播放默认样式
|
2016-03-11 13:17:15 +08:00 |
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
2016-03-10 10:02:24 +08:00 |
cxt
|
1cccf79bd8
|
课程资源库菜单中的删除资源无法点击
|
2016-03-09 09:20:53 +08:00 |
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
2016-03-04 11:11:25 +08:00 |
cxt
|
e2ff348075
|
题库的作业过滤
|
2016-03-04 11:07:53 +08:00 |
huang
|
596d4e17e9
|
解决样式冲突
|
2016-03-04 09:57:54 +08:00 |
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-03-04 09:33:38 +08:00 |
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
2016-03-04 09:32:49 +08:00 |
cxt
|
9b573248d8
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_show_user_homework_form.html.erb
app/views/users/_show_user_homeworks.html.erb
|
2016-03-03 17:07:35 +08:00 |
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
2016-03-03 17:04:38 +08:00 |
Tim
|
f51d16c538
|
资源库样式调整
|
2016-03-02 18:20:36 +08:00 |
huang
|
21244a5657
|
资源库导入功能
|
2016-03-02 17:46:10 +08:00 |
huang
|
8edaa9d2bd
|
资源库
|
2016-03-01 17:33:44 +08:00 |
Tim
|
11592bdbcc
|
导入题库题目弹框样式更改
|
2016-03-01 17:28:49 +08:00 |
Tim
|
e8234092ec
|
复制学期弹框调整
|
2016-02-26 11:16:12 +08:00 |
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮,页面的layout改成课程相关
|
2016-02-25 10:23:38 +08:00 |
Tim
|
228857f20c
|
资源历史版本样式
|
2016-02-20 17:23:24 +08:00 |
Tim
|
d092891b2a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-01 10:41:30 +08:00 |
Tim
|
83a3c879d4
|
私信配置按钮显示
|
2016-02-01 10:40:42 +08:00 |
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
2016-01-29 18:17:27 +08:00 |
cxt
|
c942c843b9
|
导入作业增加引用次数
|
2016-01-28 16:27:46 +08:00 |
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
2016-01-28 09:51:05 +08:00 |
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
2016-01-27 17:26:57 +08:00 |
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-22 17:29:33 +08:00 |
cxt
|
e09f795171
|
附件的显示
|
2016-01-22 17:05:58 +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
|
f15847371c
|
附件显示过长
|
2016-01-21 10:36:30 +08:00 |
huang
|
01016c67a9
|
issue属性局部刷新
|
2016-01-20 18:28:27 +08:00 |
Tim
|
c7edf0d73b
|
弹框样式修改
|
2016-01-20 17:55:20 +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 |
huang
|
18c3c23d2c
|
课程推荐
|
2016-01-20 15:43:33 +08:00 |
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
2016-01-18 10:13:31 +08:00 |
huang
|
157502d450
|
精品课程
|
2016-01-15 10:35:56 +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 |
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-14 14:40:13 +08:00 |
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-13 09:58:14 +08:00 |
cxt
|
e5f8c4c4a8
|
测试结果的对齐显示
|
2016-01-11 17:00:29 +08:00 |
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
2016-01-11 16:44:52 +08:00 |
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
2016-01-11 11:07:03 +08:00 |
huang
|
5d68d185d5
|
资源样式冲突
|
2016-01-08 21:24:25 +08:00 |
cxt
|
a206a1d7f1
|
样式
|
2016-01-08 20:43:33 +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 |
huang
|
0ab500986a
|
发送搜索功能
|
2016-01-08 18:03:59 +08:00 |
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态,鼠标经过显示详细信息,并且可以留言、私信等
|
2016-01-07 15:58:22 +08:00 |
ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-06 16:27:42 +08:00 |
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能;
2.增加私信功能
|
2016-01-06 16:22:13 +08:00 |
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-06 09:27:00 +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 |
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
2016-01-05 12:59:59 +08:00 |
huang
|
680e861620
|
项目资源搜索功能
|
2016-01-05 11:00:26 +08:00 |
guange
|
d2c7d12cd9
|
merge
|
2016-01-04 15:53:56 +08:00 |
guange
|
8ea9430318
|
at链接问题修改
|
2016-01-04 15:51:24 +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
|
077368f597
|
匿评增加系统评分显示,对应样式调整
|
2015-12-30 16:02:31 +08:00 |
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
ouyangxuhua
|
5334a3d40f
|
链接样式还原
|
2015-12-28 17:14:15 +08:00 |
ouyangxuhua
|
33ea55ecca
|
项目/课程帖子发送弹窗样式修改
|
2015-12-28 17:03:13 +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 |
huang
|
533be61cf7
|
添加底部样式
|
2015-12-25 16:13:17 +08:00 |
Tim
|
1a24505eac
|
footer新增图片,样式修改
|
2015-12-25 15:27:45 +08:00 |
huang
|
a92d33300b
|
里程碑 添加 “已解决”,区分已解决和已关闭
|
2015-12-24 17:18:52 +08:00 |
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
2015-12-24 10:40:00 +08:00 |
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
lizanle
|
2aa241bffa
|
issue
|
2015-12-16 11:50:30 +08:00 |
lizanle
|
02a9f08fe6
|
表单长度对齐
|
2015-12-16 10:19:48 +08:00 |
lizanle
|
68aceaa7df
|
issue下载
|
2015-12-15 18:43:58 +08:00 |
guange
|
4ce9eb428e
|
at样式问题
|
2015-12-15 16:28:11 +08:00 |
Tim
|
75d79c6c47
|
问题跟踪样式调整
|
2015-12-07 10:14:39 +08:00 |
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
Tim
|
e3d78bf4f0
|
组织样式更改
|
2015-11-20 14:30:54 +08:00 |
huang
|
edf9b4a6b5
|
修改样式
|
2015-11-02 20:01:19 +08:00 |
huang
|
4d5d012ecf
|
版本库相关界面调整
|
2015-11-02 16:41:15 +08:00 |
huang
|
8ec2dc3196
|
多版本库情况:
1、没有新增项目提供接口
2、新建页面历史版本库列表
|
2015-11-02 13:53:35 +08:00 |
cxt
|
958d781997
|
作品列表的样式修改
|
2015-10-29 10:43:01 +08:00 |
Tim
|
1a2edd9103
|
课程大纲图标等修改
|
2015-10-28 17:34:41 +08:00 |
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |
cxt
|
25d6ed520e
|
首页的问题动态增加附件上传时间
|
2015-10-27 09:45:22 +08:00 |
cxt
|
2f4b29085c
|
首页动态中的表格超出边框
|
2015-10-26 15:26:05 +08:00 |
huang
|
2221fb4d7a
|
committers跳转问题
按钮样式
|
2015-10-23 16:28:17 +08:00 |
Tim
|
4bedc81524
|
作品列表提交按钮位置调整
|
2015-10-23 16:26:58 +08:00 |
cxt
|
e2990fb55c
|
控制动态描述的高度为20行,可展开和收起。
|
2015-10-22 17:42:02 +08:00 |
huang
|
4c5843a169
|
1、title数据更新
2、summary调整
3、本版库显示,变更页面
4、相关CSS
|
2015-10-22 16:03:22 +08:00 |
Tim
|
4dddbe9dc7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_journalsformessage.html.erb
|
2015-10-16 10:58:28 +08:00 |
Tim
|
49b994b3fe
|
个人动态、系统消息动态、课程动态格式调整
|
2015-10-16 10:54:22 +08:00 |
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 17:20:11 +08:00 |
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
2015-10-12 17:19:55 +08:00 |
Tim
|
d33a6b763d
|
引用资源库弹窗外观调整
|
2015-10-12 16:08:33 +08:00 |
Tim
|
9e91429b1e
|
鼠标在侧导航左侧文字颜色不变修复
|
2015-10-10 10:32:08 +08:00 |
huang
|
ddac70c9b8
|
项目成员角色Gitlab一致,单选
添加成员按钮样式调整
|
2015-10-10 10:00:11 +08:00 |
Tim
|
0ff58b7631
|
修复了贴吧图片漂移的问题
|
2015-10-09 09:41:36 +08:00 |