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

default_widget

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

2013-11-15 16:58:27 +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 Remember me, and Homepage widget more link

2013-11-11 17:23:03 +08:00

front

Fixed Submenu

2013-11-15 14:48:15 +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

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

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

mobile

Add missing effect to banner

2013-10-19 19:54:37 +08:00

shared

Fix annoucement preview image bug

2013-11-06 16:31:27 +08:00