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

..

design

Put sorting in web_link, page_context and design

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

meta

Add site_info

2012-05-07 00:54:18 +08:00

purchase

Merge with sub_roles

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

user

Change to apply page to had object_auth

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

.user.rb.swp

adding files not commited from previous commit

2011-07-12 16:02:41 +08:00

ad_banner.rb

Fix commit error

2012-05-15 21:25:51 +08:00

ad_image.rb

Disable ad_banner_preview. Just show window

2012-04-24 14:37:06 +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

Manger and SubManager

2012-01-24 12:28:32 +08:00

asset_category.rb

Change assets

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

asset.rb

Change assets

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

component.rb

- No more Home object

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

i18n_variable.rb

Fix relations error in tags

2012-02-15 11:42:19 +08:00

item.rb

Fix bugs for shift_to and change items.rake for the missing position in db

2012-05-11 17:56:26 +08:00

link.rb

Change the way links are displayed in menus in front-end

2012-05-14 21:43:10 +08:00

module_app.rb

fix bugs with token

2012-02-29 18:56:42 +08:00

object_auth.rb

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

page_part.rb

Add custom title to widgets

2012-05-13 22:35:00 +08:00

page.rb

Add impressionist

2012-05-15 21:26:09 +08:00

prototype_auth.rb

fix bugs with token

2012-02-29 18:56:42 +08:00

session.rb

Replace PrototypeR4 by Orbit.

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

site.rb

Add mail_settings

2012-05-09 11:38:29 +08:00

tag.rb

Can show announcement and news list by tag's key

2012-05-08 17:27:42 +08:00