chris 747b0d4620 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit ...

Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb

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

..

announcement

Fix:

2012-11-15 18:01:49 +08:00

archive

Fix these bugs:

2012-11-15 15:51:44 +08:00

calendar

calendar "edit calendar" update

2012-11-12 15:11:36 +08:00

gallery

Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit

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

gprs

Fix bugs in Json when missing files

2012-11-13 15:21:59 +08:00

news

Fix bugs:

2012-11-01 09:30:12 +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

Merge branch 'new' of https://github.com/Rulingcom/orbit into new

2012-11-06 14:28:03 +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