Harry Bomrah 0671d0b126 filemanger authentication changes and also announcement preview fixed and also text search for files ... Conflicts: app/views/admin/assets/index.html.erb		2013-12-11 18:49:54 +08:00
..
admin	filemanger authentication changes and also announcement preview fixed and also text search for files	2013-12-11 18:49:54 +08:00
basic_infos	minor fix for emailers and facebook	2013-12-02 12:10:17 +08:00
default_widget	Revert "more button fix and also new way to select more page."	2013-11-15 16:58:27 +08:00
desktop	second commit for harry.tp	2013-11-27 09:46:00 +08:00
desktop_apps	apps update -- app upload and activation	2013-07-30 16:42:50 +08:00
desktop_themes	new themes added to desktop plus theme uploader created	2013-07-30 16:43:32 +08:00
desktop_widgets	apps update -- app upload and activation	2013-07-30 16:42:50 +08:00
devise	form validations and ajax check plus user approval done	2013-11-29 16:40:46 +08:00
facebook	facebook login and import done	2013-11-27 09:46:02 +08:00
front	Sub Menu and Language Fix	2013-11-22 17:16:23 +08:00
js	Changed Site Valid Locales to In Use Locales	2013-11-27 17:51:48 +08:00
kaminari	Add mobile but remove news in it	2013-01-07 03:03:38 +08:00
layouts	add Member frontend page selection options and fix backend role filter page	2013-11-15 17:08:45 +08:00
mobile	now we can set two colors gradient for orbit bar	2013-12-10 09:58:58 +08:00
shared	Changed Site Valid Locales to In Use Locales	2013-11-27 17:51:48 +08:00