 lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
lizanle
|
fd42af1ac4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
b6db353b57
|
newrelic配置文件
|
11 years ago |
|
lizanle
|
a3aea4434b
|
忽略newrelic.yml
|
11 years ago |
|
lizanle
|
d3f975434c
|
增加了new Relic gem 包
|
11 years ago |
|
lizanle
|
d8b5252279
|
调整了注释
|
11 years ago |
|
lizanle
|
5afbf6dbca
|
调整了注释
|
11 years ago |
|
lizanle
|
d112c5a911
|
调整了注释
|
11 years ago |
|
lizanle
|
6c02c96342
|
去掉了增加时间跨度的代码
|
11 years ago |
 sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
11 years ago |
|
sw
|
56700f4d62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
649c65fbe2
|
国际化部分代码
|
11 years ago |
|
sw
|
fe06ca503a
|
增加poll colsed_at的赋值
|
11 years ago |
|
sw
|
97c7ccac16
|
增加关闭问卷功能
|
11 years ago |
 z9hang
|
4b3621905e
|
修正课程成员搜索bug
|
11 years ago |
whimlex
|
0ff22b1ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
e5e24c1163
|
resolve conflict
|
11 years ago |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
11 years ago |
 alan
|
36ec204f40
|
修改《公共贴吧中，回复了帖子后，重新编辑的话能编辑标题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f1495686e9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
0944cc4ca8
|
< 邮件格式调整>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d135274281
|
修改重复加入项目提示语
|
11 years ago |
|
sw
|
9f6ff04e65
|
#1866 新建帖子时当鼠标移至“提交”按钮时，光标应变成手型的图标
|
11 years ago |
|
sw
|
87f19f7a8b
|
#1873 加入”==》“申请加入”
|
11 years ago |
|
sw
|
a04bd5d826
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
554cbf55bb
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
2f8d57797c
|
增加弹出框的宽度
|
11 years ago |
zhuhao
|
a38b3c89fe
|
添加预构件生产测试数据
|
11 years ago |
|
zhuhao
|
ca17058750
|
添加预构件
|
11 years ago |
|
zhuhao
|
167abcd6b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
230b98d704
|
注册测试
|
11 years ago |
|
alan
|
472ccc45bf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
0f7c52e279
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
02f01c1aba
|
修改首页加入项目
|
11 years ago |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
z9hang
|
b2396df68c
|
优化下代码
|
11 years ago |
|
sw
|
079fce4335
|
Merge branch 'szzh' into develop
|
11 years ago |
|
alan
|
7ef6f8adfb
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
a3cf79db96
|
修改编码问题
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
9990845f31
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
5e4279e158
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
a093537ba4
|
去掉编辑问卷时框框
|
11 years ago |
|
zhuhao
|
bbe7025e2d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
6dad5bb416
|
修改问卷统计界面margin
|
11 years ago |
|
sw
|
2450bb777d
|
修改问卷统计界面样式
|
11 years ago |
|
whimlex
|
14685f2656
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
11 years ago |
|
zhuhao
|
6ff0a41934
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
38da932f4c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/application.rb
|
11 years ago |
|
alan
|
61634585f5
|
修改《news，forum模块发送邮件的模板》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
