Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap ...

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb

2012-03-19 14:27:15 +08:00

..

design

Fix bugs and changes for nccu

2012-02-27 18:50:56 +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

Ad banner close complete,need validation

2012-02-04 09:37:23 +08:00

ad_image.rb

Ad banner close complete,need validation

2012-02-04 09:37:23 +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

Improve code in items, pages, links

2012-02-17 14:54:11 +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

change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.

2012-02-29 18:58:33 +08:00

page_part.rb

Changes into page_part edition.

2012-02-16 13:09:09 +08:00

page.rb

new page_content app

2012-02-21 19:22:42 +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

Modify check if site is up-to-date

2011-08-25 08:30:18 +08:00

tag.rb

Fix relations error in tags

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