 sw
|
916d467352
|
Merge branch 'szzh' into develop
|
10 years ago |
 z9hang
|
57ba46ff00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
10 years ago |
|
sw
|
138fac9509
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/homework_attach/_jour.html.erb
app/views/homework_attach/_journal_reply_items.html.erb
app/views/homework_attach/_showjour.html.erb
app/views/words/_feedback.html.erb
app/views/words/_journal_reply_items.html.erb
app/views/words/_message.html.erb
|
10 years ago |
 lizanle
|
87394fe4ce
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
10 years ago |
|
lizanle
|
58cbfa6af7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
383d90bb12
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
10 years ago |
guange
|
31351bc9e8
|
#1095 在issue主题下，输1个字符可以进行搜索，500错误解决
|
10 years ago |
|
z9hang
|
87f0d73ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
10 years ago |
|
sw
|
4034e3565a
|
修改新建项目html代码不争取
修改新建项目提示信息有两个
|
10 years ago |
|
sw
|
8a7fc85e8b
|
系统中部分回复的本地化文件缺失
|
10 years ago |
|
guange
|
5d1a5a0b11
|
#1738 修复图片下载次数不正确问题
|
10 years ago |
|
sw
|
bdd1980876
|
修复个人动态首页报错
|
10 years ago |
whimlex
|
57c97f3dc8
|
层级回复留言标签修改
|
10 years ago |
|
whimlex
|
7b72f8c59b
|
source 'http://rubygems.org'
|
10 years ago |
|
z9hang
|
7e34ce48bf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
478d635109def1232a790c60319ac1.
|
10 years ago |
|
whimlex
|
a4a9b2dfdd
|
国际化插件
|
10 years ago |
|
z9hang
|
08f625446e
|
app版本管理功能新建版本界面
|
10 years ago |
|
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
|
10 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
10 years ago |
|
sw
|
8dcbc6a851
|
Merge branch 'szzh' into develop
|
10 years ago |
|
sw
|
61167e55c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
052afefa5e
|
用户课程动态按更新时间倒序排列
|
10 years ago |
|
z9hang
|
6ca853edc7
|
1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
|
10 years ago |
|
guange
|
c893a2d99b
|
迁移优化，原来需要1800秒，现只需800秒
|
10 years ago |
|
z9hang
|
26adc13ca2
|
修改用户课程动态接口
|
10 years ago |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
10 years ago |
|
z9hang
|
83cc1b41f3
|
修正api配置
|
10 years ago |
|
z9hang
|
d634532789
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
config/locales/zh.yml
|
10 years ago |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
10 years ago |
|
sw
|
d1912865d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 huang
|
0402fee6de
|
修改邮件邀请
|
10 years ago |
|
huang
|
402f3701da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
d947ebff0c
|
添加国际化
|
10 years ago |
|
sw
|
8c44d25750
|
处理资源标签搜索中标签丢失的问题
|
10 years ago |
|
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
10 years ago |
|
lizanle
|
bd9a645c2c
|
project动态分页页码数显示个数减少
|
10 years ago |
|
lizanle
|
53d144e8d2
|
project动态当前页在最后。
|
10 years ago |
|
sw
|
31d22ed8fa
|
Merge branch 'szzh' into develop
|
10 years ago |
|
sw
|
7c03b03fa9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
b0897638d9
|
修改进入问卷结果页面描述样式显示不正确的BUG
|
10 years ago |
|
sw
|
3cac4336cd
|
修改课程、项目、竞赛首页搜索懒为英文
|
10 years ago |
|
sw
|
6a7c7a732c
|
修改首页报500
|
10 years ago |
|
sw
|
770704790d
|
还原修改
|
10 years ago |
|
z9hang
|
610746301f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
10 years ago |
|
sw
|
3af9c63ae0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
