Matthew K. Fu JuYuan f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.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-04-19 14:06:00 +08:00

..

admin

fix preview window size.

2012-04-13 16:46:16 +08:00

inc

Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap

2012-04-19 14:06:00 +08:00

lib

The new AdBanner.

2012-04-02 03:04:38 +08:00

rulingcom

adding files not commited from previous commit

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

.gitkeep

adding files not commited from previous commit

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

admin_back_end.css.erb

Ray's modification before redesign

2012-01-24 11:57:27 +08:00

admin.css.erb

Ray's back_end modification before sub_roles

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

application.css

Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD

2011-10-20 10:06:06 +08:00

bootstrap-orbit.css

Ray's fix for columns width in bulletins

2012-04-12 07:01:34 +08:00

bootstrap.css.erb

Changes for nccu

2012-02-29 16:01:50 +08:00

design.css

Modify assets

2011-12-05 09:54:41 +08:00

devise.css.erb

Changes for orbit bar, login

2012-02-19 16:33:22 +08:00

feile.css.erb

Merge with sub_roles

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

isotope.css

Add isotope, categories for announcement page, sort for announcement

2012-02-23 15:52:58 +08:00

list.css

Ray's changes in tags, css and js

2012-04-02 02:55:36 +08:00

message.css

Modify assets

2011-12-05 09:54:41 +08:00

new_admin.css.erb

Add isotope, categories for announcement page, sort for announcement

2012-02-23 15:52:58 +08:00

reset.css.erb

Ray's changes in announcenment back-end

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

scroll_style.css

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +08:00

sidebar.css.erb

Ika's changes in modules

2012-02-20 08:48:27 +08:00

site_assets.css.erb

Ray's back_end modification before sub_roles

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

site_designs.css.erb

Ray's back_end modification before sub_roles

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

site_editor.css.erb

Ray's back_end modification before sub_roles

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

site_items.css.erb

css and js changes

2012-03-16 15:06:45 +08:00

style.css.erb

Ray's changes for orbit bar

2012-04-06 18:06:57 +08:00

widget.css

fix for letting ad_banner display even when file in not uploaded

2012-04-13 16:14:43 +08:00