4 Commits

Author	SHA1	Message	Date
chris	b40d4702d5	Merge branch 'master' into various_bugs ... Conflicts: config/locales/en.yml config/locales/zh_tw.yml vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb	2012-11-06 11:44:00 +08:00
Harry Bomrah	2e809c5c19	Calander view updated...	2012-11-05 11:40:11 +08:00
chris	bc9082a858	Fix bug: Fix the bug due to not finding the ModuleApp	2012-10-30 17:10:59 +08:00
chris	cbfa659928	Changes for side_bar	2012-10-26 11:19:56 +08:00