jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,354 Commits 98 Branches 0 Tags 0 B
Commit Graph

4653 Commits

Author SHA1 Message Date
whimlex 93df92e660 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:55:42 +08:00
huang aa2a41d368 修改文档 从项目动态点入后导航栏显示错误 2015-03-11 11:55:55 +08:00
whimlex 540ddd4a1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-11 11:55:13 +08:00
whimlex 0eafbb92d5 意见反馈模块国际化 2015-03-11 11:53:42 +08:00
huang 49cf6e1319 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:38:42 +08:00
huang 32a2e7ae1f 修改默认情况下 用户反馈框处于关闭状态 2015-03-11 11:38:09 +08:00
z9hang 743a642cf1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 11:23:23 +08:00
z9hang eec155f077 课程资源页面app自动登陆处理 2015-03-11 11:22:58 +08:00
sw b0eba062a8 修复项目、课程留言不正确的BUG 2015-03-11 11:20:43 +08:00
sw 9060c9acbc #1977 项目发布新贴跳转有问题 2015-03-11 10:16:06 +08:00
sw aa3ab86fb0 #2013 个人主页--留言--留言输入框不见了 2015-03-11 09:48:35 +08:00
z9hang 57ba46ff00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-10 17:21:59 +08:00
z9hang 43e9a9a495 1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成 2015-03-10 17:20:30 +08:00
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
 2015-03-10 17:11:52 +08:00
lizanle 87394fe4ce issue2626，建议什么时候创建工程的信息也要加进来。 2015-03-10 16:27:32 +08:00
lizanle 58cbfa6af7 Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-10 16:26:50 +08:00
lizanle 383d90bb12 issue2626，建议什么时候创建工程的信息也要加进来。 2015-03-10 16:26:22 +08:00
z9hang 87f0d73ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-10 14:41:59 +08:00
z9hang 803f4a3eaf 1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加 2015-03-10 14:41:36 +08:00
sw 4034e3565a 修改新建项目html代码不争取 
修改新建项目提示信息有两个
 2015-03-10 14:36:49 +08:00
sw 8a7fc85e8b 系统中部分回复的本地化文件缺失 2015-03-10 14:25:17 +08:00
sw bdd1980876 修复个人动态首页报错 2015-03-10 11:39:01 +08:00
whimlex 57c97f3dc8 层级回复留言标签修改 2015-03-10 11:12:38 +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
z9hang 052afefa5e 用户课程动态按更新时间倒序排列 2015-03-09 17:32:38 +08:00
z9hang 6ca853edc7 1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能 2015-03-09 17:28:17 +08:00
z9hang 26adc13ca2 修改用户课程动态接口 2015-03-09 15:45:09 +08:00
sw 81b58e5c87 修改base_project中代码错误 2015-03-09 15:32:55 +08:00
z9hang 83cc1b41f3 修正api配置 2015-03-09 15:27:01 +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 d1912865d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 14:01:46 +08:00
huang 0402fee6de 修改邮件邀请 2015-03-09 11:31:42 +08:00
huang 402f3701da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-09 10:31:51 +08:00
huang d947ebff0c 添加国际化 2015-03-09 10:31:05 +08:00
sw 8c44d25750 处理资源标签搜索中标签丢失的问题 2015-03-09 10:27:32 +08:00
sw 659a87ef60 修复部分本地化标签丢失 2015-03-09 09:11:57 +08:00
lizanle bd9a645c2c project动态分页页码数显示个数减少 2015-03-08 17:36:45 +08:00
lizanle 53d144e8d2 project动态当前页在最后。 2015-03-08 17:33:55 +08:00
sw 7c03b03fa9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 17:20:50 +08:00
sw b0897638d9 修改进入问卷结果页面描述样式显示不正确的BUG 2015-03-07 17:20:33 +08:00
sw 6a7c7a732c 修改首页报500 2015-03-07 17:08:36 +08:00
z9hang 610746301f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 16:20:28 +08:00
z9hang 5a3d324ce4 添加课程留言列表接口 2015-03-07 16:19:55 +08:00
sw 3af9c63ae0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 16:16:06 +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