Commit Graph

5107 Commits

Author SHA1 Message Date
huang 3350bb98b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	config/locales/zh.yml
2015-01-31 15:46:30 +08:00
huang 523af8b2a9 修改企业版结构及列表页面 2015-01-31 15:43:35 +08:00
sw 2cc31e5c72 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 14:48:08 +08:00
sw a12c81bd6b Merge branch 'develop' into szzh 2015-01-31 14:48:00 +08:00
sw 4f82fe2a7b 修改匿评弹出框显示异常 2015-01-31 14:47:17 +08:00
whimlex c413ce1405 项目企业模块国际化修改 2015-01-31 14:44:16 +08:00
sw f3b99ec045 修改项目首页搜索按钮移位 2015-01-31 14:37:24 +08:00
sw 9b854f4264 修改编辑作业列表显示异常 2015-01-31 14:29:11 +08:00
sw d76c0a5365 修改新建作业界面显示异常 2015-01-31 14:28:02 +08:00
sw 8289ca6c89 11111 2015-01-31 11:14:55 +08:00
sw 870549ef06 Merge branch 'szzh' into develop 2015-01-31 10:58:04 +08:00
whimlex 6a22e47b0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 10:55:31 +08:00
whimlex 57237c76d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	config/locales/zh.yml
2015-01-31 10:55:08 +08:00
whimlex 3e1d90630e 找回密码,邮件激活国际化 2015-01-31 10:48:09 +08:00
alan 3484fd34bb merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
2015-01-31 10:47:09 +08:00
alan 7710af316d Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh 2015-01-31 10:46:29 +08:00
alan b5e49e2e1c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-31 10:10:28 +08:00
huang 768e06ea8a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 17:58:58 +08:00
huang be9ff9b4bb 修改控制器名
解决列表中企业重名的bug
2015-01-30 17:58:41 +08:00
alan e34e87bb82 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-30 17:48:18 +08:00
alan 2f168dd4d7 修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
2015-01-30 17:47:57 +08:00
lizanle 999b395763 添加Kaminari分页样式文件,
_paginator.html.erb 这是总的入口文件,可以通过修改它来调整显示的整体结构
比如我不需要“首页”,”末页“这两个链接,那么我就在这个文件里面将对应的代码删除
_page.html.erb 对应页码链接
_first_page.html.erb / _last_page.html.erb 对应“首页”和“末页”的链接
_prev_page.html.erb / _next_page.html.erb 对应“上一页”和“下一页”的链接
_gap.html.erb 空隙的显示,默认是中间的省略号(...)
2015-01-30 17:26:23 +08:00
lizanle ff80bea0c2 添加Kaminari配置文件,并给出了比较详细的注释 2015-01-30 17:25:27 +08:00
lizanle a47cb8eb65 去掉原有的样式分页样式 2015-01-30 17:24:56 +08:00
lizanle c543a28cc8 重写url_helper link_to_unless方法,给Kaminari当前页添加样式 2015-01-30 17:24:26 +08:00
lizanle 55e049edbb 去掉Kaminari分页样式 2015-01-30 17:23:04 +08:00
lizanle 3e2deaf0e3 添加Kaminari分页样式 2015-01-30 17:22:36 +08:00
z9hang d8571ac931 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 16:58:18 +08:00
z9hang 6bd202e80a 课程作业列表当当前用户为课程学生时,输出分配给改学生匿评的作业集合 2015-01-30 16:58:05 +08:00
sw ede400e982 Merge branch 'szzh' into develop 2015-01-30 16:45:46 +08:00
sw 269f1835b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 16:19:35 +08:00
sw 34c68a59fc 关闭问卷之后老师容许查看统计结果 2015-01-30 16:19:05 +08:00
alan a429cadc7a Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-30 16:05:55 +08:00
sw 3648856011 1、修改作业显示界面show不正确
2、修改作业显示界面部分浏览器星星显示异常
2015-01-30 16:05:52 +08:00
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
2015-01-30 16:05:36 +08:00
sw 80c5ee44f1 Merge branch 'szzh' into develop 2015-01-30 15:27:54 +08:00
sw a0debe77bb 111 2015-01-30 15:27:16 +08:00
alan 661dbe5219 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-30 14:52:48 +08:00
alan a467736a5e 修改《多字段唯一性判断》
Signed-off-by: alan <547533434@qq.com>
2015-01-30 14:52:36 +08:00
huang 864ed349e4 国际化 2015-01-30 14:48:24 +08:00
huang 666ebf9b5b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:45:47 +08:00
huang 9e470fa25c meigia 2015-01-30 14:45:33 +08:00
sw 0d6261dfa7 Merge branch 'dev_zanle' into szzh
Conflicts:
	app/controllers/projects_controller.rb
	app/helpers/projects_helper.rb
2015-01-30 14:38:54 +08:00
sw 31c78279ea 删除多余的一个end 2015-01-30 14:31:15 +08:00
huang d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:29:01 +08:00
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
	config/routes.rb
2015-01-30 14:27:56 +08:00
sw 36c07f9664 修改拒绝项目成员加入后,页面不会刷新的BUG 2015-01-30 14:16:32 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
lizanle 22dd4981c0 修改分页函数 2015-01-30 13:35:10 +08:00
lizanle b453d16228 将controller里的两个方法挪到helper 2015-01-30 13:30:06 +08:00