 huang
|
6ec7769c0e
|
Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
app/controllers/account_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/_logined_header.html.erb
app/views/layouts/base_contest_community.html.erb
app/views/layouts/base_contests.html.erb
app/views/layouts/base_course_community.html.erb
app/views/layouts/base_courses.html.erb
app/views/layouts/base_project_community.html.erb
app/views/layouts/base_syllabus.html.erb
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/layouts/new_base_user_show.html.erb
public/stylesheets/css/structure.css
|
2017-03-14 09:30:02 +08:00 |
|
huang
|
b510994365
|
竞赛添加访问统计
|
2017-02-24 19:42:23 +08:00 |
 cxt
|
099fcde246
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-02-24 15:20:34 +08:00 |
|
cxt
|
01484701d2
|
竞赛首页的简介下方直接显示竞赛动态
|
2017-02-24 15:14:09 +08:00 |
 Linda
|
7451838509
|
syllablus.css和sy.public.css简化转移到 css文件夹；修改页面中引用这两个样式的路径
|
2017-02-21 14:51:48 +08:00 |
|
huang
|
de41150f26
|
新版一些改动
|
2017-01-23 18:34:33 +08:00 |
|
cxt
|
c44af451ce
|
竞赛增加留言模块
|
2017-01-11 10:16:25 +08:00 |
|
cxt
|
cb8d295088
|
竞赛首页报500
|
2017-01-06 22:35:44 +08:00 |
|
cxt
|
83c00d1225
|
竞赛图片的上传
|
2017-01-06 15:52:34 +08:00 |
|
cxt
|
44e1a09906
|
竞赛图片上传
|
2017-01-06 15:03:01 +08:00 |
|
cxt
|
c36b454c6b
|
竞赛的子讨论区和子讨论区的配置页面
|
2017-01-04 14:01:46 +08:00 |
|
cxt
|
986fe7db86
|
竞赛增加讨论区模块
|
2016-12-30 16:37:20 +08:00 |
|
cxt
|
d1fbaa27b9
|
竞赛 ：作品--》提交
|
2016-12-30 13:58:09 +08:00 |
|
cxt
|
738db43f34
|
具体竞赛页的邀请码tip没有显示、竞赛菜单的“暂停加入”和“删除”
|
2016-12-30 11:18:29 +08:00 |
|
cxt
|
73350e34f1
|
竞赛作品的相关设置
|
2016-12-30 10:30:21 +08:00 |
|
cxt
|
9af9945cb4
|
竞赛
|
2016-12-24 16:29:10 +08:00 |
|
cxt
|
44b3f6019c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-23 21:44:20 +08:00 |
|
cxt
|
86bd5b97b1
|
竞赛头部调整
|
2016-12-23 21:44:03 +08:00 |
|
huang
|
69bacc1f6e
|
base添加竞赛入口
|
2016-12-23 20:27:16 +08:00 |
|
cxt
|
544702e11f
|
新建题目
|
2016-12-23 14:41:21 +08:00 |
|
huang
|
b74c034237
|
项目配置添加ke编辑 base中去掉配置
|
2016-12-22 16:39:54 +08:00 |
|
huang
|
037e717937
|
竞赛邀请码 竞赛settings（部分）
|
2016-12-22 15:17:02 +08:00 |
|
huang
|
01d9fbbef3
|
组织base框架
|
2016-12-22 14:47:42 +08:00 |
|
cxt
|
5242e12373
|
竞赛框架搭建
|
2016-12-22 10:01:37 +08:00 |