Commit Graph

2475 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan a9988a0d5c Change for interface,form. 2012-04-02 11:00:51 +08:00
Christophe Vilayphiou 7e922d8ed4 Fic bug from merge 2012-04-02 10:54:48 +08:00
Matthew K. Fu JuYuan 2fddfd367a Change for interface,form. 2012-04-02 10:50:39 +08:00
Christophe Vilayphiou 7f3ae19454 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
	lib/parsers/parser_back_end.rb
	lib/parsers/parser_front_end.rb
2012-04-02 03:06:25 +08:00
Matthew K. Fu JuYuan 8f28d45379 The new AdBanner. 2012-04-02 03:04:38 +08:00
Matthew K. Fu JuYuan b17cd7570f changing to new admin_layout 2012-04-02 02:58:02 +08:00
Matthew K. Fu JuYuan 928c642840 change layout from old admin to new_admin. not complete code 2012-04-02 02:58:01 +08:00
Christophe Vilayphiou a549fb71a0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-02 02:56:51 +08:00
Christophe Vilayphiou 9c1c70b598 Fix sorting in annoucement 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou 503f71e554 Ray's changes in tags, css and js 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou 6c50aa5243 Add pagination to bulletin index and remove ajax to make it simple 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou f7dafbc0cd Ray's changes in tags, css and js 2012-04-02 02:46:34 +08:00
Christophe Vilayphiou ecc789c248 Add missing load ofr meta folder 2012-04-02 02:45:23 +08:00
Christophe Vilayphiou 32519f308f Fix several bus when there is no design 2012-04-02 02:41:42 +08:00
Matthew K. Fu JuYuan 2747fc42f5 The new AdBanner. 2012-04-01 23:39:49 +08:00
Harry Bomrah bbd2c23b3d Themes fixed… 2012-03-30 18:06:06 +08:00
Christophe Vilayphiou 32b7d95669 Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +08:00
Harry Bomrah aa3997f7cf with notifications and other changes 2012-03-29 19:50:23 +08:00
Harry Bomrah 176597f5af Stupid theme 2012-03-29 15:23:48 +08:00
Christophe Vilayphiou 25c24c03f9 Add pagination to bulletin index and remove ajax to make it simple 2012-03-28 19:40:12 +08:00
Harry Bomrah 2e283a039d Desktop Commit 2012-03-28 18:53:30 +08:00
Harry Bomrah 4798cd43c1 Desktop commit 2012-03-28 18:53:06 +08:00
Christophe Vilayphiou e7fdcfffa0 Fix sidebar 2012-03-28 12:12:23 +08:00
Christophe Vilayphiou fd26b7cd90 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-03-28 11:31:23 +08:00
Christophe Vilayphiou d6e4da6dad Ray's fix for margin-top 2012-03-28 11:31:07 +08:00
Christophe Vilayphiou 649f343e6f Ray's fix for margin-top 2012-03-28 11:17:59 +08:00
Christophe Vilayphiou c645c1b5df Remove extra code in bulletin form 2012-03-28 10:51:14 +08:00
Christophe Vilayphiou 172d3d7847 Remove bad references to NewBlog 2012-03-27 19:42:07 +08:00
Christophe Vilayphiou 212730fd8a Add missing end tag in bulletin _form 2012-03-27 19:37:47 +08:00
Christophe Vilayphiou b587b7ca6b Remove limit(1) to bulletins index action 2012-03-27 19:22:50 +08:00
Christophe Vilayphiou 5aad133b6c Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_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/_bulletin_link_qe.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
2012-03-27 19:15:13 +08:00
Christophe Vilayphiou 50be40f7b3 Ray's changes in announcenment back-end 2012-03-27 19:10:35 +08:00
Matt Fu 1e60acaa11 Fact check program completed,Lin checked 2012-03-27 19:06:28 +08:00
Christophe Vilayphiou 77f53cfd6b Merge branch 'nokogiri' of github.com:Rulingcom/orbit into nokogiri 2012-03-27 19:00:26 +08:00
Christophe Vilayphiou 717e50a25e Add rake task for layout with nokogiri 2012-03-27 19:00:03 +08:00
Christophe Vilayphiou c5f6dbc1c4 Nokogiri in parsers 2012-03-27 19:00:03 +08:00
Christophe Vilayphiou 0f60ab9fc2 Add ad_banner to nokogiri 2012-03-27 18:58:48 +08:00
Christophe Vilayphiou 7eff06a378 Trying nokogiri 2012-03-27 18:58:48 +08:00
Christophe Vilayphiou cf297fc424 Changed inherited controller in module_apps to OrbitBackendController 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou d02bbdbaa5 Nokogiri in parsers 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou b134e690e9 Delete new_blog 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou 07ba457dd7 admin now can post without fact check 2012-03-27 18:58:03 +08:00
Christophe Vilayphiou 55d12e50f2 Ray's changes in announcenment back-end 2012-03-27 18:58:03 +08:00
Christophe Vilayphiou 97adf94e15 fix with what ray needs for the fact_check form 2012-03-27 18:56:18 +08:00
Matt Fu 3ba89ecbcf Fact check program completed,Lin checked 2012-03-27 18:54:03 +08:00
Christophe Vilayphiou 7efaddf57c Add ad_banner to nokogiri 2012-03-27 18:42:22 +08:00
Christophe Vilayphiou f5fd3dec7a Trying nokogiri 2012-03-27 18:42:22 +08:00
Christophe Vilayphiou f9c5ee5d18 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
Christophe Vilayphiou 48d1d45ced Nokogiri in parsers 2012-03-27 17:57:50 +08:00
Matthew K. Fu JuYuan 1451c3ac1d changing to new admin_layout 2012-03-27 15:34:21 +08:00