developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/app/assets/stylesheets
History
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
 		2012-10-29 16:10:07 +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 Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +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 for user new interface, member role is working. 2012-10-26 11:27:37 +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.erb publication adjustment 2012-07-09 10:44:01 +08:00
orbitTimeline111.css Calendar updates for day view 2012-10-26 11:15:37 +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 for user new interface, member role is working. 2012-10-26 11:27:37 +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 Changes for side_bar 2012-10-26 11:19:56 +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 Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
style.css.erb.backup20120913 Ray's changes for new backend 2012-09-14 02:38:56 +08:00
tinymce_orbit.css devin's css for tinymce 2012-09-28 09:58:28 +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