 sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 16:32:31 +08:00 |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
2015-03-12 16:32:20 +08:00 |
whimlex
|
e952490fa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 15:25:45 +08:00 |
|
whimlex
|
458fa5b977
|
完善代码审查插件、账户、项目部分模块国际化
|
2015-03-12 15:25:27 +08:00 |
 huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
2015-03-12 15:13:41 +08:00 |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
2015-03-12 09:47:42 +08:00 |
|
whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
2015-03-11 17:27:02 +08:00 |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
2015-03-11 17:23:38 +08:00 |
|
sw
|
9e896118e9
|
项目模块配置：作品下载->资源库
|
2015-03-11 15:16:20 +08:00 |
|
sw
|
0525b03e65
|
zh.yml删除重复的
|
2015-03-11 14:50:06 +08:00 |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
2015-03-11 11:53:42 +08:00 |
|
sw
|
b0eba062a8
|
修复项目、课程留言不正确的BUG
|
2015-03-11 11:20:43 +08:00 |
 z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
2015-03-10 17:20:30 +08:00 |
|
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
2015-03-10 14:41:36 +08:00 |
|
z9hang
|
08f625446e
|
app版本管理功能新建版本界面
|
2015-03-10 10:18:56 +08:00 |
|
whimlex
|
4b19463db7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
app/views/users/show.html.erb
config/locales/zh.yml
|
2015-03-10 10:08:18 +08:00 |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
2015-03-10 09:45:36 +08:00 |
|
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 |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
2015-03-07 15:32:50 +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
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
2015-03-05 11:53:28 +08:00 |
|
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
2015-03-04 10:02:40 +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
|
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 |
|
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 |
|
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
|
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
|
96f538c76b
|
#1917邮件通知设置中将“收取选中项目的所有通知...”后的省略号去掉
|
2015-02-02 16:42:51 +08:00 |
|
sw
|
bb79aac700
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-31 17:20:11 +08:00 |