Harry Bomrah 5f9190db39 few updates with fb integration and some other changes in user and supports data to android ... Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb		2013-07-30 16:43:11 +08:00
..
admin	Fix link in structure when the item is a link	2013-07-30 11:49:28 +08:00
default_widget	add search to archive	2013-06-05 18:03:09 +08:00
desktop	few updates with fb integration and some other changes in user and supports data to android	2013-07-30 16:43:11 +08:00
desktop_apps	apps update -- app upload and activation	2013-07-30 16:42:50 +08:00
desktop_widgets	apps update -- app upload and activation	2013-07-30 16:42:50 +08:00
devise	member translation fix	2013-04-26 11:26:11 +08:00
front	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Add mobile but remove news in it	2013-01-07 03:03:38 +08:00
layouts	'select2' minor update	2013-07-30 16:42:40 +08:00
mobile	Changes for mobile copyright	2013-02-04 18:02:11 +08:00
shared	add search to archive	2013-06-05 18:03:09 +08:00