Matthew K. Fu JuYuan 1dc44e34ac Merge commit 'ef3fddd863dcfe90f2a352206bdef0ff85af53f0' into openness ...

Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb

2012-11-21 18:45:46 +08:00

..

announcement

for openness

2012-11-20 20:20:59 +08:00

archive

fix and hide for visitors,except for album

2012-11-21 11:46:06 +08:00

calendar

Merge commit 'ef3fddd863dcfe90f2a352206bdef0ff85af53f0' into openness

2012-11-21 18:45:46 +08:00

gallery

Merge commit 'ef3fddd863dcfe90f2a352206bdef0ff85af53f0' into openness

2012-11-21 18:45:46 +08:00

gprs

fix and hide for visitors,except for album

2012-11-21 11:46:06 +08:00

news

for openness

2012-11-20 20:20:59 +08:00

page_content

Fix bugs:

2012-11-01 09:30:12 +08:00

personal_book

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

personal_diploma

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

personal_experience

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

personal_honor

member plugin list add new

2012-11-04 20:24:36 +08:00

personal_journal

some bugs

2012-11-21 07:37:44 +08:00

personal_lab

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

personal_patent

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

personal_project

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

personal_research

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

personal_seminar

Merge branch 'master' into various_bugs

2012-11-06 11:44:00 +08:00

web_resource

Fix bugs:

2012-10-30 17:09:00 +08:00