Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config ...

Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

2012-11-26 17:55:53 +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

first version of confined sidebar render

2012-11-20 15:56:52 +08:00

parsers

Fix:

2012-11-21 18:42:14 +08:00

tasks

disable data transform when switching attribute field type. new member stable

2012-11-22 21:10:35 +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

first version of confined sidebar render

2012-11-20 15:56:52 +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 'various_bugs' into nccu_master

2012-10-29 16:10:07 +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