daiao
|
e883194eaf
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-30 11:33:06 +08:00 |
huang
|
11135bfabf
|
问吧编辑
|
2016-12-30 11:30:40 +08:00 |
cxt
|
619dfa7a7a
|
竞赛首页的图标更改
|
2016-12-30 11:30:28 +08:00 |
daiao
|
16e1f0c701
|
导航栏“帮助中心”改为“问吧”,并调整帖子展示内容的高度
|
2016-12-30 10:45:22 +08:00 |
cxt
|
73350e34f1
|
竞赛作品的相关设置
|
2016-12-30 10:30:21 +08:00 |
huang
|
3bdf26c63e
|
问吧位置加链接
|
2016-12-29 17:07:34 +08:00 |
huang
|
9fcd5b48ed
|
forum index页面分页及排序
|
2016-12-29 15:57:52 +08:00 |
huang
|
f733e2a276
|
注册激活页面代码重构,及添加新的字体
|
2016-12-29 14:38:03 +08:00 |
huang
|
91e452b0c8
|
邮件激活新页面
|
2016-12-28 17:58:27 +08:00 |
daiao
|
506d7ae82c
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2016-12-28 16:38:30 +08:00 |
daiao
|
017ed1b0b0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-28 16:36:45 +08:00 |
huang
|
a423909a71
|
完成memo详情相关页面及功能
|
2016-12-28 16:18:47 +08:00 |
huang
|
da88c43e95
|
完成问吧 memo新建及 forum详情页面相关功能
|
2016-12-28 15:24:26 +08:00 |
cxt
|
bdd2a60d00
|
竞赛:加入竞赛、发布竞赛、发布通知等的消息
|
2016-12-28 11:30:31 +08:00 |
cxt
|
c1b5f8d77d
|
786竞赛图片更换
|
2016-12-28 10:21:11 +08:00 |
daiao
|
64c6fa1f37
|
首页显示的个人信息区域北京,换成灰度背景
|
2016-12-28 09:55:59 +08:00 |
guange
|
d015c7a968
|
加入,您可以@别人啦~
|
2016-12-27 22:07:11 +08:00 |
huang
|
fe20c45c26
|
新建贴吧弹框
|
2016-12-27 17:12:42 +08:00 |
huang
|
465b3e7b52
|
问吧 base框架
|
2016-12-27 16:09:09 +08:00 |
cxt
|
a9f16d0722
|
竞赛模块的弹框,样式没有全部使用最新的
|
2016-12-27 13:52:11 +08:00 |
huang
|
30d0cfc2af
|
Merge branch 'develop' into dev_tieba
|
2016-12-27 13:28:36 +08:00 |
huang
|
616e7a2a11
|
公共贴吧
|
2016-12-27 12:12:07 +08:00 |
huang
|
735cdb6a46
|
公共贴吧
|
2016-12-27 10:41:28 +08:00 |
cxt
|
3d30a11f66
|
导航栏头部增加竞赛入口
|
2016-12-27 10:06:56 +08:00 |
daiao
|
e86bd6728e
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/views/users/_user_activities.html.erb
db/schema.rb
|
2016-12-24 16:48:48 +08:00 |
cxt
|
9af9945cb4
|
竞赛
|
2016-12-24 16:29:10 +08:00 |
daiao
|
0ce62b9e8c
|
关联commit数据为空时,显示调整
|
2016-12-23 20:34:23 +08:00 |
daiao
|
283f8035b9
|
邮件激活页面,点击“重新获取验证码”时间间隔设置为60秒,并调整按钮样式
|
2016-12-23 16:57:32 +08:00 |
cxt
|
544702e11f
|
新建题目
|
2016-12-23 14:41:21 +08:00 |
huang
|
9f0b17424d
|
竞赛配置样式调整
|
2016-12-22 17:10:40 +08:00 |
huang
|
eb7ecd4143
|
竞赛配置功能
|
2016-12-22 16:03:58 +08:00 |
daiao
|
b4d4fa4e28
|
待办任务的所有列表页,首列加上发布人的头像
|
2016-12-22 14:49:19 +08:00 |
huang
|
01d9fbbef3
|
组织base框架
|
2016-12-22 14:47:42 +08:00 |
cxt
|
5242e12373
|
竞赛框架搭建
|
2016-12-22 10:01:37 +08:00 |
daiao
|
adce17c877
|
首页的消息列表头像换成圆形
|
2016-12-21 09:49:09 +08:00 |
daiao
|
2b60143f78
|
博客,班级的帖子标题和内容,留言显示出现英文单词分隔显示问题
|
2016-12-20 11:04:16 +08:00 |
cxt
|
16fe5f58a1
|
详细列表的样式调整
|
2016-12-17 09:38:48 +08:00 |
cxt
|
d8f098c6f4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-12-16 16:56:21 +08:00 |
daiao
|
4642e0cd11
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-16 16:42:13 +08:00 |
daiao
|
e773ba2aa8
|
个人主页样式调整
|
2016-12-16 16:41:55 +08:00 |
huang
|
f71ccb6c67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-16 16:30:25 +08:00 |
黄井泉
|
48774d7ab7
|
Merge branch 'develop' into 'develop'
个人主页
个人主页
See merge request !61
|
2016-12-16 16:29:39 +08:00 |
黄井泉
|
85d01a7392
|
Merge branch 'guange_dev' into 'develop'
去除个人信息编辑中的邮箱
See merge request !56
|
2016-12-16 16:27:28 +08:00 |
huang
|
c477d15fae
|
Merge branch 'dev_newproject' into develop
|
2016-12-16 16:13:26 +08:00 |
cxt
|
552b6429ef
|
消息列表的样式调整
|
2016-12-16 16:11:19 +08:00 |
daiao
|
c42fd235e8
|
Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop
Conflicts:
app/views/users/_new_user_message.html.erb
public/stylesheets/css/user.css
|
2016-12-16 14:51:10 +08:00 |
cxt
|
0fe7b96473
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_new_user_message.html.erb
public/stylesheets/css/user.css
|
2016-12-16 14:41:37 +08:00 |
huang
|
a148f3c157
|
Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_new_user_message.html.erb
public/stylesheets/css/user.css
|
2016-12-16 14:06:17 +08:00 |
daiao
|
1ff1ed3c54
|
个人主页
|
2016-12-16 14:03:01 +08:00 |
huang
|
5facd08af6
|
issue新建和编辑样式调整
|
2016-12-15 12:24:57 +08:00 |
daiao
|
ffd1e3942c
|
个人主页tab列表
|
2016-12-15 09:13:39 +08:00 |
huang
|
58a45e8f16
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-14 15:21:56 +08:00 |
daiao
|
0d4dc89c73
|
个人主页的tab的JS及其样式
|
2016-12-14 10:17:39 +08:00 |
daiao
|
54687793ec
|
铃铛样式重新排版
|
2016-12-13 17:22:30 +08:00 |
cxt
|
633c314a67
|
IE浏览器提交作品给出提示
|
2016-12-13 17:21:10 +08:00 |
cxt
|
ec476cbd74
|
班级头部的调整
|
2016-12-13 16:16:32 +08:00 |
cxt
|
90c3c33dd4
|
ke编辑的样式与显示样式不一致
|
2016-12-13 11:07:03 +08:00 |
guange
|
5074d61dba
|
修改个人信息中的邮箱去除
|
2016-12-13 11:04:31 +08:00 |
cxt
|
93cf24cf41
|
首页消息提醒、消息动态样式
|
2016-12-12 15:57:26 +08:00 |
huang
|
6e67e4a5c7
|
0
|
2016-12-12 10:55:19 +08:00 |
daiao
|
0f328d36e1
|
代码改进
|
2016-12-12 10:00:05 +08:00 |
daiao
|
fb62d4f1b2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-12-09 20:00:07 +08:00 |
daiao
|
92bc7aa813
|
个人首页的7个tab
|
2016-12-09 19:32:00 +08:00 |
cxt
|
6903639699
|
微信缺陷@页面的按钮样式调整
|
2016-12-09 19:28:20 +08:00 |
huang
|
41b6c64af3
|
Merge branch 'guange_dev' into develop
|
2016-12-09 16:53:18 +08:00 |
guange
|
34b14b4e51
|
微信bug修改
|
2016-12-09 16:52:01 +08:00 |
黄井泉
|
b8eee2b131
|
Merge branch 'cxt_course' into 'develop'
本周上线任务
See merge request !50
|
2016-12-09 16:43:00 +08:00 |
cxt
|
0b217b9998
|
基于项目的分做作业,关联项目列表需要增加“更换项目”的功能
|
2016-12-09 16:39:24 +08:00 |
黄井泉
|
74a20dddc1
|
Merge branch 'dev_newproject' into 'develop'
Issue和commit关联功能
See merge request !49
|
2016-12-09 14:17:06 +08:00 |
cxt
|
67d23a2161
|
多级回复的显示调整
|
2016-12-09 10:01:53 +08:00 |
huang
|
2a5bb6dcb8
|
Merge branch 'guange_dev' into develop
Conflicts:
Gemfile
|
2016-12-09 09:35:12 +08:00 |
cxt
|
92871ff925
|
弹框样式调整、作业截止后附件不能删除
|
2016-12-08 16:24:17 +08:00 |
cxt
|
9ca4001c8c
|
追加附件的调整
|
2016-12-08 15:29:51 +08:00 |
cxt
|
abdbfd87b0
|
班级的邀请码增加“停用”和“启用”功能,停用的邀请码不允许用户主动加入班级
|
2016-12-08 13:40:11 +08:00 |
huang
|
8ba747e195
|
版本库diff页面(Issue和commit关联)
|
2016-12-08 09:16:14 +08:00 |
daiao
|
69d9228808
|
个人主页的消息页面
|
2016-12-07 15:13:51 +08:00 |
daiao
|
e6763c6d0c
|
用户消息铃铛样式调整
|
2016-12-07 09:00:33 +08:00 |
huang
|
33a4186e69
|
完成issue和commit关联创建。去重,及相关局部刷新
|
2016-12-06 17:37:07 +08:00 |
cxt
|
03b00f0af5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-06 16:17:46 +08:00 |
cxt
|
5a6e64beb2
|
Revert "测验头部和新建题目的改版"
This reverts commit c33bf1b163 .
Conflicts:
public/stylesheets/css/courses.css
|
2016-12-06 15:02:32 +08:00 |
cxt
|
5bbe9e71ba
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt
Conflicts:
db/schema.rb
|
2016-12-06 14:12:40 +08:00 |
daiao
|
35fdf9a8a7
|
个人首页头部及其左侧导航(未完)
|
2016-12-06 09:36:13 +08:00 |
cxt
|
88c8c4144b
|
编程作业新建和编辑的时候,测试输出集很长的显示不友好,调整
|
2016-12-05 17:18:56 +08:00 |
huang
|
66066e6899
|
commit导出方法及显示页面
|
2016-12-05 14:52:46 +08:00 |
cxt
|
bd458e1aef
|
班级的教师列表显示样式比较旧,更换样式
|
2016-12-05 14:17:33 +08:00 |
huang
|
6ebaa1c90a
|
Merge branch 'develop' into dev_newproject
|
2016-12-05 11:12:52 +08:00 |
huang
|
5bc4c779ea
|
issue和commit_id关联
|
2016-12-05 11:07:41 +08:00 |
guange
|
6c37645c9e
|
at功能实现
|
2016-12-05 09:30:39 +08:00 |
guange
|
d351827ba2
|
at功能实现
|
2016-12-04 19:20:02 +08:00 |
黄井泉
|
42775a82f9
|
Merge branch 'cxt_course' into 'develop'
班级作业增加设置选项:成绩公开范围
See merge request !37
|
2016-12-02 14:53:55 +08:00 |
cxt
|
adac1d3d7a
|
班级问卷列表样式调整
|
2016-12-02 14:53:20 +08:00 |
黄井泉
|
9a83b81269
|
Merge branch 'develop' into 'develop'
项目没有数据的页面调整为新版;项目3类成员页面调整;组织列表新增新建功能;issue显示加长;
项目没有数据的页面调整为新版;项目3类成员页面调整;组织列表新增新建功能;issue显示加长;
See merge request !35
|
2016-12-02 13:36:25 +08:00 |
cxt
|
2fd4cb9064
|
班级作业增加设置选项:成绩公开范围
|
2016-12-02 13:30:49 +08:00 |
huang
|
aea81f2b10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-02 13:23:55 +08:00 |
huang
|
bd31af108e
|
提交历史现实样式整体变更 版本库中提交详情也现实样式调整
|
2016-12-02 11:26:15 +08:00 |
daiao
|
7e5fda197e
|
组织列表增加新建组织按钮,并将我的issue与issue列表的issue标题显示加长
|
2016-12-02 10:21:56 +08:00 |
huang
|
c3745be0eb
|
项目版本库历史记录代码优化及界面调整
|
2016-12-02 10:21:48 +08:00 |
陈晓婷
|
39258f4ac5
|
Merge branch 'develop' into 'develop'
课程相关bug修复;叠层回复的“回复”、“赞”的显隐
See merge request !32
|
2016-12-02 10:14:07 +08:00 |
daiao
|
7a8c937173
|
项目issue列表,讨论区,版本库,pullrequests,里程碑及其里程碑详情页面,数据为空时,页面调整
|
2016-12-01 17:29:14 +08:00 |
cxt
|
423018fa15
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-01 15:47:46 +08:00 |
cxt
|
c33bf1b163
|
测验头部和新建题目的改版
|
2016-12-01 15:42:07 +08:00 |
huang
|
bbc8d11f80
|
项目issue关联commit(未完成)
|
2016-12-01 14:21:40 +08:00 |
guange
|
8d16926e66
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
2016-12-01 11:01:10 +08:00 |
guange
|
d6e868b294
|
编程作业最大输出改为1000
|
2016-12-01 10:59:41 +08:00 |
cxt
|
a2af654a91
|
具体作业的标题行右侧显示内容变更
|
2016-11-30 15:53:51 +08:00 |
huang
|
a19f6ffd38
|
项目文件历史记录显示内容区分历史新增和删除
项目变更文件高亮显示
|
2016-11-29 17:05:14 +08:00 |
cxt
|
fced64cc96
|
点击子域名申请消息报404
|
2016-11-29 16:22:58 +08:00 |
yuanke
|
b6172fc31f
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-25 17:45:01 +08:00 |
yuanke
|
248276d088
|
KE工具栏不换行
|
2016-11-25 17:43:52 +08:00 |
黄井泉
|
00c8673f4a
|
Merge branch 'dai_ao' into 'develop'
项目头部样式修改,fork数目不对
See merge request !23
|
2016-11-25 17:19:15 +08:00 |
daiao
|
f1b6e67e50
|
项目头部样式修改,fork数目错误
|
2016-11-25 17:10:49 +08:00 |
yuanke
|
5675c3ab67
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-25 16:01:50 +08:00 |
yuanke
|
b1ae697c3d
|
页面缩小时页面下方需要出现左右滚动条
|
2016-11-25 16:00:41 +08:00 |
huang
|
636721699e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
|
2016-11-25 15:16:09 +08:00 |
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:56:24 +08:00 |
cxt
|
88c4a26303
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:03:01 +08:00 |
daiao
|
bff5a36577
|
pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果
|
2016-11-25 11:32:45 +08:00 |
cxt
|
a614b4eb93
|
班级的讨论区列表与通知列表、项目的讨论区列表、博客列表:显示请微调
|
2016-11-25 11:25:04 +08:00 |
daiao
|
599d233176
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
|
2016-11-25 10:49:57 +08:00 |
cxt
|
8743460134
|
动态与详情的回复叠层调整
|
2016-11-25 09:59:03 +08:00 |
huang
|
30a0347cd6
|
项目头部修改,及其成员列表,关注列表新版样式(未完)
|
2016-11-24 17:40:33 +08:00 |
huang
|
45bbd7b293
|
pull request 选择项目的时候JS控制分支
|
2016-11-24 14:47:02 +08:00 |
yuanke
|
d28f597aed
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-24 10:53:41 +08:00 |
daiao
|
f7db47be41
|
Merge branch 'dai_ao' into develop
|
2016-11-24 10:45:43 +08:00 |
daiao
|
5ed9d169f3
|
Merge branch 'develop' into dai_ao
|
2016-11-24 10:05:18 +08:00 |
huang
|
42dee92c60
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-23 17:18:42 +08:00 |
huang
|
67a9d04a64
|
版本库添加删除功能
|
2016-11-23 17:14:49 +08:00 |
yuanke
|
9720f84fce
|
js的自动转换URL函数autoUrl加上个异常处理
|
2016-11-23 13:29:02 +08:00 |
daiao
|
0eb6a607b2
|
项目issue中,附件名称后缀显示不全
|
2016-11-22 09:23:16 +08:00 |
cxt
|
4388b7625e
|
首页班级列表的归档
|
2016-11-21 16:58:25 +08:00 |
cxt
|
62ea9d12f7
|
项目简介的样式调整
|
2016-11-21 14:11:35 +08:00 |
cxt
|
14e457dc6a
|
360浏览器的“请选择作业类型”没显示完全
|
2016-11-18 21:19:36 +08:00 |
cxt
|
94c4afd6de
|
样式调整
|
2016-11-18 20:11:32 +08:00 |
cxt
|
0338e80f34
|
班级左侧导航栏的“+”
|
2016-11-18 19:39:36 +08:00 |
cxt
|
edca878701
|
输入框的边框不显示
|
2016-11-18 19:31:52 +08:00 |
cxt
|
2786495774
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-18 19:28:31 +08:00 |
cxt
|
58ee1eb745
|
去掉500页面的“给我留言”
|
2016-11-18 19:28:18 +08:00 |
daiao
|
f9a384b253
|
Merge branch 'dai_ao' into develop
|
2016-11-18 19:18:36 +08:00 |
cxt
|
afd90d6da3
|
500页面调整
|
2016-11-18 19:17:35 +08:00 |
cxt
|
003c6a7551
|
新建作业初始显示调整
|
2016-11-18 18:37:41 +08:00 |
daiao
|
f91722a422
|
我的issue样式调整
|
2016-11-18 17:46:51 +08:00 |
cxt
|
4da94a5bb0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-18 17:32:55 +08:00 |
huang
|
9b2d4b8a07
|
新建项目边框问题
|
2016-11-18 17:31:48 +08:00 |
cxt
|
6bb4e650c4
|
QQ反馈返回空白页、“返回上一页”不能点击时字体置灰
|
2016-11-18 17:21:23 +08:00 |
huang
|
de61d699a8
|
Merge branch 'dev_newproject' into develop
|
2016-11-18 16:22:03 +08:00 |
daiao
|
290a301cee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-11-18 15:48:40 +08:00 |
daiao
|
cd32353d91
|
Merge branch 'dai_ao' into develop
|
2016-11-18 15:45:35 +08:00 |
cxt
|
5510df165d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-11-18 15:45:06 +08:00 |
cxt
|
1fcb1db27c
|
课程大纲下的班级归档
|
2016-11-18 15:34:53 +08:00 |
daiao
|
b8e59430e8
|
项目资源库,资源描述框宽度增加至800px
|
2016-11-18 09:46:28 +08:00 |
daiao
|
8f7e6004fd
|
我的issue居中显示
|
2016-11-17 17:09:07 +08:00 |
cxt
|
3ebc3c6492
|
老师、学生测验列表的调整
|
2016-11-17 17:04:00 +08:00 |
daiao
|
d65a062737
|
所有我的issue功能
|
2016-11-17 17:02:02 +08:00 |
cxt
|
efd0bf6707
|
删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整
|
2016-11-17 10:23:13 +08:00 |
cxt
|
1ad0c1cbff
|
测验列表
|
2016-11-17 09:06:44 +08:00 |
daiao
|
e956d20d6e
|
我的issue部分功能
|
2016-11-16 16:57:02 +08:00 |
daiao
|
acffe8ec19
|
我的issue未完
|
2016-11-16 11:26:17 +08:00 |
cxt
|
2dc717df0c
|
Merge branch 'develop' into cxt_course
|
2016-11-15 16:57:33 +08:00 |
cxt
|
9f79408e32
|
导入试卷
|
2016-11-15 16:57:07 +08:00 |
huang
|
3ab5ab4e4b
|
代码质量分析列表优化
|
2016-11-15 15:34:15 +08:00 |
cxt
|
f754ac870d
|
导航栏题库-发送:如图发送弹框中当鼠标移至下拉条时,鼠标光标不要显示成可以左右拉动的图标
|
2016-11-15 14:18:15 +08:00 |
huang
|
1e5d3e05ad
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-15 14:09:40 +08:00 |
huang
|
0ea9a49f86
|
质量分析界面调整
|
2016-11-15 14:09:25 +08:00 |
daiao
|
c927a6fecc
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-15 13:21:37 +08:00 |
cxt
|
79b6a99324
|
班级左侧导航栏的发布icon简化
|
2016-11-15 09:30:45 +08:00 |
daiao
|
5f481c2bf9
|
修改项目issue,所有,开启,关闭数的样式
|
2016-11-15 09:28:32 +08:00 |
cxt
|
0ed878e718
|
404、403、500页面
|
2016-11-14 15:36:36 +08:00 |
huang
|
8e36cd1374
|
attach弹框宽度
|
2016-11-11 19:19:26 +08:00 |
huang
|
5104340b78
|
Merge branch 'dev_newproject' into develop
|
2016-11-11 18:21:29 +08:00 |
cxt
|
c352fb5604
|
学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数
|
2016-11-11 17:55:25 +08:00 |
daiao
|
1ec0100386
|
项目简介样式调整,并且输入网页能点击
|
2016-11-11 17:35:11 +08:00 |
cxt
|
cb5ca96bb5
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_homework.html.erb
db/schema.rb
|
2016-11-11 16:53:20 +08:00 |
cxt
|
16c51e1eaa
|
基于项目的分组作业没有显示项目详情
|
2016-11-11 16:50:25 +08:00 |
daiao
|
e1afe9d2d7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:36:13 +08:00 |
daiao
|
92531ce487
|
项目简介样式调整
|
2016-11-11 16:35:26 +08:00 |
huang
|
442fb8a531
|
添加fork成员列表
|
2016-11-11 16:09:43 +08:00 |
cxt
|
d1bfdde261
|
班级名称命名和显示规范调整
|
2016-11-11 15:19:22 +08:00 |
cxt
|
07b97c8eb9
|
学生列表增加删除功能、删除学生时删除其对应的作品
|
2016-11-11 13:58:07 +08:00 |
daiao
|
ae84afe43e
|
项目issue,新建和编辑issue时,上传附件时,保存按钮不可点击
|
2016-11-10 17:16:54 +08:00 |
daiao
|
4fc98308bc
|
项目简介样式问题
|
2016-11-10 13:34:43 +08:00 |
daiao
|
c1cf633d2c
|
项目版本库样式调整
|
2016-11-09 10:01:56 +08:00 |
huang
|
b5f035d286
|
版本库详情页面添加目录回退功能,部分功能及界面调整
|
2016-11-08 15:21:12 +08:00 |
huang
|
721a916a20
|
版本库按钮调整
|
2016-11-08 10:44:57 +08:00 |
huang
|
cceadb02ce
|
Merge branch 'develop' into dev_newproject
|
2016-11-07 17:19:47 +08:00 |
cxt
|
2bb018b0fe
|
导入问卷的弹框用新版样式
|
2016-11-07 17:12:29 +08:00 |
daiao
|
e57e439210
|
新建,编辑issue时,上传附件尽课程展示全
|
2016-11-07 17:08:24 +08:00 |
daiao
|
3d2d526149
|
新建和编辑ISSUE,上传附件名称显示问题
|
2016-11-07 15:21:00 +08:00 |
daiao
|
e70c66b5ac
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/views/projects/_act_issues.html.erb
|
2016-11-07 13:30:15 +08:00 |
daiao
|
8b5879217d
|
调整新建项目issue页面
|
2016-11-07 13:28:50 +08:00 |
yuanke
|
44724c6905
|
弹框BUG修改
|
2016-11-04 21:07:57 +08:00 |
yuanke
|
76a62af858
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-04 20:30:44 +08:00 |
yuanke
|
d71ebb08b0
|
弹框BUG修复
|
2016-11-04 20:29:18 +08:00 |
cxt
|
15a88b76c2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-04 19:18:53 +08:00 |
yuanke
|
9ef8f0f612
|
弹框BUG修改
|
2016-11-04 18:59:48 +08:00 |
cxt
|
94284e72a2
|
弹框样式调整、
课程大纲的提示,在操作文字的前后应该各空一格、
作品列表的各种提示未知需要对齐、
评分设置等新弹框:如图当鼠标移至右上角关闭图标,图标丢失、
|
2016-11-04 18:43:44 +08:00 |
cxt
|
0bbccab616
|
样式调整
|
2016-11-04 16:59:33 +08:00 |
cxt
|
78ca68b5e3
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/css/moduel.css
public/stylesheets/css/public.css
|
2016-11-04 16:15:56 +08:00 |
cxt
|
d762c68f7b
|
分组作业的页面显示和评分处理调整
|
2016-11-04 16:10:13 +08:00 |
cxt
|
20f112d5ad
|
作业评分设置的调整
|
2016-11-04 09:23:23 +08:00 |
cxt
|
ecae600546
|
启动匿评、关闭匿评的提示
|
2016-11-02 16:46:47 +08:00 |