chris 282604d1fa Merge branch 'back' of github.com:Rulingcom/orbit into back ...

Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb

2013-01-14 17:46:27 +08:00

..

admin

user roles starts

2012-11-22 21:10:35 +08:00

inc

Merge branch 'design_team' into ldap

2012-05-09 13:51:00 +08:00

lib

Change date picker

2013-01-09 05:18:16 +08:00

mobile

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

2013-01-14 17:46:27 +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

first version of fb_share

2012-08-06 16:12:49 +08:00

banner_nav.css

Ika's changes for orbit bar

2012-07-20 15:41:27 +08:00

bootstrap-orbit.css

Ray's changes for new backend

2012-09-14 02:38:56 +08:00

bootstrap-responsive.css

calendar update

2012-09-14 15:57:44 +08:00

bootstrap.css

Ray's changes for new backend

2012-09-14 02:38:56 +08:00

bootstrap.css.erb.backup20120913

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

default_widget.css

change *default* to *defulat*

2013-01-10 09:40:52 +08:00

design.css

Modify assets

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

desktop.css

Add missing icons and css for icons in layout

2012-12-03 22:31:00 +08:00

desktopmain.css

view update

2012-12-07 04:21:26 +08:00

desktopmedia.css

some update

2012-05-10 10:54:43 +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

font-awesome.css.erb

Change icons

2013-01-09 21:17:50 +08:00

icons.css.erb

Fix mobile banner, icons, announcement css

2013-01-11 18:34:20 +08:00

isotope.css

Ray's changes for new backend

2012-09-14 02:38:56 +08:00

item.css

Ray's changes for icon css

2013-01-09 21:17:50 +08:00

jquery.miniColors.css

theme setting update

2012-04-11 13:46:32 +08:00

list.css

Ray's changes in css and js

2012-10-09 07:48:05 +08:00

list.css.backup120913

Ray's changes for new backend

2012-09-14 02:38:56 +08:00

member.css

address field. js and style is broken

2012-11-20 09:53:36 +08:00

message.css

form validation again

2012-08-14 01:02:45 +08:00

mobile.css

Change icons

2013-01-09 21:17:50 +08:00

module-store.css.erb

Devin's changes to integrate the store

2012-12-06 23:11:23 +08:00

new_admin.css.erb

Fix the tooltips overflow

2013-01-11 12:24:50 +08:00

normalize.css

Changes for store back-end

2012-12-05 13:46:10 +08:00

orbit-bar.css.erb

Ray's changes for icon size

2013-01-09 21:17:50 +08:00

orbitTimeline111.css

Calendar updates for day view

2012-10-26 11:15:37 +08:00

orbitTimeline.css.erb

publication adjustment

2012-07-09 10:44:01 +08:00

reset.css.erb

Ray's changes for css files, sort headers in announcement and pagination

2012-04-24 02:37:51 +08:00

rulingorbit.css.erb

- template list/show is loaded from central server

2012-12-06 23:20:27 +08:00

scroll_style.css

Ray's changes for new backend

2012-09-14 02:38:56 +08:00

sidebar.css.erb

Ray's fix for structure side_bar

2012-05-22 16:48:57 +08:00

site_assets.css.erb

Ray's changes for css files, sort headers in announcement and pagination

2012-04-24 02:37:51 +08:00

site_designs.css.erb

Ray's changes for css files, sort headers in announcement and pagination

2012-04-24 02:37:51 +08:00

site_editor.css.erb

Add missing icons and css for icons in layout

2012-12-03 22:31:00 +08:00

site_items.css.erb

Ray's changes for css files, sort headers in announcement and pagination

2012-04-24 02:37:51 +08:00

site-map.css

address field. js and style is broken

2012-11-20 09:53:36 +08:00

social-share-button.css

New css and images for rss

2012-08-15 18:00:55 +08:00

style.css.erb

Changes in css for structure icon and sidebar padding

2013-01-09 21:35:54 +08:00

style.css.erb.backup20120913

Ray's changes for new backend

2012-09-14 02:38:56 +08:00

template-store.css.erb

Devin's changes to integrate the store

2012-12-06 23:11:23 +08:00

tinymce_orbit.css

devin's css for tinymce

2012-09-28 09:58:28 +08:00

widget.css

Fix the tooltips overflow

2013-01-11 12:24:50 +08:00