saurabhbhatia 72861f05a6 Merge branch 'development' of https://github.com/Rulingcom/orbit into development ...

Conflicts:
	config/mongoid.yml

2013-07-09 14:40:39 +08:00

..

assets

Rename global.css to global.css.erb

2013-07-02 17:42:15 +08:00

controllers

Revert non rulingcom email constraint

2013-07-04 14:20:13 +08:00

errors

show error message when trying to show a not existed page

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

helpers

Replace get_categories by categories

2013-07-04 12:33:28 +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

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

2013-07-09 14:40:39 +08:00

uploaders

features and widgets added

2013-04-17 14:14:23 +08:00

views

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00