chris 7d5531bf01 Merge branch 'nccu_master' into demo_site ...

Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb

2012-08-22 18:07:49 +08:00

..

design

Put sorting in web_link, page_context and design

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

meta

Remove i18n_variable for controllers, helpers and models

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

purchase

Merge with sub_roles

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

user

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +08:00

.user.rb.swp

adding files not commited from previous commit

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

ad_banner.rb

Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working

2012-06-20 14:50:51 +08:00

ad_image.rb

Fix for banner link

2012-08-13 11:03:11 +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

2012-06-25 16:23:16 +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

Add time to announcement quick edit

2012-08-14 14:38:21 +08:00

component.rb

- No more Home object

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

desktop_theme.rb

Themes from db fixed..

2012-04-23 21:04:02 +08:00

desktop_widget.rb

very important update for widgets management..

2012-05-11 15:27:16 +08:00

desktop.rb

very important update for widgets management..

2012-05-11 15:27:16 +08:00

group.rb

Fetching desktop from db

2012-04-11 15:31:10 +08:00

i18n_variable.rb

working cache

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

item.rb

1.Remove category column when category is specified

2012-08-08 14:46:08 +08:00

journal.rb

Timeline ajax load fixed… a bit change in structure..

2012-07-03 19:45:47 +08:00

link.rb

Put inc/ajax_setting in new_admin

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

module_app.rb

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +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-17 06:43:39 +08:00

other_account.rb

auto login encryption done…

2012-04-30 14:29:42 +08:00

page_part.rb

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +08:00

page.rb

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +08:00

paper.rb

Timeline ajax load fixed… a bit change in structure..

2012-07-03 19:45:47 +08:00

prototype_auth.rb

fix bugs with token

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

section.rb

Dock change and getting values from db

2012-04-06 17:49:22 +08:00

session.rb

Replace PrototypeR4 by Orbit.

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

site.rb

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +08:00

tag.rb

Fix tags

2012-08-03 01:35:41 +08:00

tile.rb

Fetching desktop from db

2012-04-11 15:31:10 +08:00