 sw
|
8c44d25750
|
处理资源标签搜索中标签丢失的问题
|
10 years ago |
|
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
10 years ago |
|
sw
|
3cac4336cd
|
修改课程、项目、竞赛首页搜索懒为英文
|
10 years ago |
 alan
|
838c39da69
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/projects/_invite_members_by_mail.html.erb
|
10 years ago |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
 z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
10 years ago |
 huang
|
ba09213023
|
添加新闻模块、部分样式
|
10 years ago |
 lizanle
|
77f81ac171
|
kaminari分页配置
|
10 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
10 years ago |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
10 years ago |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
10 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
10 years ago |
|
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
10 years ago |
|
sw
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
10 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
10 years ago |
|
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
10 years ago |
|
sw
|
5f8595d874
|
admin页面增加组织列表
|
10 years ago |
|
sw
|
3b4bf8b99d
|
增加组织的index界面，以及index界面到组织首页的跳转
|
10 years ago |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
10 years ago |
|
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
10 years ago |
|
alan
|
0ba6c6d3ba
|
还原memcached修改的文件[memcache实验还没弄好]
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
11 years ago |
|
sw
|
73d2e2e5e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
11 years ago |
|
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
11 years ago |
|
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
11 years ago |
|
alan
|
6e72e07028
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile
Gemfile.lock
|
11 years ago |
|
alan
|
6f9e2bad63
|
mail weekly
|
11 years ago |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
11 years ago |
|
huang
|
59e7f2f28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
8bef9420cf
|
修改企业版中自己能看到自己的私有项目
|
11 years ago |
|
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
96f538c76b
|
#1917邮件通知设置中将“收取选中项目的所有通知...”后的省略号去掉
|
11 years ago |
|
alan
|
858b5ea97c
|
修改《讨论吧发帖发送邮件错误问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
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>
|
11 years ago |
|
sw
|
bb79aac700
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ab18dfcaa8
|
School => 中国高校
|
11 years ago |
|
whimlex
|
8f19467115
|
英文国际化
|
11 years ago |
|
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
11 years ago |
|
alan
|
9681e08600
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile.lock
|
11 years ago |
|
alan
|
1010003737
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
134f0d5557
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
huang
|
3350bb98b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
9e36f9264c
|
修改《竞赛作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
11 years ago |
|
alan
|
48cb0e0450
|
email verify
|
11 years ago |
|
whimlex
|
c413ce1405
|
项目企业模块国际化修改
|
11 years ago |
|
whimlex
|
6a22e47b0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
57237c76d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
3e1d90630e
|
找回密码，邮件激活国际化
|
11 years ago |
|
alan
|
3484fd34bb
|
merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7710af316d
|
Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh
|
11 years ago |
|
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
11 years ago |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
ff80bea0c2
|
添加Kaminari配置文件，并给出了比较详细的注释
|
11 years ago |
|
lizanle
|
c543a28cc8
|
重写url_helper link_to_unless方法，给Kaminari当前页添加样式
|
11 years ago |
|
alan
|
f2a3ce0ece
|
修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
864ed349e4
|
国际化
|
11 years ago |
|
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
|
11 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
|
sw
|
0d5384c6d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
617107f0cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
f05e046751
|
首页国际化
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
11 years ago |
|
lizanle
|
87b230623b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
950d831108
|
Merge branch 'api' into szzh
|
11 years ago |
|
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 |
|
sw
|
56700f4d62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
97c7ccac16
|
增加关闭问卷功能
|
11 years ago |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
11 years ago |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
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 |
|
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 |
|
sw
|
08e646c752
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
11 years ago |
|
whimlex
|
2be757a3d5
|
翻译缺失完善
|
11 years ago |
|
whimlex
|
9886a3212c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
15a8bddfe6
|
缺失翻译
|
11 years ago |
|
lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
11 years ago |
|
lizanle
|
e96302d219
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
69ced4b14b
|
添加国际化内容
|
11 years ago |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
lizanle
|
7bf89c1fc1
|
开发环境不缓存
|
11 years ago |
|
lizanle
|
f394c3878e
|
生产环境日志名字规定为production.log
|
11 years ago |
|
lizanle
|
d2d1a9659b
|
开发环境下去掉缓存
|
11 years ago |
