 cxt
|
c44af451ce
|
竞赛增加留言模块
|
2017-01-11 10:16:25 +08:00 |
|
cxt
|
fe24382157
|
竞赛的成员配置页，增加“单位名称”的显示，同时增加excel导出功能
|
2017-01-10 11:00:18 +08:00 |
 黄井泉
|
f4cc2fca62
|
Merge branch 'develop' into 'develop'
周五上线的一些修改
See merge request !113
|
2017-01-06 18:51:04 +08:00 |
|
huang
|
7fd1b84b34
|
解决加入班级通知中已省略号结尾的鼠标显示全部内容，定义公共的用户名长度隐藏样式
|
2017-01-06 16:28:53 +08:00 |
|
cxt
|
83c00d1225
|
竞赛图片的上传
|
2017-01-06 15:52:34 +08:00 |
|
cxt
|
cc4d46c3ee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2017-01-06 15:06:22 +08:00 |
|
cxt
|
9130111b2c
|
竞赛提交的评分
|
2017-01-06 15:00:14 +08:00 |
 guange
|
1ff6372d61
|
merge
|
2017-01-06 09:39:28 +08:00 |
|
cxt
|
c976053297
|
班级作业的评分设置，增加助教评分模式的配置选项
|
2017-01-05 18:20:18 +08:00 |
 daiao
|
e43ef02d57
|
我发布的作业
|
2017-01-05 09:06:41 +08:00 |
|
cxt
|
c36b454c6b
|
竞赛的子讨论区和子讨论区的配置页面
|
2017-01-04 14:01:46 +08:00 |
|
daiao
|
82a253765c
|
我收到的issues
|
2017-01-04 13:33:01 +08:00 |
|
guange
|
474b516653
|
微信at弹出框样式问题解决，在fixed下加一层inner设为overflow-y解决
|
2016-12-31 11:30:49 +08:00 |
|
huang
|
17d4e45acc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-12-30 17:33:18 +08:00 |
|
huang
|
a30ed19b40
|
moemo的创建与编辑公共部分封装；按钮过长隐藏
|
2016-12-30 15:52:08 +08:00 |
|
huang
|
2c7e7bed0b
|
Merge branch 'develop' into dev_tieba
|
2016-12-30 15:04:43 +08:00 |
|
cxt
|
6ba5f124e3
|
竞赛相关icon更换
|
2016-12-30 13:58:40 +08:00 |
|
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 |
|
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 |
|
daiao
|
64c6fa1f37
|
首页显示的个人信息区域北京，换成灰度背景
|
2016-12-28 09:55:59 +08:00 |
|
huang
|
fe20c45c26
|
新建贴吧弹框
|
2016-12-27 17:12:42 +08:00 |
|
huang
|
465b3e7b52
|
问吧 base框架
|
2016-12-27 16:09:09 +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 |
|
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 |