Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap ...

Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json

2012-05-14 00:57:17 +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

Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine

2012-02-29 13:07:21 +08:00

.user.rb.swp

adding files not commited from previous commit

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

ad_banner.rb

Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner

2012-04-24 14:43:30 +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.rb

include Mongoid::Timestamps

2011-04-13 18:22:52 +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

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

2011-04-13 18:19:51 +08:00

module_app.rb

fix bugs with token

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

object_auth.rb

Fact check program completed,Lin checked

2012-03-27 18:54:03 +08:00

page_part.rb

Add custom title to widgets

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

page.rb

Add category and tag to pages

2012-05-14 00:33:52 +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