Rueshyna a34da20e48 Merge branch 'master' into desktop ... * master: (57 commits) Add translations Add mobile version in site settings Add mobile but remove news in it Remove mysql Fix album widget options Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end Add link to default widget (temporary) Ika's fix for width Ika's fix for width Gallery i18n Ika's changes for css default widgets Ika's changes for css default widgets change bulletin object to bulletin title fixing default widget error when needs image make default widget works without init Fix order in structure Fix old tags correct pic file format complete page error handler logic change sub_menu to header in site setting ...		2013-01-07 16:44:05 +08:00
..
assets	Merge branch 'master' into desktop	2013-01-07 16:44:05 +08:00
controllers	Add mobile version in site settings	2013-01-07 03:57:36 +08:00
errors	show error message when trying to show a not existed page	2013-01-03 13:50:27 +08:00
helpers	Fix link for ad_banner	2013-01-07 00:36:48 +08:00
jobs	merge	2012-10-01 21:09:09 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge branch 'master' into desktop	2013-01-07 16:44:05 +08:00
uploaders	Devin's changes to integrate the store	2012-12-06 23:11:23 +08:00
views	Merge branch 'master' into desktop	2013-01-07 16:44:05 +08:00