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

..

ad_banners

Update Ad_Banner for new jQuery

2013-10-16 12:28:21 +08:00

ad_images

Fix relation for Ad_banner and Ad_image

2013-10-04 19:20:04 +08:00

app_auths

Translation changes

2012-12-03 23:00:04 +08:00

asset_categories

Translation changes

2012-12-03 23:00:04 +08:00

assets

small bug fix for inserting and delete button.

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

attributes

solved conflict for member_new_ui

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

authorizations

New authorization

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

categories

Fix link in category for authorization, fix update of auth users

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

components

Translation changes

2012-12-03 23:00:04 +08:00

dashboards

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

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

default_index

Updated Gallery with authorizations

2013-08-22 16:25:11 +08:00

designs

Updated fixes for site info - desktop openess, title always displayed

2013-10-16 18:33:57 +08:00

import_data

Import Data, Sync Data

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

items

Fix relation for Ad_banner and Ad_image

2013-10-04 19:20:04 +08:00

links

Fix for structure

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

member_selects

Add class for Ray's check-box

2013-07-31 00:08:15 +08:00

module_apps_new_interface

Translation changes

2012-12-03 23:00:04 +08:00

module_store

Updated template editing

2013-10-04 14:41:31 +08:00

module_tags

Fix tag page slide issues

2013-10-08 12:47:31 +08:00

object_auths_new_interface

Translation changes

2012-12-03 23:00:04 +08:00

page_parts

Added Enable and disable terms of use, sitemap

2013-10-11 13:14:37 +00:00

pages

Fix JS Path

2013-10-17 11:21:46 +08:00

personal_plugin_intros

Add Brief intro. for all personal plugins

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

plugins

new ui member plugin sort fix and user show avatar fix

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

purchases

put add admin pages using orbit back end controller

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

role_filters

solved conflict for member_new_ui

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

roles

solved conflict for member_new_ui

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

sites

Added Favicon and default image for orbitbar

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

tags

Fix tag page slide issues

2013-10-08 12:47:31 +08:00

template_store

Redirect to designs after buying template

2012-12-07 09:07:49 +08:00

user_actions

add user log link at site page

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

users_new_interface

Drag and drop to reorder users

2013-10-07 15:53:54 +08:00