Tim
|
513fe1a93d
|
作品列表可拖拽
|
2016-06-01 13:46:05 +08:00 |
guange
|
1bdf8800bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-31 19:20:45 +08:00 |
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
txz
|
e121d7d927
|
二级回复显示边框区分
|
2016-05-31 14:55:25 +08:00 |
txz
|
91be3b9f85
|
回复提交时按钮变灰
|
2016-05-31 14:37:45 +08:00 |
huang
|
c57c575c84
|
新版组织静态页面模板
|
2016-05-30 16:24:51 +08:00 |
huang
|
471ed7cbd2
|
组织logo获取,添加样式图片
|
2016-05-30 14:58:46 +08:00 |
Tim
|
9cc749bd57
|
门户样式统一,防止冲突
|
2016-05-30 14:38:57 +08:00 |
huang
|
46e4f2c143
|
组织新base框架
|
2016-05-30 14:23:52 +08:00 |
huang
|
389172e5b2
|
CSS样式
|
2016-05-30 10:45:00 +08:00 |
yuanke
|
98244d2a3d
|
将文章标题的颜色恢复正常
|
2016-05-27 16:42:05 +08:00 |
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
2016-05-27 15:34:55 +08:00 |
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
2016-05-27 15:30:35 +08:00 |
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
2016-05-27 15:04:56 +08:00 |
Tim
|
5f27519c67
|
table可拖拽
|
2016-05-27 14:44:32 +08:00 |
cxt
|
400a470a2b
|
作品列表的样式调整
|
2016-05-27 14:42:12 +08:00 |
cxt
|
3b33732e6f
|
学生列表的姓名、学号、分班和加入时间做成不可点击的
|
2016-05-27 14:15:26 +08:00 |
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
2016-05-27 14:01:02 +08:00 |
txz
|
9134e55606
|
动态纯文本模式,图标处理
|
2016-05-26 17:40:22 +08:00 |
txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 10:55:18 +08:00 |
txz
|
c73ce61afe
|
微信动态可点击,icon图片替换
|
2016-05-26 10:55:00 +08:00 |
guange
|
01428fad14
|
merge
|
2016-05-26 10:51:01 +08:00 |
cxt
|
8257770ec9
|
课程和项目留言的点赞
|
2016-05-25 16:20:01 +08:00 |
cxt
|
5c9ec49457
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-25 15:27:00 +08:00 |
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
2016-05-25 14:26:49 +08:00 |
txz
|
c4c0dd3c60
|
回复内容换行符未显示
|
2016-05-25 13:50:59 +08:00 |
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
2016-05-24 20:51:24 +08:00 |
Tim
|
1c0a68e57b
|
组织配置成员tab,搜索结果太多导致换页断行问题
|
2016-05-24 15:47:22 +08:00 |
txz
|
29ceb7b8e9
|
微信图标清晰问题,回复点赞右对齐
|
2016-05-24 15:01:26 +08:00 |
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
2016-05-24 09:38:49 +08:00 |
yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
2016-05-24 09:11:50 +08:00 |
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
2016-05-23 15:58:32 +08:00 |
cxt
|
c3ec7289b7
|
Merge branch 'develop' into cxt_course
|
2016-05-23 09:51:59 +08:00 |
huang
|
c749fe381b
|
Merge branch 'weixin_guange' into develop
|
2016-05-20 21:02:01 +08:00 |
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
2016-05-20 21:01:30 +08:00 |
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 21:01:18 +08:00 |
Tim
|
dd4786d639
|
作品列表查看详情定位
|
2016-05-20 20:44:13 +08:00 |
txz
|
d329b60a8a
|
微信加载中去白底,内容去除固定行高
|
2016-05-20 20:26:04 +08:00 |
Tim
|
5f4a9304fe
|
提交成绩后,列表成绩没刷新修改;分组作业列表宽度调整
|
2016-05-20 20:05:39 +08:00 |
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
2016-05-20 18:55:17 +08:00 |
huang
|
fc8cbc2b38
|
Merge branch 'hjq_beidou' into develop
|
2016-05-20 16:18:47 +08:00 |
huang
|
ef1a5d32f2
|
顶端背景色
|
2016-05-20 16:18:23 +08:00 |
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
2016-05-20 15:37:44 +08:00 |
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 15:37:02 +08:00 |
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-05-20 15:35:08 +08:00 |
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
Tim
|
13f83719c1
|
作品列表改为table布局
|
2016-05-20 15:15:42 +08:00 |
yuanke
|
ed58e78065
|
KE表格颜色问题
|
2016-05-19 16:38:48 +08:00 |
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
2016-05-19 16:11:06 +08:00 |
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
2016-05-19 16:10:18 +08:00 |
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
cxt
|
3ebef0eae2
|
消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面
|
2016-05-19 15:57:20 +08:00 |
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
2016-05-18 14:49:13 +08:00 |
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
2016-05-17 16:30:03 +08:00 |
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
Tim
|
0b2fe1d88a
|
分组作业样式
|
2016-05-17 11:24:29 +08:00 |
huang
|
61ba7b0c30
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-17 11:22:03 +08:00 |
yuanke
|
c0de43ecc0
|
修改KE字体间距问题,代码测试出错提示。
|
2016-05-17 10:31:10 +08:00 |
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
2016-05-17 09:36:55 +08:00 |
Tim
|
fa788ced1b
|
资源库添加私有资源
|
2016-05-16 15:00:08 +08:00 |
huang
|
0d2a7d8bfd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 16:57:39 +08:00 |
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
2016-05-13 16:56:02 +08:00 |
Tim
|
d384d1e2b4
|
名师榜样式调整
|
2016-05-13 16:28:16 +08:00 |
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
2016-05-13 15:48:31 +08:00 |
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
Tim
|
dc92e821a3
|
名师榜样式调整
|
2016-05-13 14:08:34 +08:00 |
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
2016-05-13 11:39:01 +08:00 |
Tim
|
61470c9bd4
|
名师榜css样式添加
|
2016-05-13 11:29:45 +08:00 |
cxt
|
17497cd74e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-13 10:57:54 +08:00 |
Tim
|
51a6727b07
|
名师榜样式
|
2016-05-13 10:41:13 +08:00 |
Linda
|
a2418396dd
|
邦本库zip下载样式界面
|
2016-05-13 10:30:38 +08:00 |
cxt
|
cc92105da9
|
作品列表添加序号及样式调整
|
2016-05-13 09:58:24 +08:00 |
Tim
|
2ac201ffdd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:41:42 +08:00 |
Tim
|
565d5e3bcc
|
作业测验列表html代码重构,添加序号列
|
2016-05-12 17:41:27 +08:00 |
cxt
|
ac5a9c87ac
|
消息通知中的“同意|拒绝”调整宽度
|
2016-05-12 14:59:12 +08:00 |
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
Tim
|
7957beb64a
|
发送至按钮样式控制
|
2016-05-11 15:51:59 +08:00 |
cxt
|
5baf467d13
|
作品评分不覆盖
|
2016-05-10 15:26:08 +08:00 |
yuanke
|
e502aa7c43
|
KE表格项目问题,自动上传图片做了一点
|
2016-05-10 12:51:42 +08:00 |
Tim
|
c8e0ffbdae
|
左二和右二文字隐藏时的更多显示
|
2016-05-10 10:30:28 +08:00 |
Tim
|
2461a5c918
|
组织门户二级目录位置重新设置
|
2016-05-09 19:40:53 +08:00 |
Tim
|
b32693ca2a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-09 18:44:43 +08:00 |
Tim
|
cf1cf58bab
|
组织门户二级目录添加分栏"|"以及登录未登录位置控制
|
2016-05-09 18:44:20 +08:00 |
huang
|
fc36e4c01e
|
教师列表
|
2016-05-09 18:10:22 +08:00 |
huang
|
3469d928d8
|
图片变的很大问题
|
2016-05-06 20:17:11 +08:00 |
huang
|
23a23fd085
|
组织logo上传图片
|
2016-05-06 19:53:13 +08:00 |
huang
|
f4a5aeec07
|
样式优化
|
2016-05-06 18:29:26 +08:00 |
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
2016-05-06 18:07:24 +08:00 |
cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
huang
|
b40a112015
|
配置页面一级域名超过的时候显示样式
|
2016-05-06 17:25:50 +08:00 |
huang
|
9c18b37349
|
Merge branch 'hjq_beidou' into develop
|
2016-05-06 17:05:27 +08:00 |
Tim
|
c3aec4d115
|
组织一级栏目名称过长时溢出
|
2016-05-06 16:31:40 +08:00 |
huang
|
7f9a327166
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/sub_document_comments/show.html.erb
|
2016-05-06 16:25:41 +08:00 |
Tim
|
cd95ed0558
|
二级回复展开更多效果实现
|
2016-05-06 16:20:39 +08:00 |
yuanke
|
d32e07bda9
|
项目符号有的地方多余,issue详情里面项目符号显示为数字改为圆点.
|
2016-05-06 14:22:45 +08:00 |
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-05-06 11:35:27 +08:00 |
yuanke
|
a863c143f3
|
收缩箭头修改
|
2016-05-06 10:22:48 +08:00 |
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
2016-05-06 10:16:56 +08:00 |
Tim
|
4bf1883ba2
|
组织门户导航栏二级显隐
|
2016-05-06 10:02:31 +08:00 |
yuanke
|
283a83013c
|
KE 修改项目符号、表格颜色问题
|
2016-05-06 08:48:15 +08:00 |
Tim
|
d0f97275cc
|
组织二级栏目显隐效果
|
2016-05-05 16:20:49 +08:00 |
cxt
|
55718f2d44
|
设置课程大纲时若博客标题太长以省略号结束
|
2016-05-05 11:34:31 +08:00 |
Tim
|
c3514f5b6a
|
二级栏目名长度控制
|
2016-05-05 09:28:49 +08:00 |
Tim
|
787dbaaffc
|
二维码处文字样式处理
|
2016-05-05 09:08:01 +08:00 |
Tim
|
abbbe9b7d6
|
二级子目录样式处理
|
2016-05-04 16:53:59 +08:00 |
cxt
|
6c184b9248
|
题库的分享请求
|
2016-05-04 16:17:37 +08:00 |
huang
|
65a907bc99
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_sub_domain.html.erb
|
2016-05-04 15:06:20 +08:00 |
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
2016-05-04 15:05:54 +08:00 |
Linda
|
cbec7cc8f8
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_sub_domain.html.erb
|
2016-05-04 14:41:54 +08:00 |
Linda
|
0fc142d822
|
组织配置logo样式
|
2016-05-04 14:40:25 +08:00 |
Tim
|
714deebe21
|
二级导航调整
|
2016-05-04 14:08:57 +08:00 |
huang
|
7fbf6f4011
|
模式二帖子列表添加分页
|
2016-05-04 11:04:41 +08:00 |
cxt
|
ff160ff793
|
题库的申请改为绿色按钮
|
2016-05-04 10:15:22 +08:00 |
cxt
|
d3e3e9d22b
|
补交作品的样式
|
2016-05-03 18:15:40 +08:00 |
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
2016-05-03 17:15:46 +08:00 |
huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
2016-05-03 17:14:58 +08:00 |
txz
|
de8b303b93
|
微信数据请求时显示加载中
|
2016-05-03 15:37:35 +08:00 |
yuanke
|
5f24fb6496
|
锁的样式修改
|
2016-05-03 14:40:33 +08:00 |
cxt
|
14a539bd0a
|
样式冲突
|
2016-05-03 11:40:24 +08:00 |
cxt
|
a9cb556a20
|
题库的切换报500
|
2016-04-29 19:21:54 +08:00 |
Tim
|
56a4a64d09
|
北斗详情翻页更改;位置超出省略号
|
2016-04-29 17:09:15 +08:00 |
Tim
|
1f87d105d0
|
添加二级目录弹窗,翻页css
|
2016-04-29 16:47:06 +08:00 |
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
2016-04-29 15:54:37 +08:00 |
yuanke
|
1da8288fe7
|
列表显示修改
|
2016-04-29 13:42:58 +08:00 |
Tim
|
ebe6004833
|
组织二级目录添加列表
|
2016-04-29 10:53:04 +08:00 |
Tim
|
5c795b92ee
|
图片百分百显示; 默认大图尺寸调整
|
2016-04-28 11:12:44 +08:00 |
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
2016-04-28 10:49:05 +08:00 |
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 10:45:57 +08:00 |
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
2016-04-28 10:19:59 +08:00 |
Tim
|
024667d035
|
title多行实现省略号效果,默认页面不对齐显示问题,高度控制,标题单行省略显示等
|
2016-04-28 10:17:59 +08:00 |
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
2016-04-27 16:27:55 +08:00 |
Tim
|
5d44dc5bba
|
滚动栏js效果修改
|
2016-04-27 15:16:23 +08:00 |
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
2016-04-27 14:30:28 +08:00 |
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
2016-04-27 14:12:56 +08:00 |
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
2016-04-27 10:36:24 +08:00 |
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
2016-04-27 10:28:36 +08:00 |
Tim
|
c9cc4739aa
|
北斗组织微信块调整
|
2016-04-27 09:57:41 +08:00 |
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
2016-04-27 09:54:49 +08:00 |
Tim
|
b8d6ca0229
|
北斗组织门户样式更改
|
2016-04-27 09:36:54 +08:00 |
huang
|
17b2e82963
|
banner类型
|
2016-04-26 16:23:08 +08:00 |
Tim
|
86751e31fb
|
题库加入私有课程题目,可申请使用
|
2016-04-26 15:35:42 +08:00 |
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
Tim
|
53e6b41d93
|
北斗登录效果调整
|
2016-04-26 10:02:16 +08:00 |
huang
|
81210fd475
|
顶部导航及样式
|
2016-04-25 15:35:32 +08:00 |
huang
|
c1437bb75b
|
北斗界面
|
2016-04-24 14:39:33 +08:00 |
txz
|
dcb150559e
|
angularjs路径修改
|
2016-04-22 16:37:01 +08:00 |
yuanke
|
5c5d212193
|
博客列表
|
2016-04-22 13:52:33 +08:00 |
huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 16:21:49 +08:00 |
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
2016-04-21 16:21:39 +08:00 |
txz
|
0bab42256c
|
微信loading弹框改
|
2016-04-21 11:21:29 +08:00 |
txz
|
39c64c9198
|
解决冲突
|
2016-04-21 10:41:54 +08:00 |
txz
|
8e254ff722
|
微信loading弹框
|
2016-04-21 10:38:36 +08:00 |
yuanke
|
29115bca3a
|
博客列表修改
|
2016-04-20 16:12:20 +08:00 |
txz
|
0b82bf50c2
|
微信内容中图片正常显示
|
2016-04-20 15:45:33 +08:00 |
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 09:55:29 +08:00 |
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
2016-04-20 09:51:51 +08:00 |
txz
|
d0331da0c2
|
微信最新动态样式调整
|
2016-04-19 16:26:05 +08:00 |
huang
|
4e4cb309a9
|
版本库目录最新动态
|
2016-04-19 15:03:47 +08:00 |
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
2016-04-19 09:34:55 +08:00 |
txz
|
73b89cdde5
|
微信边框,回复点赞样式更改
|
2016-04-18 11:19:13 +08:00 |
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-15 17:08:51 +08:00 |
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
2016-04-15 17:07:38 +08:00 |
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 16:52:15 +08:00 |
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-04-15 16:51:37 +08:00 |
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
2016-04-15 15:38:08 +08:00 |
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 11:32:38 +08:00 |
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
2016-04-15 11:32:24 +08:00 |
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
2016-04-15 11:29:40 +08:00 |
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
2016-04-15 11:28:20 +08:00 |
Tim
|
f479277a96
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-04-14 14:38:34 +08:00 |
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-14 12:33:15 +08:00 |
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 12:33:11 +08:00 |
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-14 11:32:35 +08:00 |
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 11:29:26 +08:00 |
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
Tim
|
deda05b048
|
作业下拉选择
|
2016-04-13 14:23:24 +08:00 |
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
2016-04-13 11:20:38 +08:00 |
huang
|
04849659de
|
版本库统计
|
2016-04-12 16:00:54 +08:00 |
txz
|
3665597153
|
详情页面排版调整
|
2016-04-12 14:56:17 +08:00 |
txz
|
f82ad97a68
|
详情页面回复框宽度问题
|
2016-04-11 15:11:01 +08:00 |
txz
|
0262e3b8ab
|
回复长单词显示问题
|
2016-04-08 18:46:46 +08:00 |
txz
|
707127631e
|
微信公众号样式调整
|
2016-04-08 14:07:49 +08:00 |
guange
|
4e50a9e289
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-04-08 10:45:10 +08:00 |
guange
|
aa9cb4e579
|
merge
|
2016-04-08 10:44:36 +08:00 |
txz
|
f3738519e9
|
长单词折行问题
|
2016-04-08 10:10:08 +08:00 |
huang
|
3501d6f1d6
|
完成组织模块的开发
|
2016-04-07 17:05:22 +08:00 |
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +08:00 |
huang
|
86aecd21b9
|
上传图片
|
2016-04-01 23:56:05 +08:00 |
Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
2016-04-01 14:58:41 +08:00 |
huang
|
8f4ff2bf91
|
列表样式问题
|
2016-04-01 10:20:31 +08:00 |
Yiang Gan
|
392c5708f2
|
作业详情页面
|
2016-03-31 20:43:06 +08:00 |
huang
|
5866dfb7ff
|
登录
没内容more
logo不加链接
|
2016-03-31 20:12:20 +08:00 |
huang
|
45343a44b8
|
修改链接
|
2016-03-31 17:13:40 +08:00 |
huang
|
f662bfa40b
|
组织科配置
|
2016-03-31 17:06:00 +08:00 |
huang
|
c431658333
|
setting中后台编辑
|
2016-03-31 16:19:59 +08:00 |
huang
|
0244008b32
|
一些链接和样式
|
2016-03-30 17:33:22 +08:00 |