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

..

admin

Import Data, Sync Data

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

desktop

move journal code to persional_journal modulaar

2013-01-14 17:53:59 +08:00

application_controller.rb

now only approved announcement can be viewed when backend is open

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

default_widget_controller.rb

Revert "more button fix and also new way to select more page."

2013-11-15 16:58:27 +08:00

desktop_apps_controller.rb

Updated Desktop Inheritence class

2013-10-07 17:47:13 +08:00

desktop_appstore_controller.rb

new page add and timeline changes

2012-06-28 17:31:48 +08:00

desktop_controller.rb

Fixed Desktop Openness

2013-11-11 17:40:51 +08:00

desktop_orbit_controller.rb

design update

2012-09-12 01:58:23 +08:00

desktop_themes_controller.rb

Updated Desktop Themes controller

2013-08-22 14:14:19 +08:00

desktop_widgets_controller.rb

Updated desktop widgets controller

2013-10-07 18:13:55 +08:00

facebook_controller.rb

new feature in desktop for uploading wallpapers or putting url link

2013-08-02 19:32:41 +08:00

front_controller.rb

Fixed Enable and Disable, Sitemap and Terms of Use for header and footer

2013-10-15 10:37:49 +08:00

gridfs_controller.rb

Multi language and side bar update

2012-08-20 23:14:11 +08:00

mobile_controller.rb

Display de page contexts in the mobile version as set in structure

2013-10-08 18:11:29 +08:00

orbit_backend_controller.rb

Updated Approvable to work for submanager role also

2013-11-13 10:35:03 +08:00

orbit_frontend_component_controller.rb

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

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

orbit_frontend_controller.rb

default widgets and sidebar.

2012-12-24 16:38:35 +08:00

orbit_member_controller.rb

Updated Approvable to work for submanager role also

2013-11-13 10:35:03 +08:00

orbit_widget_controller.rb

apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.

2013-06-06 17:39:36 +08:00

otheraccounts_controller.rb

update for desktop widgets

2012-11-05 11:40:11 +08:00

pages_controller.rb

Revert "more button fix and also new way to select more page."

2013-11-15 16:58:27 +08:00