sw
|
61167e55c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-09 17:37:49 +08:00 |
sw
|
81b58e5c87
|
修改base_project中代码错误
|
2015-03-09 15:32:55 +08:00 |
z9hang
|
d634532789
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
config/locales/zh.yml
|
2015-03-09 15:26:02 +08:00 |
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
2015-03-09 15:23:24 +08:00 |
sw
|
8c44d25750
|
处理资源标签搜索中标签丢失的问题
|
2015-03-09 10:27:32 +08:00 |
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
2015-03-09 09:11:57 +08:00 |
sw
|
3cac4336cd
|
修改课程、项目、竞赛首页搜索懒为英文
|
2015-03-07 17:15:01 +08:00 |
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
|
2015-03-07 16:08:54 +08:00 |
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 16:07:48 +08:00 |
z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 15:36:16 +08:00 |
z9hang
|
782071ab64
|
显示接口不能用问题,app版本管理部分代码
|
2015-03-07 15:36:00 +08:00 |
huang
|
ba09213023
|
添加新闻模块、部分样式
|
2015-03-07 15:32:50 +08:00 |
lizanle
|
77f81ac171
|
kaminari分页配置
|
2015-03-07 14:32:34 +08:00 |
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 10:52:20 +08:00 |
huang
|
ce792f6ce8
|
修改邮件发送界面
|
2015-03-07 09:32:27 +08:00 |
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
2015-03-06 15:36:47 +08:00 |
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
|
2015-03-06 15:23:42 +08:00 |
huang
|
beac15475d
|
新项目及用户反馈框的修改!!
|
2015-03-06 14:55:21 +08:00 |
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
2015-03-06 09:27:43 +08:00 |
sw
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
2015-03-05 17:42:31 +08:00 |
z9hang
|
3334299808
|
app版本管理功能(表添加,页面部分添加)
|
2015-03-05 17:37:33 +08:00 |
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
2015-03-05 17:03:44 +08:00 |
sw
|
5f8595d874
|
admin页面增加组织列表
|
2015-03-05 15:27:22 +08:00 |
sw
|
3b4bf8b99d
|
增加组织的index界面,以及index界面到组织首页的跳转
|
2015-03-05 14:15:07 +08:00 |
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
2015-03-05 11:53:28 +08:00 |
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
2015-03-04 10:02:40 +08:00 |
alan
|
0ba6c6d3ba
|
还原memcached修改的文件[memcache实验还没弄好]
Signed-off-by: alan <547533434@qq.com>
|
2015-03-03 16:03:59 +08:00 |
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-02 14:50:10 +08:00 |
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
2015-03-02 14:47:50 +08:00 |
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 23:34:10 +08:00 |
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 20:23:50 +08:00 |
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
2015-02-10 10:21:46 +08:00 |
sw
|
73d2e2e5e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-10 09:07:04 +08:00 |
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
|
2015-02-09 22:14:16 +08:00 |
whimlex
|
59a2c8283a
|
国际化结构调整
|
2015-02-09 22:07:21 +08:00 |
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
2015-02-09 10:28:33 +08:00 |
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
2015-02-06 18:19:35 +08:00 |
alan
|
6e72e07028
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile
Gemfile.lock
|
2015-02-06 18:16:20 +08:00 |
alan
|
6f9e2bad63
|
mail weekly
|
2015-02-06 18:15:08 +08:00 |
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
2015-02-06 09:32:32 +08:00 |
huang
|
59e7f2f28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 15:23:05 +08:00 |
huang
|
8bef9420cf
|
修改企业版中自己能看到自己的私有项目
|
2015-02-03 15:22:45 +08:00 |
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 11:25:31 +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 |
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
|
bb79aac700
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-31 17:20:11 +08:00 |
sw
|
ab18dfcaa8
|
School => 中国高校
|
2015-01-31 17:19:13 +08:00 |
whimlex
|
8f19467115
|
英文国际化
|
2015-01-31 17:18:07 +08:00 |
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
2015-01-31 17:14:01 +08:00 |