9759a32394 
								
							 
						 
						
							
							
								
								can display relation between author  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								49d1ca6997 
								
							 
						 
						
							
							
								
								new type fixed  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								 
						
							
								e143f9a345 
								
							 
						 
						
							
							
								
								can select relection from relation db  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								 
						
							
								0affc73370 
								
							 
						 
						
							
							
								
								modify delete co-author message  
							
							
							
						 
						
							2012-12-04 00:31:07 +08:00  
				
					
						
							
							
								 
						
							
								7822ffc33d 
								
							 
						 
						
							
							
								
								can add relation between co-author  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								5dabfe9319 
								
							 
						 
						
							
							
								
								refine co-authro page  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								5986817e16 
								
							 
						 
						
							
							
								
								add journal_list. now, those pair, (journal_title, journal_levels), is uniq  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								184f903b1c 
								
							 
						 
						
							
							
								
								correct user passwd and sent json to front-end  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								7f7b33f310 
								
							 
						 
						
							
							
								
								fixed journal update method  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								ee830f148e 
								
							 
						 
						
							
							
								
								jumping menus updated..  
							
							
							
						 
						
							2012-12-04 00:30:10 +08:00  
				
					
						
							
							
								 
						
							
								5a9d9151d9 
								
							 
						 
						
							
							
								
								add journal list template  
							
							
							
						 
						
							2012-12-04 00:25:58 +08:00  
				
					
						
							
							
								 
						
							
								dc3be3c9a1 
								
							 
						 
						
							
							
								
								Translation changes  
							
							
							
						 
						
							2012-12-03 23:00:04 +08:00  
				
					
						
							
							
								 
						
							
								036d7bbb0e 
								
							 
						 
						
							
							
								
								Module store  
							
							
							
						 
						
							2012-11-29 02:02:37 +08:00  
				
					
						
							
							
								 
						
							
								06335f9bd1 
								
							 
						 
						
							
							
								
								Joshua's html  
							
							
							
						 
						
							2012-11-29 00:59:46 +08:00  
				
					
						
							
							
								 
						
							
								0125010a05 
								
							 
						 
						
							
							
								
								modified error msgs and cancle button, but those two have bug...  
							
							
							
						 
						
							2012-11-26 15:45:51 +08:00  
				
					
						
							
							
								 
						
							
								065d38c797 
								
							 
						 
						
							
							
								
								add autocomplete js  
							
							
							
						 
						
							2012-11-26 14:44:35 +08:00  
				
					
						
							
							
								 
						
							
								8a79d7ff2e 
								
							 
						 
						
							
							
								
								member selects  
							
							
							
						 
						
							2012-11-26 10:25:34 +08:00  
				
					
						
							
							
								 
						
							
								9061448c5f 
								
							 
						 
						
							
							
								
								add paper status textfield  
							
							
							
						 
						
							2012-11-26 10:23:50 +08:00  
				
					
						
							
							
								 
						
							
								9a684f54b4 
								
							 
						 
						
							
							
								
								fix for showing subroles  
							
							
							
						 
						
							2012-11-26 10:22:36 +08:00  
				
					
						
							
							
								 
						
							
								1e89c30150 
								
							 
						 
						
							
							
								
								Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP  
							
							
							
						 
						
							2012-11-26 05:02:58 +08:00  
				
					
						
							
							
								 
						
							
								3933c048b0 
								
							 
						 
						
							
							
								
								delete fixed  
							
							
							
						 
						
							2012-11-23 13:22:01 +08:00  
				
					
						
							
							
								 
						
							
								8009c6aa34 
								
							 
						 
						
							
							
								
								fixed delete function  
							
							
							
						 
						
							2012-11-23 12:28:36 +08:00  
				
					
						
							
							
								 
						
							
								996a69f595 
								
							 
						 
						
							
							
								
								add co-author json  
							
							
							
						 
						
							2012-11-23 10:44:48 +08:00  
				
					
						
							
							
								 
						
							
								5b39d10ac6 
								
							 
						 
						
							
							
								
								user roles starts  
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
				
					
						
							
							
								 
						
							
								77386f0284 
								
							 
						 
						
							
							
								
								disable data transform when switching attribute field type. new member stable  
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
				
					
						
							
							
								 
						
							
								e29583ed1f 
								
							 
						 
						
							
							
								
								add delete link  
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
				
					
						
							
							
								 
						
							
								78500e0661 
								
							 
						 
						
							
							
								
								fixed add journal and co-author curd problem, but have redirect problem...  
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
				
					
						
							
							
								 
						
							
								c281ae9447 
								
							 
						 
						
							
							
								
								hidden file field, and fixed updated function  
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
				
					
						
							
							
								 
						
							
								e453cfce9c 
								
							 
						 
						
							
							
								
								add delete link  
							
							
							
						 
						
							2012-11-22 15:21:43 +08:00  
				
					
						
							
							
								 
						
							
								c0ac69fc84 
								
							 
						 
						
							
							
								
								Merge branch 'make_jsFunc_for_journalP' of  https://github.com/Rulingcom/orbit  into make_jsFunc_for_journalP  
							
							... 
							
							
							
							* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit :
  calendar js minor update
  Fix:   - Widgets for announcement   - Facebook link   - AdBanner nav
  visitor now can browse gallery
  routes fixed
  small fix for journal_pages desktop
  new file created for journal pages
  tmp
  add co-author db and curd page, but it can't destory it...
  add co-author page and new it, but can't destory it...
  visitor now can browse gallery
  done add journals function
  fix and hide for visitors,except for album
  album and gallery is now opened
  fixed sutpid bug for calendar
  back button fix for frontend
  fix and hide for visitors,except for album
  calendar js minor update
  minor update for gallery and calendar backend 
							
						 
						
							2012-11-22 10:51:30 +08:00  
				
					
						
							
							
								 
						
							
								9e400e6e6a 
								
							 
						 
						
							
							
								
								fixed add journal and co-author curd problem, but have redirect problem...  
							
							
							
						 
						
							2012-11-22 10:49:54 +08:00  
				
					
						
							
							
								 
						
							
								39adbb35c1 
								
							 
						 
						
							
							
								
								Remove before_filter for sub_manager in users  
							
							
							
						 
						
							2012-11-22 09:37:31 +08:00  
				
					
						
							
							
								 
						
							
								475642d375 
								
							 
						 
						
							
							
								
								Remove news and fix default_url in ImageUploader  
							
							
							
						 
						
							2012-11-22 09:30:25 +08:00  
				
					
						
							
							
								 
						
							
								bb69a059e8 
								
							 
						 
						
							
							
								
								hidden file field, and fixed updated function  
							
							
							
						 
						
							2012-11-22 02:37:56 +08:00  
				
					
						
							
							
								 
						
							
								c53581c999 
								
							 
						 
						
							
							
								
								small fix for journal_pages desktop  
							
							
							
						 
						
							2012-11-21 18:36:56 +08:00  
				
					
						
							
							
								 
						
							
								b47be52309 
								
							 
						 
						
							
							
								
								tmp  
							
							
							
						 
						
							2012-11-21 18:36:56 +08:00  
				
					
						
							
							
								 
						
							
								d502f561ef 
								
							 
						 
						
							
							
								
								add co-author db and curd page, but it can't destory it...  
							
							
							
						 
						
							2012-11-21 18:36:32 +08:00  
				
					
						
							
							
								 
						
							
								6a9426c9c8 
								
							 
						 
						
							
							
								
								add co-author page and new it, but can't destory it...  
							
							
							
						 
						
							2012-11-21 18:36:32 +08:00  
				
					
						
							
							
								 
						
							
								5006cd2f61 
								
							 
						 
						
							
							
								
								done add journals function  
							
							
							
						 
						
							2012-11-21 18:34:03 +08:00  
				
					
						
							
							
								 
						
							
								1279af0c11 
								
							 
						 
						
							
							
								
								fix and hide for visitors,except for album  
							
							
							
						 
						
							2012-11-21 18:31:57 +08:00  
				
					
						
							
							
								 
						
							
								c94940214c 
								
							 
						 
						
							
							
								
								small fix for journal_pages desktop  
							
							
							
						 
						
							2012-11-21 17:11:18 +08:00  
				
					
						
							
							
								 
						
							
								5c0b137c6d 
								
							 
						 
						
							
							
								
								tmp  
							
							
							
						 
						
							2012-11-21 14:52:26 +08:00  
				
					
						
							
							
								 
						
							
								da1b871481 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2012-11-21 10:46:33 +08:00  
				
					
						
							
							
								 
						
							
								8f65284932 
								
							 
						 
						
							
							
								
								Desktop updates various  
							
							
							
						 
						
							2012-11-21 07:37:44 +08:00  
				
					
						
							
							
								 
						
							
								d7599f1ccf 
								
							 
						 
						
							
							
								
								add edit function  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								5eb8cc4063 
								
							 
						 
						
							
							
								
								finished some method of list and journal  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								ae10a2b8a2 
								
							 
						 
						
							
							
								
								convert html template to html.erb  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								bf4c75fcdc 
								
							 
						 
						
							
							
								
								add new function  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								f93d019ba0 
								
							 
						 
						
							
							
								
								check file type  
							
							
							
						 
						
							2012-11-21 07:37:42 +08:00  
				
					
						
							
							
								 
						
							
								97ffb5ff18 
								
							 
						 
						
							
							
								
								file view update  
							
							
							
						 
						
							2012-11-21 07:37:42 +08:00  
				
					
						
							
							
								 
						
							
								02643c12bf 
								
							 
						 
						
							
							
								
								modified getjournals format  
							
							
							
						 
						
							2012-11-21 07:37:41 +08:00  
				
					
						
							
							
								 
						
							
								4ce10d2fd9 
								
							 
						 
						
							
							
								
								make a json format for view of journal_p  
							
							
							
						 
						
							2012-11-21 07:37:41 +08:00  
				
					
						
							
							
								 
						
							
								95fc5676bf 
								
							 
						 
						
							
							
								
								add co-author db and curd page, but it can't destory it...  
							
							
							
						 
						
							2012-11-21 01:56:30 +08:00  
				
					
						
							
							
								 
						
							
								ccfecb8243 
								
							 
						 
						
							
							
								
								add co-author page and new it, but can't destory it...  
							
							
							
						 
						
							2012-11-21 01:54:06 +08:00  
				
					
						
							
							
								 
						
							
								6273300c28 
								
							 
						 
						
							
							
								
								Fix for ad_image  
							
							
							
						 
						
							2012-11-20 15:47:07 +08:00  
				
					
						
							
							
								 
						
							
								95a3831dce 
								
							 
						 
						
							
							
								
								done add journals function  
							
							
							
						 
						
							2012-11-20 14:58:15 +08:00  
				
					
						
							
							
								 
						
							
								7416020161 
								
							 
						 
						
							
							
								
								Add force_order_for_user for ad_images  
							
							
							
						 
						
							2012-11-20 14:24:49 +08:00  
				
					
						
							
							
								 
						
							
								dcd781b36b 
								
							 
						 
						
							
							
								
								Restore "force_order_for_user" for ad_banner  
							
							
							
						 
						
							2012-11-20 12:38:35 +08:00  
				
					
						
							
							
								 
						
							
								d61621e198 
								
							 
						 
						
							
							
								
								Remove some pry and add address code  
							
							
							
						 
						
							2012-11-20 10:05:38 +08:00  
				
					
						
							
							
								 
						
							
								6789d44431 
								
							 
						 
						
							
							
								
								Fix design edit  
							
							
							
						 
						
							2012-11-20 10:04:50 +08:00  
				
					
						
							
							
								 
						
							
								2aa9a19deb 
								
							 
						 
						
							
							
								
								complete address field. still have javascript issue for fill back and display address ext fields in modal.  
							
							
							
						 
						
							2012-11-20 09:53:37 +08:00  
				
					
						
							
							
								 
						
							
								17988f2fb2 
								
							 
						 
						
							
							
								
								address field and text field convert  
							
							
							
						 
						
							2012-11-20 09:53:37 +08:00  
				
					
						
							
							
								 
						
							
								be448d42c9 
								
							 
						 
						
							
							
								
								add_more ok  
							
							
							
						 
						
							2012-11-20 09:52:50 +08:00  
				
					
						
							
							
								 
						
							
								8abb20b4c8 
								
							 
						 
						
							
							
								
								add edit function  
							
							
							
						 
						
							2012-11-19 12:07:24 +08:00  
				
					
						
							
							
								 
						
							
								26436395f5 
								
							 
						 
						
							
							
								
								finished some method of list and journal  
							
							
							
						 
						
							2012-11-18 03:07:50 +08:00  
				
					
						
							
							
								 
						
							
								b51397d2e2 
								
							 
						 
						
							
							
								
								convert html template to html.erb  
							
							
							
						 
						
							2012-11-16 12:54:21 +08:00  
				
					
						
							
							
								 
						
							
								c85b15e425 
								
							 
						 
						
							
							
								
								rm binding.pre ...  
							
							
							
						 
						
							2012-11-16 09:44:57 +08:00  
				
					
						
							
							
								 
						
							
								bf5a48ef4c 
								
							 
						 
						
							
							
								
								add new function  
							
							
							
						 
						
							2012-11-16 01:53:45 +08:00  
				
					
						
							
							
								 
						
							
								3144b84d10 
								
							 
						 
						
							
							
								
								check file type  
							
							
							
						 
						
							2012-11-15 22:39:01 +08:00  
				
					
						
							
							
								 
						
							
								fb74d74c72 
								
							 
						 
						
							
							
								
								Fix:  
							
							... 
							
							
							
							- page_part not including items_helper
  - categories for bulletins front-end 
							
						 
						
							2012-11-15 18:01:49 +08:00  
				
					
						
							
							
								 
						
							
								9b1ada0af9 
								
							 
						 
						
							
							
								
								Fix these bugs:  
							
							... 
							
							
							
							1.結構部份
    a.原選單,點選編輯,無動作反應
    b.新增選單後,左邊灰色架構部份不會更新
  2.檔案室
    a.無法編輯分類 
							
						 
						
							2012-11-15 15:51:44 +08:00  
				
					
						
							
							
								 
						
							
								351767cd98 
								
							 
						 
						
							
							
								
								file view update  
							
							
							
						 
						
							2012-11-14 21:12:10 +08:00  
				
					
						
							
							
								 
						
							
								529e2110d7 
								
							 
						 
						
							
							
								
								modified getjournals format  
							
							
							
						 
						
							2012-11-14 17:27:36 +08:00  
				
					
						
							
							
								 
						
							
								bfdd155c1e 
								
							 
						 
						
							
							
								
								make a json format for view of journal_p  
							
							
							
						 
						
							2012-11-13 17:21:23 +08:00  
				
					
						
							
							
								 
						
							
								a56d80698f 
								
							 
						 
						
							
							
								
								desktop api update..  
							
							
							
						 
						
							2012-11-12 15:11:36 +08:00  
				
					
						
							
							
								 
						
							
								b40d4702d5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into various_bugs  
							
							... 
							
							
							
							Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb 
							
						 
						
							2012-11-06 11:44:00 +08:00  
				
					
						
							
							
								 
						
							
								da5e7f670e 
								
							 
						 
						
							
							
								
								Desktop Widgtes updates..  
							
							
							
						 
						
							2012-11-06 10:36:34 +08:00  
				
					
						
							
							
								 
						
							
								ca3e06c58b 
								
							 
						 
						
							
							
								
								update for desktop widgets  
							
							
							
						 
						
							2012-11-05 11:40:11 +08:00  
				
					
						
							
							
								 
						
							
								58d4554b0b 
								
							 
						 
						
							
							
								
								Fixing bugs  
							
							
							
						 
						
							2012-11-05 11:30:15 +08:00  
				
					
						
							
							
								 
						
							
								beb843f75b 
								
							 
						 
						
							
							
								
								add new member with role interface. add more not usable.  
							
							... 
							
							
							
							role management new attribute is ok. delete is ok. 
							
						 
						
							2012-11-04 20:42:58 +08:00  
				
					
						
							
							
								 
						
							
								bc9082a858 
								
							 
						 
						
							
							
								
								Fix bug: Fix the bug due to not finding the ModuleApp  
							
							
							
						 
						
							2012-10-30 17:10:59 +08:00  
				
					
						
							
							
								 
						
							
								65ac6980c4 
								
							 
						 
						
							
							
								
								Merge branch 'various_bugs' into nccu_master  
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_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/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb 
							
						 
						
							2012-10-29 16:10:07 +08:00  
				
					
						
							
							
								 
						
							
								9b5f4e4775 
								
							 
						 
						
							
							
								
								Fix bug: User cannot connect using the orbit button (Devise configuration)  
							
							
							
						 
						
							2012-10-26 17:42:14 +08:00  
				
					
						
							
							
								 
						
							
								bd0d975014 
								
							 
						 
						
							
							
								
								for user new interface, member  role is working.  
							
							
							
						 
						
							2012-10-26 11:27:37 +08:00  
				
					
						
							
							
								 
						
							
								2b2dd53218 
								
							 
						 
						
							
							
								
								Edit uploaded package  
							
							
							
						 
						
							2012-10-24 18:40:38 +08:00  
				
					
						
							
							
								 
						
							
								13ae2602cd 
								
							 
						 
						
							
							
								
								member for THU  
							
							
							
						 
						
							2012-10-18 18:36:21 +08:00  
				
					
						
							
							
								 
						
							
								6dfe10040b 
								
							 
						 
						
							
							
								
								fix object auth without app_auth  
							
							
							
						 
						
							2012-10-16 14:23:44 +08:00  
				
					
						
							
							
								 
						
							
								0babd5f302 
								
							 
						 
						
							
							
								
								Changes for side_bar  
							
							
							
						 
						
							2012-10-15 15:30:48 +08:00  
				
					
						
							
							
								 
						
							
								7901de7b31 
								
							 
						 
						
							
							
								
								can add member  
							
							
							
						 
						
							2012-10-15 13:54:29 +08:00  
				
					
						
							
							
								 
						
							
								b5571dbc43 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							... 
							
							
							
							Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb 
							
						 
						
							2012-10-12 18:17:05 +08:00  
				
					
						
							
							
								 
						
							
								1ce7f00084 
								
							 
						 
						
							
							
								
								new code for attribute fields and values for new member interface  
							
							
							
						 
						
							2012-10-12 18:09:02 +08:00  
				
					
						
							
							
								 
						
							
								189fa553c5 
								
							 
						 
						
							
							
								
								Changes for helpers, not including all by default  
							
							
							
						 
						
							2012-10-09 14:47:16 +08:00  
				
					
						
							
							
								 
						
							
								9f825de288 
								
							 
						 
						
							
							
								
								user new interface 70%  
							
							
							
						 
						
							2012-10-09 06:40:18 +08:00  
				
					
						
							
							
								 
						
							
								e16a27601d 
								
							 
						 
						
							
							
								
								user new interface 70%  
							
							
							
						 
						
							2012-10-08 16:58:33 +08:00  
				
					
						
							
							
								 
						
							
								e67ca84282 
								
							 
						 
						
							
							
								
								object_auth change to reload  
							
							
							
						 
						
							2012-10-04 18:20:21 +08:00  
				
					
						
							
							
								 
						
							
								54b874b2c9 
								
							 
						 
						
							
							
								
								fix nccu login  
							
							
							
						 
						
							2012-09-25 15:07:07 +08:00  
				
					
						
							
							
								 
						
							
								fb3364b28e 
								
							 
						 
						
							
							
								
								Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config  
							
							
							
						 
						
							2012-09-24 14:14:13 +08:00  
				
					
						
							
							
								 
						
							
								975523c8b2 
								
							 
						 
						
							
							
								
								demo site plugin  
							
							
							
						 
						
							2012-09-24 14:10:44 +08:00  
				
					
						
							
							
								 
						
							
								3a65f599e6 
								
							 
						 
						
							
							
								
								first version app config for Spen  durning Chris's leave.  
							
							
							
						 
						
							2012-09-24 11:43:48 +08:00  
				
					
						
							
							
								 
						
							
								bdd5a1a047 
								
							 
						 
						
							
							
								
								Changes for i18n yml  
							
							
							
						 
						
							2012-09-24 09:02:45 +08:00  
				
					
						
							
							
								 
						
							
								8b68387199 
								
							 
						 
						
							
							
								
								fix share loading failed  
							
							
							
						 
						
							2012-09-19 15:09:08 +08:00  
				
					
						
							
							
								 
						
							
								d480a10661 
								
							 
						 
						
							
							
								
								fix for object_auth update  
							
							
							
						 
						
							2012-09-19 11:12:22 +08:00  
				
					
						
							
							
								 
						
							
								959b6aee12 
								
							 
						 
						
							
							
								
								fix for listing object error  
							
							
							
						 
						
							2012-09-19 10:45:03 +08:00  
				
					
						
							
							
								 
						
							
								19db9d0037 
								
							 
						 
						
							
							
								
								basic function  
							
							
							
						 
						
							2012-09-17 13:32:52 +08:00  
				
					
						
							
							
								 
						
							
								42d50ae534 
								
							 
						 
						
							
							
								
								Plugins  
							
							
							
						 
						
							2012-09-14 00:05:31 +08:00  
				
					
						
							
							
								 
						
							
								03b5827392 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							... 
							
							
							
							Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_side_bar.html.erb 
							
						 
						
							2012-09-14 00:03:52 +08:00  
				
					
						
							
							
								 
						
							
								3e5978c8fd 
								
							 
						 
						
							
							
								
								users new interface controller  
							
							
							
						 
						
							2012-09-14 00:02:21 +08:00  
				
					
						
							
							
								 
						
							
								4818e3f444 
								
							 
						 
						
							
							
								
								first version for new member html  
							
							
							
						 
						
							2012-09-14 00:02:21 +08:00  
				
					
						
							
							
								 
						
							
								2e9af5d1a8 
								
							 
						 
						
							
							
								
								fix commit bugs  
							
							
							
						 
						
							2012-09-13 15:53:36 +08:00  
				
					
						
							
							
								 
						
							
								3432d1359b 
								
							 
						 
						
							
							
								
								Fix bug in show_from_link  
							
							
							
						 
						
							2012-09-12 16:46:03 +08:00  
				
					
						
							
							
								 
						
							
								98e8f5f607 
								
							 
						 
						
							
							
								
								complete visitor dashbroad  
							
							
							
						 
						
							2012-09-12 16:20:15 +08:00  
				
					
						
							
							
								 
						
							
								45ef7fd302 
								
							 
						 
						
							
							
								
								guest user  
							
							
							
						 
						
							2012-09-12 16:20:15 +08:00  
				
					
						
							
							
								 
						
							
								e88b09cf72 
								
							 
						 
						
							
							
								
								Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit  
							
							... 
							
							
							
							Conflicts:
	app/controllers/pages_controller.rb
	app/views/layouts/_side_bar.html.erb
	lib/parsers/parser_common.rb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
	vendor/built_in_modules/gallery/config/locales/en.yml
	vendor/built_in_modules/gallery/config/locales/zh_tw.yml 
							
						 
						
							2012-09-12 02:21:18 +08:00  
				
					
						
							
							
								 
						
							
								8dd69a140f 
								
							 
						 
						
							
							
								
								frontend commits  
							
							
							
						 
						
							2012-09-12 02:12:15 +08:00  
				
					
						
							
							
								 
						
							
								3749e919cb 
								
							 
						 
						
							
							
								
								front ends updates  
							
							
							
						 
						
							2012-09-12 02:12:15 +08:00  
				
					
						
							
							
								 
						
							
								04877b9945 
								
							 
						 
						
							
							
								
								design update  
							
							
							
						 
						
							2012-09-12 01:58:23 +08:00  
				
					
						
							
							
								 
						
							
								01a8a9b5b6 
								
							 
						 
						
							
							
								
								users new interface controller  
							
							
							
						 
						
							2012-09-11 10:53:05 +08:00  
				
					
						
							
							
								 
						
							
								42cfe5ac91 
								
							 
						 
						
							
							
								
								first version for new member html  
							
							
							
						 
						
							2012-09-11 10:52:27 +08:00  
				
					
						
							
							
								 
						
							
								8bd5481b3f 
								
							 
						 
						
							
							
								
								fix object_auth security problem  
							
							
							
						 
						
							2012-09-07 17:53:43 +08:00  
				
					
						
							
							
								 
						
							
								8295286c6e 
								
							 
						 
						
							
							
								
								frontend commits  
							
							
							
						 
						
							2012-09-05 19:08:48 +08:00  
				
					
						
							
							
								 
						
							
								b726c10857 
								
							 
						 
						
							
							
								
								front ends updates  
							
							
							
						 
						
							2012-09-04 21:30:17 +08:00  
				
					
						
							
							
								 
						
							
								671f86b612 
								
							 
						 
						
							
							
								
								First version of new preview. Only plain text  
							
							
							
						 
						
							2012-09-04 12:31:27 +08:00  
				
					
						
							
							
								 
						
							
								fc4e2ceba5 
								
							 
						 
						
							
							
								
								fix for 403 for new interface  
							
							
							
						 
						
							2012-08-31 18:56:26 +08:00  
				
					
						
							
							
								 
						
							
								26f99c296f 
								
							 
						 
						
							
							
								
								fix page blank for 403 forbidden.  
							
							
							
						 
						
							2012-08-31 18:33:18 +08:00  
				
					
						
							
							
								 
						
							
								6b904a37ad 
								
							 
						 
						
							
							
								
								let all signed in users at NCCU upload files  
							
							
							
						 
						
							2012-08-31 17:54:25 +08:00  
				
					
						
							
							
								 
						
							
								0cb573946e 
								
							 
						 
						
							
							
								
								update item page  
							
							
							
						 
						
							2012-08-30 15:17:39 +08:00  
				
					
						
							
							
								 
						
							
								a1560ebcf5 
								
							 
						 
						
							
							
								
								update archive  
							
							
							
						 
						
							2012-08-30 15:17:39 +08:00  
				
					
						
							
							
								 
						
							
								94ee16ae01 
								
							 
						 
						
							
							
								
								design update  
							
							
							
						 
						
							2012-08-23 01:36:55 +08:00  
				
					
						
							
							
								 
						
							
								7d5531bf01 
								
							 
						 
						
							
							
								
								Merge branch 'nccu_master' into demo_site  
							
							... 
							
							
							
							Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb 
							
						 
						
							2012-08-22 18:07:49 +08:00  
				
					
						
							
							
								 
						
							
								faf2d914b6 
								
							 
						 
						
							
							
								
								Page added for desktop  
							
							
							
						 
						
							2012-08-20 23:17:31 +08:00  
				
					
						
							
							
								 
						
							
								263cf130e2 
								
							 
						 
						
							
							
								
								tp  
							
							
							
						 
						
							2012-08-20 23:16:54 +08:00  
				
					
						
							
							
								 
						
							
								1ba87982ba 
								
							 
						 
						
							
							
								
								Multi language and side bar update  
							
							
							
						 
						
							2012-08-20 23:14:11 +08:00  
				
					
						
							
							
								 
						
							
								1daf405b3d 
								
							 
						 
						
							
							
								
								Gallery started.  
							
							
							
						 
						
							2012-08-20 23:14:10 +08:00  
				
					
						
							
							
								 
						
							
								43bc704468 
								
							 
						 
						
							
							
								
								Error popup only shows on flash[:error]  
							
							
							
						 
						
							2012-08-15 15:55:29 +08:00  
				
					
						
							
							
								 
						
							
								c32b0dd4b4 
								
							 
						 
						
							
							
								
								Move delete checkboxes to js  
							
							
							
						 
						
							2012-08-14 00:59:01 +08:00  
				
					
						
							
							
								 
						
							
								c2f3f45196 
								
							 
						 
						
							
							
								
								Fix for link in nccu widget  
							
							
							
						 
						
							2012-08-13 11:34:14 +08:00  
				
					
						
							
							
								 
						
							
								080974b563 
								
							 
						 
						
							
							
								
								Merge branch 'new_rss'  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb 
							
						 
						
							2012-08-12 23:32:28 +08:00  
				
					
						
							
							
								 
						
							
								f1b4d9e204 
								
							 
						 
						
							
							
								
								Add authorization for rescue interface  
							
							... 
							
							
							
							Change logic for NCCU site for status panel. 
							
						 
						
							2012-08-12 23:29:13 +08:00  
				
					
						
							
							
								 
						
							
								5281464af4 
								
							 
						 
						
							
							
								
								Fix bug for sorting when there's only one category with elements  
							
							
							
						 
						
							2012-08-11 16:56:28 +08:00  
				
					
						
							
							
								 
						
							
								d5c55c9697 
								
							 
						 
						
							
							
								
								widget & frontend field  
							
							
							
						 
						
							2012-08-09 15:25:30 +08:00  
				
					
						
							
							
								 
						
							
								41930eb693 
								
							 
						 
						
							
							
								
								RSS first page  
							
							
							
						 
						
							2012-08-08 17:41:48 +08:00  
				
					
						
							
							
								 
						
							
								e8317e0a4b 
								
							 
						 
						
							
							
								
								1.Remove category column when category is specified  
							
							... 
							
							
							
							2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable. 
							
						 
						
							2012-08-08 14:46:08 +08:00  
				
					
						
							
							
								 
						
							
								05e61b63bb 
								
							 
						 
						
							
							
								
								Fix fb share, redirect with js when the page is not requested by fb but by user  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								a03d1ad10b 
								
							 
						 
						
							
							
								
								Change for getting url from key  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								6cfdf0f25a 
								
							 
						 
						
							
							
								
								Change the way the orig_url is passed to fb  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								4bed925e0f 
								
							 
						 
						
							
							
								
								Try fb from override and generated page  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								4660c26b7a 
								
							 
						 
						
							
							
								
								fix for ie8,9 for tinymce  
							
							
							
						 
						
							2012-08-07 20:55:18 +08:00  
				
					
						
							
							
								 
						
							
								8ea7bf75cd 
								
							 
						 
						
							
							
								
								Fix uploader, ie9 ok, not ie8  
							
							
							
						 
						
							2012-08-07 17:32:15 +08:00  
				
					
						
							
							
								 
						
							
								6a94d4f550 
								
							 
						 
						
							
							
								
								Put back impressionist where it was commented out  
							
							
							
						 
						
							2012-08-04 15:42:53 +08:00  
				
					
						
							
							
								 
						
							
								50b313976e 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							
							
						 
						
							2012-08-03 17:12:54 +08:00  
				
					
						
							
							
								 
						
							
								2d2e01115b 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							... 
							
							
							
							With news and announcement views 
							
						 
						
							2012-08-03 01:44:06 +08:00  
				
					
						
							
							
								 
						
							
								25a911b4f8 
								
							 
						 
						
							
							
								
								Change for page: take category and tag at the same time  
							
							
							
						 
						
							2012-08-01 16:33:46 +08:00  
				
					
						
							
							
								 
						
							
								39b63a970c 
								
							 
						 
						
							
							
								
								Fix .class to .class.to_s  
							
							
							
						 
						
							2012-07-30 18:34:54 +08:00  
				
					
						
							
							
								 
						
							
								7440727acd 
								
							 
						 
						
							
							
								
								Fix: "._type" to ".class"  
							
							
							
						 
						
							2012-07-30 17:21:37 +08:00  
				
					
						
							
							
								 
						
							
								a657a7d615 
								
							 
						 
						
							
							
								
								remove cache  
							
							
							
						 
						
							2012-07-27 19:14:24 +08:00  
				
					
						
							
							
								 
						
							
								a8cc581279 
								
							 
						 
						
							
							
								
								Sitemap done for backend and fronted  
							
							
							
						 
						
							2012-07-27 19:13:40 +08:00  
				
					
						
							
							
								 
						
							
								934b515914 
								
							 
						 
						
							
							
								
								Sitemap with main  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								38804bd118 
								
							 
						 
						
							
							
								
								Add disable for main title  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								db9c4c0e10 
								
							 
						 
						
							
							
								
								Partial sitemap  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								49dd3a1770 
								
							 
						 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								e2ebd48b22 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
				
					
						
							
							
								 
						
							
								de831f1f96 
								
							 
						 
						
							
							
								
								disable homepage cache for english page  
							
							
							
						 
						
							2012-07-27 05:08:24 +08:00  
				
					
						
							
							
								 
						
							
								c0cac812c5 
								
							 
						 
						
							
							
								
								demo site widget  
							
							
							
						 
						
							2012-07-26 16:39:29 +08:00  
				
					
						
							
							
								 
						
							
								f9bdb4a327 
								
							 
						 
						
							
							
								
								New and Announcement search. Disabled impression.  
							
							
							
						 
						
							2012-07-20 15:47:40 +08:00  
				
					
						
							
							
								 
						
							
								2ae6b54a45 
								
							 
						 
						
							
							
								
								fix for not working cache  
							
							
							
						 
						
							2012-07-13 18:32:17 +08:00  
				
					
						
							
							
								 
						
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							
							
						 
						
							2012-07-13 15:36:10 +08:00  
				
					
						
							
							
								 
						
							
								0e65e379b0 
								
							 
						 
						
							
							
								
								cache first commit  
							
							
							
						 
						
							2012-07-12 11:47:24 +08:00  
				
					
						
							
							
								 
						
							
								773371e885 
								
							 
						 
						
							
							
								
								fix from messy search  
							
							
							
						 
						
							2012-07-09 16:48:23 +08:00  
				
					
						
							
							
								 
						
							
								09d46f2f75 
								
							 
						 
						
							
							
								
								NCCU 上傳版本  0709  
							
							... 
							
							
							
							Merge branch 'nccu0621'
Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb 
							
						 
						
							2012-07-09 16:02:59 +08:00  
				
					
						
							
							
								 
						
							
								49862e70f9 
								
							 
						 
						
							
							
								
								hide category at front end  
							
							
							
						 
						
							2012-07-09 12:05:21 +08:00  
				
					
						
							
							
								 
						
							
								56caf4b34e 
								
							 
						 
						
							
							
								
								category disable for backend  
							
							
							
						 
						
							2012-07-06 18:11:55 +08:00  
				
					
						
							
							
								 
						
							
								830eb8eb62 
								
							 
						 
						
							
							
								
								Timeline design and timescale update  
							
							
							
						 
						
							2012-07-06 16:11:03 +08:00  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
				
					
						
							
							
								 
						
							
								6923b82284 
								
							 
						 
						
							
							
								
								Added seminar section  
							
							
							
						 
						
							2012-07-04 19:12:02 +08:00  
				
					
						
							
							
								 
						
							
								f635f642fc 
								
							 
						 
						
							
							
								
								Merge for new timeline updates and font updates  
							
							
							
						 
						
							2012-07-04 18:49:10 +08:00  
				
					
						
							
							
								 
						
							
								441929eb74 
								
							 
						 
						
							
							
								
								Latest code by joshua  
							
							
							
						 
						
							2012-07-04 18:39:28 +08:00  
				
					
						
							
							
								 
						
							
								6b9926539d 
								
							 
						 
						
							
							
								
								Merge branch 'desktop_joshua' of  https://github.com/Rulingcom/orbit  into desktop_joshua  
							
							... 
							
							
							
							Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb 
							
						 
						
							2012-07-04 18:31:00 +08:00  
				
					
						
							
							
								 
						
							
								3f42a22094 
								
							 
						 
						
							
							
								
								Books section added  
							
							
							
						 
						
							2012-07-04 17:55:30 +08:00  
				
					
						
							
							
								 
						
							
								f20f36383e 
								
							 
						 
						
							
							
								
								Timeline ajax load fixed… a bit change in structure..  
							
							
							
						 
						
							2012-07-03 19:45:47 +08:00  
				
					
						
							
							
								 
						
							
								f7107936d0 
								
							 
						 
						
							
							
								
								fix for checking @rulingcom.com  
							
							
							
						 
						
							2012-07-03 18:21:48 +08:00  
				
					
						
							
							
								 
						
							
								9607b5bbfd 
								
							 
						 
						
							
							
								
								rulingcom帳號不透過LDAP認證  
							
							
							
						 
						
							2012-07-03 18:12:44 +08:00  
				
					
						
							
							
								 
						
							
								bacb1f1e63 
								
							 
						 
						
							
							
								
								Timeline ajax loading  
							
							
							
						 
						
							2012-07-02 21:06:36 +08:00  
				
					
						
							
							
								 
						
							
								a1e74987dc 
								
							 
						 
						
							
							
								
								Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry  
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb 
							
						 
						
							2012-06-29 16:10:29 +08:00  
				
					
						
							
							
								 
						
							
								7151102a86 
								
							 
						 
						
							
							
								
								new page add and timeline changes  
							
							
							
						 
						
							2012-06-28 17:31:48 +08:00  
				
					
						
							
							
								 
						
							
								4aa155a44d 
								
							 
						 
						
							
							
								
								timeline updates major ones..  
							
							
							
						 
						
							2012-06-26 21:09:33 +08:00  
				
					
						
							
							
								 
						
							
								818c58c1ee 
								
							 
						 
						
							
							
								
								fix for 新聞與公告QA  
							
							... 
							
							
							
							1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位 
							
						 
						
							2012-06-26 17:46:02 +08:00  
				
					
						
							
							
								 
						
							
								555ec86403 
								
							 
						 
						
							
							
								
								Timeline commit  
							
							
							
						 
						
							2012-06-26 15:59:28 +08:00  
				
					
						
							
							
								 
						
							
								cb17fe0825 
								
							 
						 
						
							
							
								
								Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working  
							
							
							
						 
						
							2012-06-20 14:50:51 +08:00  
				
					
						
							
							
								 
						
							
								11247ce84c 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							
							
						 
						
							2012-05-29 17:17:26 +08:00  
				
					
						
							
							
								 
						
							
								1f1868a75f 
								
							 
						 
						
							
							
								
								cache privilege user list.  
							
							
							
						 
						
							2012-05-29 17:17:26 +08:00  
				
					
						
							
							
								 
						
							
								4f484599b7 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								6f0cf0e92e 
								
							 
						 
						
							
							
								
								cache privilege user list.  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								3480fa2545 
								
							 
						 
						
							
							
								
								Fix login and label.  Check sync jobs and update info function.  
							
							
							
						 
						
							2012-05-24 17:01:00 +08:00  
				
					
						
							
							
								 
						
							
								c062b43069 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-23 12:11:38 +08:00  
				
					
						
							
							
								 
						
							
								7c44e94285 
								
							 
						 
						
							
							
								
								Order list by created_at desc  
							
							... 
							
							
							
							Add best image size in news new 
							
						 
						
							2012-05-23 11:46:19 +08:00  
				
					
						
							
							
								 
						
							
								f1c8bed29d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb 
							
						 
						
							2012-05-22 20:33:07 +08:00  
				
					
						
							
							
								 
						
							
								d6b92fc604 
								
							 
						 
						
							
							
								
								Fixed bugs for nccu  
							
							
							
						 
						
							2012-05-22 20:00:07 +08:00  
				
					
						
							
							
								 
						
							
								11a371cbb9 
								
							 
						 
						
							
							
								
								Fix destroy in structure  
							
							... 
							
							
							
							Fix sorting 
							
						 
						
							2012-05-22 17:55:45 +08:00  
				
					
						
							
							
								 
						
							
								5e9836f371 
								
							 
						 
						
							
							
								
								Changes for structure  
							
							
							
						 
						
							2012-05-22 14:45:49 +08:00  
				
					
						
							
							
								 
						
							
								c4d7079059 
								
							 
						 
						
							
							
								
								Fix's Matt code for not showing bulletins in index  
							
							
							
						 
						
							2012-05-21 18:10:03 +08:00