Spen 5d3bc07488 archive and web_resouce for new ui ...

Conflicts:
	app/assets/stylesheets/lib/main-forms.css

2013-07-22 18:14:33 +08:00

..

assets

archive and web_resouce for new ui

2013-07-22 18:14:33 +08:00

controllers

Fix get_viewable

2013-07-22 17:41:52 +08:00

errors

show error message when trying to show a not existed page

2013-01-03 13:50:27 +08:00

helpers

Fix approval in index

2013-07-10 16:42:25 +08:00

jobs

ask module: dropdown, icon, big5 encoding, redirect, admin, send mail

2013-06-07 13:03:59 +08:00

mailer

Add mail_settings

2012-05-09 11:38:29 +08:00

models

Change ckeditor gem and kaminari in gemfile

2013-07-22 17:26:32 +08:00

uploaders

Change ckeditor gem and kaminari in gemfile

2013-07-22 17:26:32 +08:00

views

Ray's changes for css and js

2013-07-22 16:31:44 +08:00