|  Christophe Vilayphiou | 0b0916179f | Change assets | 2012-05-16 11:07:11 +08:00 | 
				
					
						|  Christophe Vilayphiou | f950f77f36 | Merge branch 'design_team' into ldap Conflicts:
	Gemfile
	app/models/ad_banner.rb | 2012-05-15 23:02:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | 42881553a8 | Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team | 2012-05-15 22:48:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | 5e9b55e08e | Ray took out 'default' tags | 2012-05-15 22:47:28 +08:00 | 
				
					
						|  Christophe Vilayphiou | 3462c0e319 | Add each page name to page_context index | 2012-05-15 21:31:54 +08:00 | 
				
					
						|  Christophe Vilayphiou | e54f4409fb | Add impressionist | 2012-05-15 21:26:09 +08:00 | 
				
					
						|  Christophe Vilayphiou | 59b55d1574 | Merge branch 'design_team' into ldap | 2012-05-14 12:42:06 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 9ba4c2cf2f | Change to apply page to had object_auth | 2012-05-14 12:40:50 +08:00 | 
				
					
						|  Christophe Vilayphiou | ebc8dd33ec | Merge branch 'design_team' into ldap Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json | 2012-05-14 00:57:17 +08:00 | 
				
					
						|  Christophe Vilayphiou | 039e837fff | Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Conflicts:
	app/views/admin/object_auths_new_interface/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb | 2012-05-14 00:51:53 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | b804ba4d96 | Fix for manager and admin can see all post in announcement. Haven't applied to news | 2012-05-14 00:50:36 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 7a6d30ad62 | Remove unless files and change routes. | 2012-05-14 00:50:36 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0119ab1a74 | New Interface for App Auth and Object Auth | 2012-05-14 00:50:12 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 8b42c595b3 | Don't display admin in any premission select. Fix not necessary header for UT data | 2012-05-14 00:49:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | e40c76bf5f | Fix new page form Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json | 2012-05-13 23:48:34 +08:00 | 
				
					
						|  Christophe Vilayphiou | 62e9a772f6 | Fix titles for widgets Add translations | 2012-05-13 23:09:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4ae8299949 | Add custom title to widgets Fix pagination conflict with main_content and widgets | 2012-05-13 22:35:00 +08:00 | 
				
					
						|  Christophe Vilayphiou | 281cfa6518 | Changes for widgets | 2012-05-13 21:55:39 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | e696516aae | Fix for manager and admin can see all post in announcement. Haven't applied to news | 2012-05-11 17:07:21 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0a34f0277e | Remove unless files and change routes. | 2012-05-11 16:46:36 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 20a1a6e30f | New Interface for App Auth and Object Auth | 2012-05-11 16:44:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | 6a443f0976 | Add mongoid-tree to Item | 2012-05-11 16:16:09 +08:00 | 
				
					
						|  Christophe Vilayphiou | 63f904d3b0 | Fix tinymce js load Change to full_name for page_context index | 2012-05-10 20:36:19 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 4f1e47bb82 | Don't display admin in any premission select. Fix not necessary header for UT data | 2012-05-10 14:43:05 +08:00 | 
				
					
						|  Christophe Vilayphiou | 87449ec6a8 | Merge branch 'design_team' into ldap | 2012-05-10 10:34:28 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 07815eee8f | fix display for announcement and remove ut field | 2012-05-10 10:29:18 +08:00 | 
				
					
						|  Christophe Vilayphiou | 99c4e94729 | Fix for home_list widget | 2012-05-10 10:28:29 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f13e006e4d | fix display for announcement and remove ut field | 2012-05-10 10:27:01 +08:00 | 
				
					
						|  Christophe Vilayphiou | 64effbd83c | Remove extra widgets declaration | 2012-05-10 00:41:32 +08:00 | 
				
					
						|  Christophe Vilayphiou | de739d7d20 | Merge branch 'design_team' into ldap Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json | 2012-05-10 00:34:23 +08:00 | 
				
					
						|  Christophe Vilayphiou | bc5e975fab | Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team | 2012-05-10 00:29:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | 13587306bc | Add list widgets for announcement, news and links with categories and tags | 2012-05-10 00:25:30 +08:00 | 
				
					
						|  Christophe Vilayphiou | 6727f27181 | Change for 0509 Nccu check | 2012-05-09 16:58:12 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 9a6b66c57d | Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 | 2012-05-09 15:54:59 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 93946c37f4 | fix wrong link | 2012-05-09 15:54:00 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a9c241658a | Repeat code for news module | 2012-05-09 15:28:02 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | c82d701b55 | Permission setting for announcement for bulletin cate | 2012-05-09 15:28:02 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 618e4f4047 | Repeat code for news module | 2012-05-09 15:22:15 +08:00 | 
				
					
						|  Christophe Vilayphiou | 1785da51a2 | Merge branch 'design_team' into ldap | 2012-05-09 15:04:06 +08:00 | 
				
					
						|  Christophe Vilayphiou | 50edfdd02f | Changes for tag key in side_bar announcement and news, fix ad_banner css for dot | 2012-05-09 14:59:06 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 71a5731fe8 | Permission setting for announcement for bulletin cate | 2012-05-09 14:54:20 +08:00 | 
				
					
						|  Christophe Vilayphiou | d88d4e58dc | Merge branch 'design_team' into ldap Conflicts:
	config/environments/development.rb | 2012-05-09 13:51:00 +08:00 | 
				
					
						|  Christophe Vilayphiou | 9ead6cafda | Ray's changes | 2012-05-09 04:15:02 +08:00 | 
				
					
						|  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 | 2b9190a49e | Merge branch 'design_team' into ldap Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb | 2012-05-08 11:40:38 +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 | 2aaff21000 | Add missing class in widget news_bulletin/index | 2012-05-07 23:23:17 +08:00 | 
				
					
						|  Christophe Vilayphiou | ca88d0e01b | Fix bug that was never displaying preview | 2012-05-07 17:29:56 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4c7a3842d6 | Add drop_down to news_bulletin widget index for categories | 2012-05-07 15:58:52 +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 | b48099d752 | Fix bug in is_admin? Fix bug in helpers for news and announcement | 2012-05-05 17:40:07 +08:00 | 
				
					
						|  Christophe Vilayphiou | 8e6fd277c2 | Fix bug: preview was always true | 2012-05-04 19:02:40 +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 | 20504b2205 | Merge branch 'design_team' into ldap Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb | 2012-04-30 07:57:20 +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 | 2362e1cfdd | Merge branch 'design_team' into ldap | 2012-04-27 15:28:32 +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 | 7d6b82d9dd | Merge branch 'ad_banner' into ldap | 2012-04-26 17:15:44 +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 | 1f4fe65430 | Merge branch 'design_team' into ldap Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb | 2012-04-25 16:45:04 +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 | 8adb9c6878 | Merge branch 'design_team' into ldap | 2012-04-25 15:10:50 +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 | c65213c4f1 | Merge branch 'design_team' into ldap | 2012-04-24 17:10:34 +08:00 | 
				
					
						|  Christophe Vilayphiou | dc07964bc3 | Fix js bug after Matt's changes in 'approval' | 2012-04-24 17:10:23 +08:00 | 
				
					
						|  Christophe Vilayphiou | 0c4f1d91f7 | Merge branch 'ad_banner' into ldap | 2012-04-24 16:46:04 +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 | d1f687e43e | Merge branch 'design_team' into ldap | 2012-04-24 16:32:30 +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 | 17e55b9805 | Merge branch 'design_team' into ldap | 2012-04-24 16:25:58 +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 | 70f6c7b540 | Merge branch 'design_team' into ldap Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb | 2012-04-24 15:28:52 +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 | 308cfc7cf2 | Merge branch 'design_team' into ldap Conflicts:
	app/views/devise/sessions/new.html.erb | 2012-04-24 02:46:06 +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 | 
				
					
						|  Christophe Vilayphiou | 0c4328987a | Ray's changes for css files, sort headers in announcement and pagination | 2012-04-24 02:37:51 +08:00 | 
				
					
						|  Christophe Vilayphiou | d4aea664e2 | Merge branch 'design_team' into ldap Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb | 2012-04-24 02:37:03 +08:00 | 
				
					
						|  Christophe Vilayphiou | a748ccaac7 | Patch from ldap for announcement translation | 2012-04-24 02:33:35 +08:00 | 
				
					
						|  Christophe Vilayphiou | db1b84e962 | Fix bug where an rejected announcement could still be edited by url | 2012-04-24 00:58:56 +08:00 | 
				
					
						|  Christophe Vilayphiou | 6130f8b1e4 | Fix errors in status filter in announcement | 2012-04-24 00:53:05 +08:00 | 
				
					
						|  Christophe Vilayphiou | b502bedd0f | Fix filter and sort for status in announcement | 2012-04-24 00:46:34 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4f87165039 | Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap | 2012-04-23 18:10:16 +08:00 | 
				
					
						|  Matt | a8eeaf235f | Add Announcement translation | 2012-04-23 15:28:56 +08:00 | 
				
					
						|  Christophe Vilayphiou | 5a423178e3 | Merge branch 'design_team' into ldap Conflicts:
	app/assets/stylesheets/new_admin.css.erb
	app/assets/stylesheets/widget.css | 2012-04-23 15:16:50 +08:00 | 
				
					
						|  Christophe Vilayphiou | 1ebf460f7e | Fix 'loading fail' in front-end for announcement The show action was returning an array instead of a bulletin | 2012-04-23 14:47:33 +08:00 | 
				
					
						|  nccu | fe9032787c | NCCU ldap debug | 2012-04-23 10:13:44 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 7e355b77c2 | Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	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/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb | 2012-04-19 14:31:05 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f55b3a4374 | Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	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/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb | 2012-04-19 14:06:00 +08:00 | 
				
					
						|  Christophe Vilayphiou | 198825a309 | Merge branch 'master' into ldap Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb | 2012-04-12 18:50:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | 167f6d07a0 | Remove extra "]" | 2012-04-12 18:13:26 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | e4c41ab54c | A filter UI for permission select. with Harry's JS | 2012-04-12 07:14:06 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0909156eb4 | fix i18n var for fact check pending | 2012-04-12 07:14:06 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 1fd38c8135 | factcheck status for and | 2012-04-12 07:14:06 +08:00 | 
				
					
						|  Christophe Vilayphiou | 5417c6fec0 | Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb | 2012-04-12 07:13:13 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7bca339a5b | Ray's fix for columns width in bulletins | 2012-04-12 07:01:34 +08:00 | 
				
					
						|  Christophe Vilayphiou | 486845460c | Filter and delete for bulletins | 2012-04-12 06:50:36 +08:00 | 
				
					
						|  Christophe Vilayphiou | 963a0cb604 | Change filter to js with history for bulletins | 2012-04-07 00:20:52 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 01bda515a6 | fact_check with Ray's permission check. needs Ray's new css | 2012-04-05 17:41:43 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4da03026a4 | Fix pagination bug in bulletins | 2012-04-05 15:28:43 +08:00 | 
				
					
						|  Christophe Vilayphiou | 5f5871d1c2 | Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb | 2012-04-05 15:24:39 +08:00 | 
				
					
						|  unknown | d45725cf3b | fix announcement & add lang tab | 2012-04-05 15:23:20 +08:00 | 
				
					
						|  unknown | 9382ef6ae8 | Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard Conflicts:
	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/_form.html.erb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb | 2012-04-05 15:16:33 +08:00 | 
				
					
						|  Christophe Vilayphiou | 1259d62249 | Fix mainTablePosition in js -> remove the notable class | 2012-04-05 14:55:41 +08:00 | 
				
					
						|  unknown | ccb0110b77 | fix announcement & add lang tab | 2012-04-05 14:48:31 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7bf50d6c52 | Move the audit block to the bottom | 2012-04-05 14:08:03 +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 | 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 | 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 | cf297fc424 | Changed inherited controller in module_apps to OrbitBackendController | 2012-03-27 18:58:04 +08:00 | 
				
					
						|  Christophe Vilayphiou | b134e690e9 | Delete new_blog | 2012-03-27 18:58:04 +08:00 |