saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/lib
History
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
..
ad_banner Add rake task for ad_banner. Will have ad_banner at dev:build 2012-02-04 09:37:23 +08:00
desktopapp test 2012-06-26 16:59:29 +08:00
fraisier fix announcement & add lang tab 2012-04-05 15:23:20 +08:00
noko Add rake task for layout with nokogiri 2012-03-27 19:00:03 +08:00
parsers Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
tasks 1.Remove category column when category is specified 2012-08-08 14:46:08 +08:00
template Changes into page_part edition. 2012-02-16 13:09:09 +08:00
NewBlog.zip update app package for previous commit 2012-01-24 12:28:32 +08:00
central_server_exchange_app.rb Integration of module_app workflow 2011-11-19 14:33:26 +08:00
github_app.rb Update source: pull from git 2011-08-23 15:01:22 +08:00
main_public_key.pem Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
orbit_basis.rb Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
orbit_controller_lib.rb category disable for backend 2012-07-06 18:11:55 +08:00
orbit_core_lib.rb fix for not displaying bulletin at fronted when it's parent category is disable 2012-07-11 17:17:44 +08:00
orbit_search_lib.rb Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
resque_ext.rb Add this toolbar, and nccu calendar fix 2012-06-04 16:51:29 +08:00