orbit4-5/app
Harry Bomrah d2bf10863f Merge branch 'master' into ydu
Conflicts:
	app/controllers/sessions_controller.rb
2014-10-28 14:06:11 +08:00
..
assets widget title and page title fixed for page 2014-10-13 18:04:51 +08:00
controllers Merge branch 'master' into ydu 2014-10-28 14:06:11 +08:00
helpers fixed orbit bar lanugage and menu 2014-10-20 19:50:16 +08:00
mailers fixed orbit mailer for no file title 2014-10-13 15:25:30 +08:00
models Merge branch 'master' into ydu 2014-10-28 14:06:11 +08:00
serializers page rendering almost done .. 2014-04-01 15:10:21 +08:00
templates new json for announcement 2014-10-15 16:10:46 +08:00
uploaders fix for upgrading 4.2 to 4.5 2014-10-16 18:35:23 +08:00
views back to in use locales for pages and links 2014-10-24 15:15:13 +08:00