jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/lib
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
..
SVG first commit 2013-08-01 10:33:49 +08:00
dalli-2.7.2 16:22 2015-03-06 16:22:07 +08:00
email_verifier@222a9bdd72 merge szzh 2015-01-31 16:43:10 +08:00
generators first commit 2013-08-01 10:33:49 +08:00
git/backend add logger info 2013-08-19 10:24:02 +08:00
plugins 修改课程动态报错 2015-03-20 16:33:43 +08:00
rails_kindeditor Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
redmine 1、课程新增成员分页控件样式 2015-03-30 17:03:20 +08:00
tasks Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
trustie Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
diff.rb first commit 2013-08-01 10:33:49 +08:00
git_refresh_changes.py 1. git仓库新建时加入hook代码 2015-03-18 11:22:05 +08:00
legacy.rb course class period 2014-07-18 17:10:41 +08:00
redcloth3.rb document css/ 2014-06-10 15:59:57 +08:00
redmine.rb 课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序 2015-04-09 15:18:13 +08:00
trustie.rb 优化zip重复打包问题 2015-04-02 17:20:52 +08:00