Matthew K. Fu JuYuan b5571dbc43 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ... Conflicts: app/controllers/admin/users_new_interface_controller.rb app/views/admin/users_new_interface/show.html.erb		2012-10-12 18:17:05 +08:00
..
admin	fix preview window size.	2012-04-13 16:46:16 +08:00
inc	Merge branch 'design_team' into ldap	2012-05-09 13:51: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.css.erb	Ray's back_end modification before sub_roles	2011-12-23 18:02:45 +08:00
admin_back_end.css.erb	Ray's modification before redesign	2012-01-24 11:57:27 +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	Ray's changes for new backend	2012-09-14 02:38:56 +08:00
design.css	Modify assets	2011-12-05 09:54:41 +08:00
desktop.css	Fix bugs after merge	2012-09-14 02:27:49 +08:00
desktopmain.css	little changes	2012-07-06 16:09: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	Ray's changes for new backend	2012-09-14 02:38:56 +08:00
isotope.css	Ray's changes for new backend	2012-09-14 02:38:56 +08:00
item.css	Ray's changes for new backend	2012-09-14 02:38:56 +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	new code for attribute fields and values for new member interface	2012-10-12 18:09:02 +08:00
message.css	form validation again	2012-08-14 01:02:45 +08:00
new_admin.css.erb	Ray's changes for new backend	2012-09-14 02:38:56 +08:00
orbit-bar.css.erb	Ray's changes in css and js	2012-10-09 07:48:05 +08:00
orbitTimeline.css	design update	2012-09-12 01:58:23 +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
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-map.css	new code for attribute fields and values for new member interface	2012-10-12 18:09:02 +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	Fix for structure js and css	2012-04-25 18:41:38 +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
social-share-button.css	New css and images for rss	2012-08-15 18:00:55 +08:00
style.css.erb	Ray's changes in css and js	2012-10-09 07:48:05 +08:00
style.css.erb.backup20120913	Ray's changes for new backend	2012-09-14 02:38:56 +08:00
widget.css	Ray's changes for new backend	2012-09-14 02:38:56 +08:00
widgets.css	Ray's changes for new backend	2012-09-14 02:38:56 +08:00