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 |
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 |
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 |
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 |
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 |
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:59:33 +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 |
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 |
Tim
|
eb7d0761cb
|
组织菜单栏修改成和个人首页相同
|
2015-12-24 10:37:13 +08:00 |
Tim
|
c405950469
|
课程关联项目列表显示调整
|
2015-12-23 17:26:13 +08:00 |
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
huang
|
0e68266f49
|
版本库显示调整
|
2015-12-22 10:59:09 +08:00 |
lizanle
|
70f93741d6
|
issue图标问题
|
2015-12-18 14:38:04 +08:00 |
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
lizanle
|
8ce2dbc4b8
|
issue回复
|
2015-12-17 18:12:38 +08:00 |
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
2015-12-17 17:42:48 +08:00 |
guange
|
ed649e0724
|
@颜色修改
|
2015-12-17 15:54:29 +08:00 |
lizanle
|
1809a93770
|
editor修改
|
2015-12-17 15:41:36 +08:00 |
lizanle
|
66f88cdf5a
|
issue 文件
|
2015-12-16 16:55:07 +08:00 |
cxt
|
dc0f004021
|
关联项目的提示信息
|
2015-12-16 15:47:30 +08:00 |
lizanle
|
2aa241bffa
|
issue
|
2015-12-16 11:50:30 +08:00 |
cxt
|
bfde278340
|
学生作品列表的样式调整
|
2015-12-16 11:02:52 +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 |
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-15 16:03:26 +08:00 |
cxt
|
0deffdba33
|
在线测验学生答题时可点击保存也可点击提交
|
2015-12-15 15:21:52 +08:00 |
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
2015-12-14 16:41:18 +08:00 |
huang
|
a791c39b4b
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:12:25 +08:00 |
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-11 16:58:19 +08:00 |
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型,可以添加文件、删除文件、显示文件等
|
2015-12-11 16:30:50 +08:00 |
cxt
|
d4bde8e73c
|
调整学生作品列表的样式
|
2015-12-11 16:05:18 +08:00 |
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
2015-12-11 14:59:52 +08:00 |
ouyangxuhua
|
48e7aa78d1
|
项目加载更多样式问题
|
2015-12-10 17:00:24 +08:00 |
ouyangxuhua
|
0a85fbf613
|
1.配置栏目列表,增加类型一列;
2.暂时隐藏类型为“资源”的栏目的链接
|
2015-12-10 15:53:05 +08:00 |
cxt
|
53f9141cf1
|
分组作业动态
|
2015-12-09 10:29:54 +08:00 |
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
huang
|
3459164e64
|
过滤条件样式
|
2015-12-07 17:25:32 +08:00 |
huang
|
5f6d9f2425
|
项目动态新样式
|
2015-12-07 17:14:13 +08:00 |
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
2015-12-07 14:31:08 +08:00 |
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
2015-12-07 12:53:51 +08:00 |
Tim
|
75d79c6c47
|
问题跟踪样式调整
|
2015-12-07 10:14:39 +08:00 |
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
2015-12-05 11:39:40 +08:00 |
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
2015-12-04 17:34:48 +08:00 |
Tim
|
d115a97f78
|
追加附件效果调整
|
2015-12-04 16:49:14 +08:00 |
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
cxt
|
fd51b02e16
|
添加修订附件
|
2015-12-03 18:33:08 +08:00 |
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
2015-11-30 11:07:53 +08:00 |
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
2015-11-27 17:17:21 +08:00 |
Tim
|
06ca4c8f4b
|
作品列表样式调整
|
2015-11-27 16:52:28 +08:00 |
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
2015-11-27 15:21:32 +08:00 |
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
2015-11-27 15:19:13 +08:00 |
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
2015-11-27 14:56:30 +08:00 |
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
2015-11-27 14:47:16 +08:00 |
huang
|
1cc6e305ed
|
完成新功能模块开发:
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
2015-11-27 13:52:40 +08:00 |
Gan Yi.ang
|
ee85cc35ed
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 11:27:03 +08:00 |
Gan Yi.ang
|
1115d54d9a
|
非trustie用户changesets_latest_coimmit
|
2015-11-27 11:25:16 +08:00 |
Tim
|
2d14b66336
|
作品列表样式调整
|
2015-11-27 10:56:46 +08:00 |
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
2015-11-27 10:49:41 +08:00 |
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
2015-11-27 09:50:17 +08:00 |
cxt
|
f8621cac76
|
未设置考试时长时,只要还未到截止时间就可以一直提交试卷。
|
2015-11-26 16:57:51 +08:00 |
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
2015-11-26 16:29:50 +08:00 |
Tim
|
a0c73a5a54
|
单选题样式调整
|
2015-11-26 10:27:32 +08:00 |
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序(英雄榜)
部分页面(未完成)
|
2015-11-25 15:16:33 +08:00 |
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
2015-11-25 09:38:13 +08:00 |
huang
|
85515befc4
|
实现工具栏数字大于0显示,小于0隐藏
|
2015-11-24 17:29:57 +08:00 |
Tim
|
269d2f992e
|
组织列表搜索框调整后注释
|
2015-11-24 15:02:25 +08:00 |
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-20 20:25:17 +08:00 |
Tim
|
e3d78bf4f0
|
组织样式更改
|
2015-11-20 14:30:54 +08:00 |
cxt
|
acaac93da1
|
tijiao
|
2015-11-20 11:08:50 +08:00 |
cxt
|
265fe08b2c
|
在线测验
|
2015-11-18 10:49:57 +08:00 |
cxt
|
cc08e5e32e
|
保存测验信息
|
2015-11-17 18:22:31 +08:00 |
cxt
|
034a92bb7b
|
新建测验页面
|
2015-11-17 15:18:07 +08:00 |
cxt
|
c50bcf9331
|
对于提交已截止的作业,作业状态由“作品提交中”改为“作品补交中”
|
2015-11-16 10:56:00 +08:00 |
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-11-13 17:27:33 +08:00 |
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-13 17:21:44 +08:00 |
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
2015-11-13 16:34:00 +08:00 |
lizanle
|
c2e783d78b
|
设置 删除 编辑按钮做成项目一样的
|
2015-11-12 19:19:01 +08:00 |
lizanle
|
b24fadea05
|
设置 删除 编辑按钮做成项目一样的
|
2015-11-12 19:15:35 +08:00 |
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-12 17:20:11 +08:00 |
cxt
|
ab868d7b65
|
课程通知增加置顶
|
2015-11-12 16:52:42 +08:00 |
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
2015-11-12 09:32:00 +08:00 |
Tim
|
aed305f5bf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 17:16:37 +08:00 |
Tim
|
7dd299255b
|
博客页面微调
|
2015-11-11 17:16:19 +08:00 |
lizanle
|
4b26af8920
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-11 16:03:00 +08:00 |
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
2015-11-11 16:02:37 +08:00 |
Tim
|
465c5958f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 15:36:06 +08:00 |
Tim
|
b8999e1c6e
|
博客标题输入框宽度调整
|
2015-11-11 15:35:47 +08:00 |
lizanle
|
508ca7f823
|
文件提交进度条
文件提交提示
|
2015-11-11 11:19:10 +08:00 |
lizanle
|
94367eee82
|
Merge branch 'dev_zanle' into szzh
|
2015-11-10 15:26:48 +08:00 |
lizanle
|
c20ff6980b
|
进度条不见了bug。
|
2015-11-10 15:22:10 +08:00 |
lizanle
|
82c377a60a
|
在导航处上传文件不可用
|
2015-11-10 15:18:13 +08:00 |
lizanle
|
dcdffe5d04
|
上传文件的进度条不见了。
|
2015-11-10 14:37:16 +08:00 |
lizanle
|
8d94f57ec3
|
上传文件的进度条不见了。
|
2015-11-10 14:33:46 +08:00 |
cxt
|
0c43a703ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 14:18:53 +08:00 |
cxt
|
4adc6deabf
|
配置课程页面的开课学期不可更改,弹框提醒用户。
|
2015-11-10 14:18:39 +08:00 |
Tim
|
679ec44f8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/student_work/_evaluation_work.html.erb
|
2015-11-10 09:23:01 +08:00 |
Tim
|
d9610d2694
|
作品列表提示标签
|
2015-11-10 09:12:12 +08:00 |
lizanle
|
157ba12513
|
资源库虚线问题
|
2015-11-09 14:04:51 +08:00 |
cxt
|
7f63ceea76
|
作品信息确认框的附件可下载
|
2015-11-06 15:47:32 +08:00 |
huang
|
d2b56e2811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-06 14:40:37 +08:00 |
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
Tim
|
3b6e3f6ecf
|
作品列表修改
|
2015-11-05 17:02:58 +08:00 |
Tim
|
7418330fdd
|
作品列表样式调整
|
2015-11-05 15:48:58 +08:00 |
Tim
|
060c40fa24
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-05 14:45:42 +08:00 |
Tim
|
223b17d8fe
|
普通作品列表、系统评分作品列表、匿评作品列表格式修改
|
2015-11-05 14:45:22 +08:00 |
huang
|
4608190529
|
增加点击选择历史版本记录
|
2015-11-05 14:31:43 +08:00 |
cxt
|
35c60c3253
|
作品列表的作品信息样式调整
|
2015-11-05 09:37:56 +08:00 |
cxt
|
1133b35169
|
作业tag的调整 作业截止时间精确到分
|
2015-11-04 15:24:24 +08:00 |
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-04 11:16:25 +08:00 |
cxt
|
e06f08aa3b
|
作业状态的更改
|
2015-11-04 11:16:11 +08:00 |
huang
|
98ee22a3b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-03 17:19:47 +08:00 |
lizanle
|
8d25b5676c
|
tag_name名称长度扩大至120个字符
|
2015-11-03 14:56:32 +08:00 |
lizanle
|
b84628af9d
|
regist_btn color
|
2015-11-03 11:23:56 +08:00 |
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器;
编写创建组织页面。
|
2015-11-03 11:19:38 +08:00 |
huang
|
a4209bc9f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-03 10:52:49 +08:00 |
lizanle
|
594a1b01ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-03 10:37:21 +08:00 |
lizanle
|
3360a25a42
|
项目 主页 资源上传 不要翻页,直接弹出资源弹出框
|
2015-11-03 10:28:13 +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 |
huang
|
aa4710d872
|
git中忽略配置文件
提交记录新界面
修改获取用户路径
|
2015-10-30 15:46:06 +08:00 |
lizanle
|
27a2a2890f
|
大纲设置图标 鼠标放上去呈手型
图标一直显示
|
2015-10-30 14:10:08 +08:00 |
lizanle
|
6b1c140258
|
更改宽度
|
2015-10-30 11:12:50 +08:00 |
lizanle
|
9e1c675c66
|
根据大纲搜索结果适应高度
|
2015-10-30 10:49:58 +08:00 |
lizanle
|
70003a8d9c
|
课程大纲功能 弹出框样式问题
|
2015-10-30 10:19:57 +08:00 |
lizanle
|
578bb2537d
|
课程大纲功能
|
2015-10-29 17:09:03 +08:00 |
lizanle
|
a747983a51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 14:05:58 +08:00 |
cxt
|
958d781997
|
作品列表的样式修改
|
2015-10-29 10:43:01 +08:00 |
lizanle
|
b67afc2b95
|
大纲
|
2015-10-29 09:07:26 +08:00 |
lizanle
|
5b624330cf
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
public/stylesheets/courses.css
|
2015-10-29 09:04:59 +08:00 |
lizanle
|
eaba915598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-28 17:37:41 +08:00 |
Tim
|
1a2edd9103
|
课程大纲图标等修改
|
2015-10-28 17:34:41 +08:00 |
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +08:00 |
Tim
|
510a1f5fdb
|
搜索按钮鼠标覆盖效果
|
2015-10-28 15:02:21 +08:00 |
Tim
|
61dc979ee4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-28 14:53:39 +08:00 |
Tim
|
e58dcc851b
|
资源库搜索图标替换
|
2015-10-28 14:34:39 +08:00 |
huang
|
00ce480d52
|
查看文件,强制不换行
鼠标光标游走屏幕跟走效果
|
2015-10-27 17:26:43 +08:00 |
huang
|
2cf1f05022
|
修改目录结构
|
2015-10-27 16:32:25 +08:00 |
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
2015-10-27 14:08:08 +08:00 |
huang
|
7970a46469
|
1、添加功能:依据分支切换显示不同的提交记录
2、切换分支刷新页面
3、版本库显示页面修稿
|
2015-10-27 11:41:25 +08:00 |
cxt
|
25d6ed520e
|
首页的问题动态增加附件上传时间
|
2015-10-27 09:45:22 +08:00 |
huang
|
34a8d0890c
|
相政新界面
|
2015-10-26 17:18:59 +08:00 |
lizanle
|
ca0b7e77ba
|
论坛帖子显示序号问题
|
2015-10-26 17:15:44 +08:00 |
cxt
|
2f9cb94e7e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-26 15:26:15 +08:00 |
cxt
|
2f4b29085c
|
首页动态中的表格超出边框
|
2015-10-26 15:26:05 +08:00 |
lizanle
|
c93c2e4bb3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-26 14:44:10 +08:00 |
lizanle
|
4fca8022f3
|
贴吧 帖子 序号问题
|
2015-10-26 14:43:58 +08:00 |
cxt
|
efe4b8609f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-26 11:55:52 +08:00 |
cxt
|
2824b56481
|
增加首页教师加入课程的入口
|
2015-10-26 11:54:59 +08:00 |
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
2015-10-26 10:21:13 +08:00 |
ouyangxuhua
|
6924a3e7bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-24 16:13:05 +08:00 |
ouyangxuhua
|
a42a58fb42
|
修改火狐浏览器出现多余省略号的问题
|
2015-10-24 16:09:44 +08:00 |
lizanle
|
2a76461cd1
|
简单博客功能
|
2015-10-24 15:34:43 +08:00 |
cxt
|
274db8d080
|
作品列表页面的作业信息添加附件的显示
|
2015-10-24 14:53:49 +08:00 |
huang
|
0a4fd92d8c
|
查看代码,显示在project右侧
翻滚
代码展示编辑状态(颜色区分样式)
|
2015-10-24 11:51:02 +08:00 |
ouyangxuhua
|
16f0868df3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 16:28:40 +08:00 |
ouyangxuhua
|
bc3fbc270f
|
将学生改成同学
|
2015-10-23 16:28:22 +08:00 |
huang
|
2221fb4d7a
|
committers跳转问题
按钮样式
|
2015-10-23 16:28:17 +08:00 |
Tim
|
4bedc81524
|
作品列表提交按钮位置调整
|
2015-10-23 16:26:58 +08:00 |
huang
|
b45d140a74
|
没有上传代码显示页面
目录接头top修改
|
2015-10-23 16:20:32 +08:00 |
Tim
|
83b984a909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 15:46:09 +08:00 |
Tim
|
b063be917b
|
附件图标更改;弹窗文字上padding减小
|
2015-10-23 15:45:48 +08:00 |
huang
|
7ab6c45262
|
1、转换界面添加提示。
2、url样式
|
2015-10-23 15:37:58 +08:00 |
ouyangxuhua
|
4a188dc81d
|
对所有作业消息,统一在内容前加圆点,并且调整颜色
|
2015-10-23 14:28:24 +08:00 |
ouyangxuhua
|
9375227250
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-23 09:33:29 +08:00 |
ouyangxuhua
|
7845a0e712
|
修改作业消息的内容及样式
|
2015-10-23 09:33:16 +08:00 |