This repository has been archived on 2024-03-16. You can view files and clone it. You cannot open issues or pull requests or push a commit.

saurabhbhatia 43da2eca79 Import Data, Sync Data ...

Conflicts:
	config/mongoid.yml
	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

2014-01-13 15:57:48 +08:00

..

ad_banners

Add setForm and resetForm to pageslide.js

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

ad_images

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +08:00

app_auths

Translation changes

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

asset_categories

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +08:00

assets

ray fix for css and filemanager

2013-12-12 15:39:20 +08:00

attributes

new ui add setting to show in the member frontend

2014-01-03 16:35:52 +08:00

authorizations

New authorization

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

categories

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +08:00

components

Translation changes

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

dashboards

Fix dashboard system usage refresh bug

2013-11-06 09:29:57 +08:00

default_index

Updated Gallery with authorizations

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

designs

Removed Unnecessary add button

2014-01-08 12:47:44 +08:00

import_data

Import Data, Sync Data

2014-01-13 15:57:48 +08:00

items

fix translation conflict and breadcrumb divider

2013-12-24 15:16:31 +08:00

links

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +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

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +08:00

object_auths_new_interface

Translation changes

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

page_parts

widget count fixed for new widgets in page widget settings

2013-12-11 19:37:39 +08:00

pages

Fixed page data count

2013-12-12 12:49:20 +08:00

personal_plugin_intros

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +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

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +08:00

roles

new ui add setting to show in the member frontend

2014-01-03 16:35:52 +08:00

sites

Fix to proper translations

2013-12-27 18:10:12 +08:00

tags

Changed Site Valid Locales to In Use Locales

2013-11-27 17:51:48 +08:00

template_store

template_store and some changes for the store..

2014-01-06 14:56:04 +08:00

user_actions

add user log link at site page

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

users_new_interface

fix chinese translation

2013-12-27 18:10:44 +08:00