jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/config/locales
History
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 		2015-04-16 10:26:03 +08:00
..
account 完善代码审查插件、账户、项目部分模块国际化 2015-03-12 15:25:27 +08:00
admins 国际化结构调整 2015-02-09 22:07:21 +08:00
commons 评论显示 2015-04-11 11:52:11 +08:00
contacts 资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整 2015-04-03 11:30:48 +08:00
contests 资源库国际化 2015-03-18 18:02:54 +08:00
courses 资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整 2015-04-03 11:30:48 +08:00
forums 完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签 2015-03-10 09:45:36 +08:00
mailers 完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签 2015-03-10 09:45:36 +08:00
my 项目界面国际化及样式调整；标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
navigatiors 项目界面国际化及样式调整；标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
projects Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
users pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
en.yml pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
zh.yml Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00