Matthew K. Fu JuYuan 2cd67356a5 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509 ...

Conflicts:
	config/locales/zh_tw.yml

2012-05-14 12:36:09 +08:00

..

admin

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

2012-05-14 12:36:09 +08:00

devise

Change for the notice msg at login page

2012-04-30 00:24:10 +08:00

js

Integrate Harry's modifications to reload pop-up content

2011-12-29 14:09:06 +08:00

kaminari

Ray's changes for css files, sort headers in announcement and pagination

2012-04-24 02:37:51 +08:00

layouts

New Interface for App Auth and Object Auth

2012-05-14 00:50:12 +08:00

.swp

adding files not commited from previous commit

2011-07-12 16:02:41 +08:00