 alan
|
c61bad4933
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-02-03 10:17:13 +08:00 |
|
alan
|
aa2590d451
|
Signed-off-by: alan <547533434@qq.com>
|
2015-02-03 10:16:46 +08:00 |
 sw
|
320ee9289a
|
#1897 修改点击DTS测试之后，TAB页背景色变化
|
2015-02-03 09:52:35 +08:00 |
|
alan
|
44c783a61b
|
帖子的邮件通知改成只有版主收到
Signed-off-by: alan <547533434@qq.com>
|
2015-02-02 17:31:27 +08:00 |
|
sw
|
93410e0d57
|
#1919 取消作业留言的动态显示
|
2015-02-02 17:23:32 +08:00 |
|
alan
|
646678c9db
|
修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-02-02 17:01:07 +08:00 |
|
sw
|
96f538c76b
|
#1917邮件通知设置中将“收取选中项目的所有通知...”后的省略号去掉
|
2015-02-02 16:42:51 +08:00 |
|
alan
|
858b5ea97c
|
修改《讨论吧发帖发送邮件错误问题》
Signed-off-by: alan <547533434@qq.com>
|
2015-02-02 11:00:23 +08:00 |
 lizanle
|
fa8475387a
|
Merge branch 'szzh' into dev_zanle
|
2015-02-02 10:06:53 +08:00 |
|
lizanle
|
8f5e613477
|
添加一些对代码理解的注释
|
2015-02-02 09:53:14 +08:00 |
|
lizanle
|
725b2749e2
|
添加一些对代码理解的注释
|
2015-02-02 09:52:50 +08:00 |
|
alan
|
7391f3b5cf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
Signed-off-by: alan <547533434@qq.com>
|
2015-02-02 09:52:05 +08:00 |
|
sw
|
a29887cfed
|
关闭问卷后，发布问卷和其他的发布问卷框框未对齐
|
2015-02-02 09:43:35 +08:00 |
|
sw
|
78d8a0a1c6
|
修改意见反馈折叠后背景为透明
|
2015-02-02 09:09:45 +08:00 |
|
sw
|
6261d95eba
|
首页显示异常
|
2015-01-31 17:27:52 +08:00 |
|
sw
|
bb79aac700
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-31 17:20:11 +08:00 |
|
sw
|
5a438f9059
|
Merge branch 'develop' into szzh
|
2015-01-31 17:19:53 +08:00 |
|
sw
|
ab18dfcaa8
|
School => 中国高校
|
2015-01-31 17:19:13 +08:00 |
whimlex
|
8f19467115
|
英文国际化
|
2015-01-31 17:18:07 +08:00 |
 z9hang
|
944dc33212
|
注释掉API文档
|
2015-01-31 17:14:47 +08:00 |
|
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
2015-01-31 17:14:01 +08:00 |
|
alan
|
9681e08600
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile.lock
|
2015-01-31 16:43:46 +08:00 |
|
alan
|
d61199f66b
|
merge szzh
|
2015-01-31 16:43:10 +08:00 |
|
sw
|
ce803ee62e
|
Merge branch 'szzh' into develop
|
2015-01-31 16:31:21 +08:00 |
|
sw
|
79d1a069c2
|
修改公司名字过长首页显示有问题
|
2015-01-31 16:19:13 +08:00 |
|
sw
|
23e5ab60ca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-31 16:09:42 +08:00 |
 huang
|
2a65ba3af8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-31 16:10:33 +08:00 |
|
huang
|
1dd8724656
|
修改样式
|
2015-01-31 16:10:20 +08:00 |
|
alan
|
1010003737
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-31 15:55:17 +08:00 |
|
alan
|
4ebd34722d
|
email_verifier 插件
|
2015-01-31 15:53:50 +08:00 |
|
alan
|
134f0d5557
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-31 15:49:00 +08:00 |
|
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 |
|
alan
|
9e36f9264c
|
修改《竞赛作业评分》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-31 15:46:10 +08:00 |
|
sw
|
5cd1ca8dcb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-31 15:45:53 +08:00 |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
2015-01-31 15:43:35 +08:00 |
|
alan
|
48cb0e0450
|
email verify
|
2015-01-31 15:04:48 +08:00 |
|
sw
|
280092366b
|
去除重复代码
|
2015-01-31 14:54:37 +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 |