saurabhbhatia a2e9aa2e0b Updated ADBanner with fixes on index page, ADImage with fixes ...

Conflicts:
	app/views/admin/ad_banners/index.html.erb
	app/views/admin/ad_images/_form.html.erb
	vendor/built_in_modules/ad_banner/init.rb

2013-08-09 15:21:51 +08:00

..

ckeditor

Change ckeditor gem and kaminari in gemfile

2013-07-22 17:26:32 +08:00

design

few updates with fb integration and some other changes in user and supports data to android

2013-07-30 16:43:11 +08:00

desktop

new feature in desktop for uploading wallpapers or putting url link

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

meta

Remove i18n_variable for controllers, helpers and models

2012-07-27 19:13:39 +08:00

mongoid

Fix sortable when there's no record

2013-06-14 15:26:12 +08:00

purchase

Merge with sub_roles

2011-12-23 18:34:21 +08:00

user

few updates with fb integration and some other changes in user and supports data to android

2013-07-30 16:43:11 +08:00

ad_banner.rb

Updated ADBanner with fixes on index page, ADImage with fixes

2013-08-09 15:21:51 +08:00

ad_image.rb

Updated ADBanner with fixes on index page, ADImage with fixes

2013-08-09 15:21:51 +08:00

app_auth.rb

First version for App and Object auth.Taking Announcement as experiment

2012-02-29 18:55:55 +08:00

app_manager.rb

fix object auth without app_auth

2012-10-16 14:23:44 +08:00

asset_category.rb

Remove i18n_variable for controllers, helpers and models

2012-07-27 19:13:39 +08:00

asset_tag.rb

Add tags to assets

2012-05-16 18:19:41 +08:00

asset.rb

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

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

buffer_category.rb

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

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

category.rb

Updated zh_tw translation for sidebar labels

2013-07-22 12:17:31 +08:00

component.rb

- No more Home object

2011-05-09 18:49:57 +08:00

i18n_variable.rb

working cache

2012-07-13 15:36:10 +08:00

item.rb

Ray's changes in structure

2013-07-22 14:06:58 +08:00

link.rb

Fix link in structure when the item is a link

2013-07-30 11:49:28 +08:00

module_app.rb

Fix approval in index

2013-07-10 16:42:25 +08:00

module_tag.rb

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

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

object_auth.rb

Add class for Ray's check-box

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

page_part.rb

fix for both part and page part settings

2013-04-17 14:12:52 +08:00

page.rb

solved conflicts

2013-04-17 14:14:24 +08:00

preview_association.rb

add missing file

2012-09-10 14:23:45 +08:00

preview_file.rb

complete preview for both new and announcement

2012-09-07 17:55:59 +08:00

preview.rb

preview for association object

2012-09-10 14:19:39 +08:00

proto_tag.rb

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

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

prototype_auth.rb

fix object de-authorize failed.

2013-06-26 12:28:00 +08:00

session.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

site.rb

from now on the rescue namespace will be decided by site object field: resque_namespace

2013-06-20 17:50:17 +08:00

sub_role_tag.rb

fix for Spen's translation and Chris's tag error

2013-04-26 15:37:27 +08:00

tag.rb

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

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

tagging.rb

Add tagged_ids to taggable

2013-05-03 12:12:19 +08:00