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_banners_controller.rb

Updated Site info

2013-09-06 18:00:10 +08:00

ad_images_controller.rb

Updated AdBanner index page and Ad Image index page, and edit pages

2013-08-09 15:22:06 +08:00

app_auths_controller.rb

put add admin pages using orbit back end controller

2013-04-17 10:54:38 +08:00

asset_categories_controller.rb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

asset_tags_controller.rb

Add tags to assets

2012-05-16 18:19:41 +08:00

assets_controller.rb

editing for the assets are done with replacable files and description

2013-09-11 14:03:13 +08:00

authorizations_controller.rb

New authorization

2013-08-21 13:42:29 +08:00

categories_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

dashboards_controller.rb

Fix for authorization

2013-08-23 12:08:33 +08:00

designs_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

import_data_controller.rb

added sync for journal paper books and conference.. and also disabled the icons

2013-09-26 22:29:21 +08:00

infos_controller.rb

solved conflict for member_new_ui

2013-08-12 15:40:34 +08:00

items_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

links_controller.rb

Fix link in structure when the item is a link

2013-07-30 11:49:28 +08:00

member_selects_controller.rb

Revert non rulingcom email constraint

2013-07-04 14:20:13 +08:00

module_apps_new_interface_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

module_store_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

module_tags_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

object_auths_new_interface_controller.rb

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +08:00

page_parts_controller.rb

Fix for structure

2013-07-29 18:46:38 +08:00

pages_controller.rb

Import Announcements, Journal Paper, Conference Data, book data

2013-09-26 14:45:42 +08:00

personal_plugin_intros_controller.rb

Add Brief intro. for all personal plugins

2013-09-18 18:55:40 +08:00

plugins_controller.rb

new ui member plugin sort fix and user show avatar fix

2013-09-27 11:04:52 +08:00

purchases_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

role_categorys_controller.rb

user id set & user fields set & role set & member frontend list & user translation & create new member bug fix

2013-04-25 19:59:59 +08:00

role_filters_controller.rb

solved conflict for member_new_ui

2013-08-12 15:40:34 +08:00

role_statuses_controller.rb

user id set & user fields set & role set & member frontend list & user translation & create new member bug fix

2013-04-25 19:59:59 +08:00

roles_controller.rb

solved conflict for member_new_ui

2013-08-12 15:40:34 +08:00

sessions_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

sites_controller.rb

Add Preference and search engine

2013-09-06 18:00:23 +08:00

sub_roles_controller.rb

Fix sitemap nil

2013-02-19 17:39:43 +08:00

tags_controller.rb

Updated Authorization for member, link, tag, archive

2013-08-27 10:14:39 +08:00

template_store_controller.rb

New UI changes(tags, categories, authorisations, module index…)

2013-07-02 16:46:44 +08:00

user_actions_controller.rb

add user log link at site page

2013-06-14 15:24:04 +08:00

users_new_interface_controller.rb

new ui member plugin sort fix and user show avatar fix

2013-09-27 11:04:52 +08:00