Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu ...

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb

2013-01-08 14:17:21 +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

change journal list json link

2012-11-21 07:37:44 +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

orbit_app

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +08:00

parsers

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +08:00

tasks

clean default widget

2013-01-07 17:20:37 +08:00

template

Changes into page_part edition.

2012-02-16 13:09:09 +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

NewBlog.zip

update app package for previous commit

2012-01-24 12:28:32 +08:00

orbit_app.rb

put module app json into init,making orbit app work with module app.

2012-12-24 16:23:16 +08:00

orbit_basis.rb

address field. js and style is broken

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

orbit_controller_lib.rb

for openness

2012-11-20 20:20:59 +08:00

orbit_core_lib.rb

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +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