Orbit/vendor/built_in_modules
saurabhbhatia 471987f800 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb
Conflicts:
	vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
2013-09-27 11:10:07 +08:00
..
ad_banner Updated Authorizations for Adbanner, Calendar, Location 2013-08-22 15:20:50 +08:00
announcement Fix [app_name]_category_with_title and change announcement init 2013-09-14 11:54:35 +08:00
archive Move js into a file for status in form 2013-09-11 18:38:56 +08:00
ask Deleted unused module 2013-08-27 15:10:10 +08:00
asset filemanager and some update for file uploader . added file uploader to kernel 2013-09-11 14:03:06 +08:00
authorization New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
calendar_new Updated Authorizations for Adbanner, Calendar, Location 2013-08-22 15:20:50 +08:00
faq half survey module form changed to new ui plus one calendar fix 2013-09-16 12:25:58 +08:00
gallery small change left in last commit. commiting for gallery widget 2013-09-16 11:19:24 +08:00
location Updated Authorizations for Adbanner, Calendar, Location 2013-08-22 15:20:50 +08:00
member Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 2013-09-27 11:10:07 +08:00
member_staff ntu dropdown fix member staff css 2013-05-14 14:19:56 +08:00
miss_module/config/locales member plugin init edit 2013-02-21 17:53:08 +08:00
page_content Updated Sidebar and Preferences 2013-09-09 10:18:14 +08:00
personal_book Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 2013-09-27 11:10:07 +08:00
personal_conference Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 2013-09-27 11:10:07 +08:00
personal_diploma new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
personal_experience new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
personal_honor new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
personal_journal Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 2013-09-27 11:10:07 +08:00
personal_lab new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
personal_patent new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
personal_project new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
personal_research new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
survey small add question fix for survey module. 2013-09-26 09:31:52 +08:00
tag Updated Authorization for member, link, tag, archive 2013-08-27 10:14:39 +08:00
video Module Auth for video 2013-08-23 15:22:21 +08:00
web_resource external links and link widget fixed for development 2013-09-24 15:37:40 +08:00