orbit-basic

0 Fork 0

Files

T

Matthew K. Fu JuYuan a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb

2012-05-16 12:13:07 +08:00

ad_banners

First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued

2012-05-15 18:55:16 +08:00

ad_images

Fix site_locale_default_head and active for current locale

2012-05-07 00:53:52 +08:00

app_auths

Listing for Module-apps

2012-01-12 14:13:41 +08:00

asset_categories

Change assets

2012-05-16 11:07:11 +08:00

assets

Change assets

2012-05-16 11:07:11 +08:00

attributes

Fix parser_back_end & side_bar & meta

2012-03-30 15:51:29 +08:00

components

Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen

2012-04-30 00:24:11 +08:00

dashboards

Remove link from dashboard

2012-05-15 23:01:00 +08:00

designs

Put sorting in web_link, page_context and design

2012-05-05 21:20:20 +08:00

infos

Ray's back-end modifications for sub-roles

2011-12-28 20:57:18 +08:00

items

Put nestedSortable in page_edit.js.erb

2012-05-12 22:12:17 +08:00

links

Improve code in items, pages, links

2012-02-17 14:54:11 +08:00

module_apps

Add category and tag to pages

2012-05-14 00:33:52 +08:00

module_apps_new_interface

New Interface for App Auth and Object Auth

2012-05-14 00:50:12 +08:00

object_auths

Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen

2012-04-30 00:24:11 +08:00

object_auths_new_interface

Change to apply page to had object_auth

2012-05-14 12:40:50 +08:00

page_parts

Fix titles for widgets

2012-05-13 23:09:48 +08:00

pages

Add category and tag to pages

2012-05-14 00:33:52 +08:00

purchases

Ray's back_end modification before sub_roles

2011-12-23 18:02:45 +08:00

roles

Merge branch 'fix_it'

2012-01-12 18:15:43 +08:00

sites

Hide some links in side_bar for site_settings

2012-05-09 12:53:42 +08:00