saurabhbhatia f8ad13a9f5 Import Data, Sync Data ...

Conflicts:

	vendor/built_in_modules/personal_book/app/models/writing_book.rb
	vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
	vendor/built_in_modules/personal_journal/app/models/writing_journal.rb

2013-11-15 17:36:35 +08:00

..

ad_banners_controller.rb

Page slide does not reload from server for ad_banner

2013-10-19 19:17:24 +08:00

ad_images_controller.rb

changes for ad_banner

2013-10-19 19:17:04 +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

Migrate form old ui to new ui (categories, tags and authorizations)

2013-10-15 23:38:44 +08:00

categories_controller.rb

Add setForm and resetForm to pageslide.js

2013-10-21 06:34:55 +08:00

dashboards_controller.rb

Dashboard with HighChart

2013-10-30 18:23:46 +08:00

designs_controller.rb

fixed template updation from site preferences

2013-11-05 20:50:05 +08:00

import_data_controller.rb

Import Data, Sync Data

2013-11-15 17:36:35 +08:00

infos_controller.rb

solved conflict for member_new_ui

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

items_controller.rb

add Member frontend page selection options and fix backend role filter page

2013-11-15 17:08:45 +08:00

links_controller.rb

Fix link in structure

2013-10-30 18:53:23 +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

Some fixes for tags: authorization, translation…

2013-10-19 19:14:31 +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

add Member frontend page selection options and fix backend role filter page

2013-11-15 17:08:45 +08:00

pages_controller.rb

two major fix for site setting and bulletin controller

2013-11-08 16:38:17 +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

removed site restart after site preferences update

2013-10-30 14:18:03 +08:00

sub_roles_controller.rb

Fix sitemap nil

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

tags_controller.rb

Add setForm and resetForm to pageslide.js

2013-10-21 06:34:55 +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 account privilege fix

2013-10-21 10:42:50 +08:00