chris
							
						 
						
							 
							
							
							
							
								
							
							
								dc3be3c9a1 
								
							 
						 
						
							
							
								
								Translation changes  
							
							 
							
							
							
						 
						
							2012-12-03 23:00:04 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								9c6c622a49 
								
							 
						 
						
							
							
								
								Add missing icons and css for icons in layout  
							
							 
							
							
							
						 
						
							2012-12-03 22:31:00 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								9254b9960d 
								
							 
						 
						
							
							
								
								Add timeout to user  
							
							 
							
							
							
						 
						
							2012-12-03 21:45:00 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								4f9aa63045 
								
							 
						 
						
							
							
								
								Remove extra end  
							
							 
							
							
							
						 
						
							2012-12-03 18:45:32 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								5c7f1aa164 
								
							 
						 
						
							
							
								
								Fix saving of page_part after layout change  
							
							 
							
							
							
						 
						
							2012-12-03 18:42:50 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								2757044c32 
								
							 
						 
						
							
							
								
								Forgot to save the page_parts  
							
							 
							
							
							
						 
						
							2012-12-03 17:49:26 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								bdcfb46294 
								
							 
						 
						
							
							
								
								Fix previous commit  
							
							 
							
							
							
						 
						
							2012-12-03 17:38:55 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								6543491a53 
								
							 
						 
						
							
							
								
								Save pages to generate page_parts when a layout is updated  
							
							 
							
							
							
						 
						
							2012-12-03 17:25:27 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								036d7bbb0e 
								
							 
						 
						
							
							
								
								Module store  
							
							 
							
							
							
						 
						
							2012-11-29 02:02:37 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								06335f9bd1 
								
							 
						 
						
							
							
								
								Joshua's html  
							
							 
							
							
							
						 
						
							2012-11-29 00:59:46 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								390da0e49a 
								
							 
						 
						
							
							
								
								Change icons  
							
							 
							
							
							
						 
						
							2012-11-29 00:49:53 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								9e2d6cfcdd 
								
							 
						 
						
							
							
								
								add quick link to change user password, but it's not work  
							
							 
							
							
							
						 
						
							2012-11-28 23:44:43 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								6ed1dd0cc6 
								
							 
						 
						
							
							
								
								change template  
							
							 
							
							
							
						 
						
							2012-11-28 23:43:39 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								7853aec886 
								
							 
						 
						
							
							
								
								Merge branch 'publication' into multiple_file_upload  
							
							 
							
							... 
							
							
							
							* publication:
  url fixed and edit form fixed for tinyscrollbar 
							
						 
						
							2012-11-28 18:19:06 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								6d159a3a9e 
								
							 
						 
						
							
							
								
								add templete  
							
							 
							
							
							
						 
						
							2012-11-28 18:12:37 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								254a81fa5d 
								
							 
						 
						
							
							
								
								add templete  
							
							 
							
							
							
						 
						
							2012-11-28 18:12:21 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								2f67a96532 
								
							 
						 
						
							
							
								
								url fixed and edit form fixed for tinyscrollbar  
							
							 
							
							
							
						 
						
							2012-11-28 18:12:00 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								25324809bb 
								
							 
						 
						
							
							
								
								add account link  
							
							 
							
							
							
						 
						
							2012-11-28 14:42:15 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								9cc518b456 
								
							 
						 
						
							
							
								
								autocomplete done  
							
							 
							
							
							
						 
						
							2012-11-27 15:55:32 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								c9e3d5271a 
								
							 
						 
						
							
							
								
								remove '"' candidate list  
							
							 
							
							
							
						 
						
							2012-11-26 16:06:22 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								0125010a05 
								
							 
						 
						
							
							
								
								modified error msgs and cancle button, but those two have bug...  
							
							 
							
							
							
						 
						
							2012-11-26 15:45:51 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								065d38c797 
								
							 
						 
						
							
							
								
								add autocomplete js  
							
							 
							
							
							
						 
						
							2012-11-26 14:44:35 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								8a79d7ff2e 
								
							 
						 
						
							
							
								
								member selects  
							
							 
							
							
							
						 
						
							2012-11-26 10:25:34 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								9061448c5f 
								
							 
						 
						
							
							
								
								add paper status textfield  
							
							 
							
							
							
						 
						
							2012-11-26 10:23:50 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								9a684f54b4 
								
							 
						 
						
							
							
								
								fix for showing subroles  
							
							 
							
							
							
						 
						
							2012-11-26 10:22:36 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								3933c048b0 
								
							 
						 
						
							
							
								
								delete fixed  
							
							 
							
							
							
						 
						
							2012-11-23 13:22:01 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								8009c6aa34 
								
							 
						 
						
							
							
								
								fixed delete function  
							
							 
							
							
							
						 
						
							2012-11-23 12:28:36 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								e06495d4ad 
								
							 
						 
						
							
							
								
								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 :
  delete update 
							
						 
						
							2012-11-23 10:50:10 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								f38f32ac8b 
								
							 
						 
						
							
							
								
								delete update  
							
							 
							
							
							
						 
						
							2012-11-23 10:46:42 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								996a69f595 
								
							 
						 
						
							
							
								
								add co-author json  
							
							 
							
							
							
						 
						
							2012-11-23 10:44:48 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								5b39d10ac6 
								
							 
						 
						
							
							
								
								user roles starts  
							
							 
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								77386f0284 
								
							 
						 
						
							
							
								
								disable data transform when switching attribute field type. new member stable  
							
							 
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								f6d3b4a9e9 
								
							 
						 
						
							
							
								
								correct 'edit' button of journal list  
							
							 
							
							
							
						 
						
							2012-11-22 21:06:31 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								868d1c2201 
								
							 
						 
						
							
							
								
								fix for json and some other bugs  
							
							 
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								e29583ed1f 
								
							 
						 
						
							
							
								
								add delete link  
							
							 
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								78500e0661 
								
							 
						 
						
							
							
								
								fixed add journal and co-author curd problem, but have redirect problem...  
							
							 
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								c281ae9447 
								
							 
						 
						
							
							
								
								hidden file field, and fixed updated function  
							
							 
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								9189ebffee 
								
							 
						 
						
							
							
								
								correct 'edit' button of journal list  
							
							 
							
							
							
						 
						
							2012-11-22 18:15:07 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								90fd9de5a8 
								
							 
						 
						
							
							
								
								fix for json and some other bugs  
							
							 
							
							
							
						 
						
							2012-11-22 16:31:52 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								e453cfce9c 
								
							 
						 
						
							
							
								
								add delete link  
							
							 
							
							
							
						 
						
							2012-11-22 15:21:43 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								9e400e6e6a 
								
							 
						 
						
							
							
								
								fixed add journal and co-author curd problem, but have redirect problem...  
							
							 
							
							
							
						 
						
							2012-11-22 10:49:54 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								39adbb35c1 
								
							 
						 
						
							
							
								
								Remove before_filter for sub_manager in users  
							
							 
							
							
							
						 
						
							2012-11-22 09:37:31 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								475642d375 
								
							 
						 
						
							
							
								
								Remove news and fix default_url in ImageUploader  
							
							 
							
							
							
						 
						
							2012-11-22 09:30:25 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								bb69a059e8 
								
							 
						 
						
							
							
								
								hidden file field, and fixed updated function  
							
							 
							
							
							
						 
						
							2012-11-22 02:37:56 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								2d0e8b37b2 
								
							 
						 
						
							
							
								
								Fix:  
							
							 
							
							... 
							
							
							
							- Widgets for announcement
  - Facebook link
  - AdBanner nav 
							
						 
						
							2012-11-21 18:42:14 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								6ca52226ba 
								
							 
						 
						
							
							
								
								Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP  
							
							 
							
							... 
							
							
							
							Conflicts:
	app/views/desktop/journal_p.html.erb 
							
						 
						
							2012-11-21 18:38:28 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								73e76f2477 
								
							 
						 
						
							
							
								
								routes fixed  
							
							 
							
							
							
						 
						
							2012-11-21 18:36:56 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								c53581c999 
								
							 
						 
						
							
							
								
								small fix for journal_pages desktop  
							
							 
							
							
							
						 
						
							2012-11-21 18:36:56 +08:00