jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/public
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
..
assets/kindeditor Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
help error message: Redmine ==> Trustie 2013-08-12 23:42:39 +08:00
images Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
javascripts Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
plugin_assets 在gemfile中添加rspec 2015-01-20 16:56:23 +08:00
statistics/trustie2 move 2013.8.29 2013-08-30 09:34:21 +08:00
stylesheets Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
themes #2048 公共贴吧--贴吧创建人等信息以下拉框显示不合适 2015-03-17 09:53:35 +08:00
404.html 修改contest中出现的逻辑错误 2014-10-23 11:30:34 +08:00
500.html new version 2013-09-12 10:41:15 +08:00
Trustie_Beta1.0.0_201412310917.apk for update 2015-01-04 11:53:16 +08:00
dispatch.fcgi.example first commit 2013-08-01 10:33:49 +08:00
favicon.ico first commit 2013-08-01 10:33:49 +08:00
favicon.old.ico first commit 2013-08-01 10:33:49 +08:00
file_not_found.html Signed-off-by: alan <547533434@qq.com> 2014-11-13 10:18:07 +08:00
file_not_found.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
htaccess.fcgi.example first commit 2013-08-01 10:33:49 +08:00
no_file_found.html Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00