172 Commits

Author	SHA1	Message	Date
Christophe Vilayphiou	23d2d9a81e	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-08 17:36:35 +08:00
Christophe Vilayphiou	41424d2829	Fix error in front-end announcement index	2012-05-08 17:40:14 +08:00
Christophe Vilayphiou	ef9afca19f	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-08 17:28:05 +08:00
Christophe Vilayphiou	55bfaea43e	Can show announcement and news list by tag's key	2012-05-08 17:27:42 +08:00
Christophe Vilayphiou	d2e07f537a	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-08 17:24:40 +08:00
Christophe Vilayphiou	a3868cb785	Ray's changes for front-end banner	2012-05-08 17:21:26 +08:00
Matthew K. Fu JuYuan	7603cb91ad	Change subrole's context from code to text at approval setting.	2012-05-08 16:21:10 +08:00
Christophe Vilayphiou	caba8ce7a4	Add nccu icon ... Change news list in front-end Hide links and files in news and announcement front-end show when nothing	2012-05-08 15:27:43 +08:00
Christophe Vilayphiou	ba4385e3fd	Add module authorization for news ... Add files and links to announcement and news Change page.children into page.ordered_and_visible_children in parser_commom	2012-05-08 10:50:09 +08:00
Christophe Vilayphiou	ca88d0e01b	Fix bug that was never displaying preview	2012-05-07 17:29:56 +08:00
Christophe Vilayphiou	48f8fbde7f	Fix site_locale_default_head and active for current locale	2012-05-07 00:53:52 +08:00
Christophe Vilayphiou	f190ce18ee	Put sorting in web_link, page_context and design	2012-05-05 21:20:20 +08:00
Christophe Vilayphiou	e9b337a385	Copy changes into news after merge	2012-05-04 18:49:07 +08:00
Matthew K. Fu JuYuan	119d8ff13a	add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.	2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan	048ce4c97e	disable input	2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan	453cb21066	Announcement preivew	2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan	f427c3803f	clean up useless flash msgs. add i18n vars for app auth and object auth	2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan	05ded8de03	Fix for NCCU 0430 all functions ok with two submanagers but different behavors	2012-05-04 15:38:18 +08:00
Christophe Vilayphiou	92a53c1b27	Ray's fix	2012-05-02 16:20:59 +08:00
Christophe Vilayphiou	b8f52fa1ec	Separate announcement and news	2012-04-30 06:31:46 +08:00
Christophe Vilayphiou	63ee8eaca9	Remove url from sorting ... Add sorting_options to params in filters	2012-04-30 06:30:52 +08:00
Christophe Vilayphiou	32faef0c70	DRY code for sorting	2012-04-30 06:30:52 +08:00
Matthew K. Fu JuYuan	a46a8898d7	Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen	2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan	382932036d	Hide Approval button when bulletin is checked.	2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan	c4db7e2157	Fix approval setting ajax problem	2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan	94d61abf83	A modal view for approval user	2012-04-30 00:24:10 +08:00
Christophe Vilayphiou	851dc72f42	Ray's changes in css and html	2012-04-30 00:17:18 +08:00
Christophe Vilayphiou	bf2c89da54	Add sorting to web_links	2012-04-27 14:20:09 +08:00
Christophe Vilayphiou	3beb035101	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-27 11:11:56 +08:00
Christophe Vilayphiou	5aca3db95f	Ray's changes for structure and web_links	2012-04-27 11:02:56 +08:00
Christophe Vilayphiou	3d293f6419	Fix for quick edit file and link in announcement ... Change submit_button into ajax_for_submit	2012-04-26 16:42:28 +08:00
Christophe Vilayphiou	876036dd20	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/views/admin/ad_banners/_ad_banner_tab.html.erb	2012-04-25 16:39:26 +08:00
Christophe Vilayphiou	44ded537b3	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-25 16:28:34 +08:00
Christophe Vilayphiou	65a6f9c416	Ray's css fix for quick edit	2012-04-25 16:26:27 +08:00
Matthew K. Fu JuYuan	a704a054cc	Remove useless files	2012-04-25 16:10:11 +08:00
Christophe Vilayphiou	3ec8bb7be6	Fix assets bug: when having a '.' in the name, the extension must be specified	2012-04-25 15:10:28 +08:00
Christophe Vilayphiou	dc07964bc3	Fix js bug after Matt's changes in 'approval'	2012-04-24 17:10:23 +08:00
Christophe Vilayphiou	a47ef5cfe8	Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb	2012-04-24 16:45:13 +08:00
Matthew K. Fu JuYuan	db46803cda	R4-Billingual	2012-04-24 16:43:45 +08:00
Christophe Vilayphiou	c7d8e0b27b	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb	2012-04-24 16:32:00 +08:00
Christophe Vilayphiou	9f6c9156c6	Spen patch for nccu	2012-04-24 16:25:30 +08:00
Christophe Vilayphiou	291d5e3a03	Ray's changes in css	2012-04-24 16:24:50 +08:00
Matthew K. Fu JuYuan	d0ced39c74	R4-Billingual	2012-04-24 16:06:42 +08:00
Christophe Vilayphiou	d247f05d2e	Add missing translations in announcement and change announcement behavior for passed and rejected	2012-04-24 15:27:46 +08:00
Christophe Vilayphiou	c0abaa643c	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-24 15:21:12 +08:00
Christophe Vilayphiou	45c194e870	Ray's changes in css	2012-04-24 15:15:36 +08:00
Matthew K. Fu JuYuan	e7bb9ea86b	Fix ad image date selector	2012-04-24 14:37:06 +08:00
Christophe Vilayphiou	c856b4cdce	Fix for upload image component in announcement	2012-04-24 12:41:28 +08:00
Christophe Vilayphiou	8041452be5	Fix for translation in sort headers for announcement	2012-04-24 11:05:01 +08:00
Christophe Vilayphiou	6831a3dbbb	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-24 02:44:39 +08:00