saurabhbhatia d47b300dcf 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-10-18 12:02:48 +08:00

..

admin

Import Data, Sync Data

2013-10-18 12:02:48 +08:00

default_widget

Fix parser common to skip not found module_app

2013-10-08 16:42:20 +08:00

desktop

new feature added for not loading submenus inside api for desktop

2013-10-16 09:37:39 +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

Updated with UI Changes

2013-10-01 17:39:21 +08:00

front

Fix Ad_Banner frontend for IE8

2013-10-15 19:37:12 +08:00

js

solved conflict for member_new_ui

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

kaminari

Add mobile but remove news in it

2013-01-07 03:03:38 +08:00

layouts

Added Favicon and default image for orbitbar

2013-10-16 18:50:22 +08:00

mobile

Changes for mobile copyright

2013-02-04 18:02:11 +08:00

shared

new ui member bug and interface fix

2013-09-02 11:22:17 +08:00