Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								faf2d914b6
								
							
						 | 
						
							
							
								
								Page added for desktop
							
							
							
							
							
						 | 
						
							2012-08-20 23:17:31 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								4beedb1aa4
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-20 23:17:31 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								0dd1c6eb51
								
							
						 | 
						
							
							
								
								encoding fixed
							
							
							
							
							
							
							
							Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline" 
							
						 | 
						
							2012-08-20 23:16:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								263cf130e2
								
							
						 | 
						
							
							
								
								tp
							
							
							
							
							
						 | 
						
							2012-08-20 23:16:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								aef1bfaba3
								
							
						 | 
						
							
							
								
								Button fixes
							
							
							
							
							
						 | 
						
							2012-08-20 23:16:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								69304fda43
								
							
						 | 
						
							
							
								
								UI modifications
							
							
							
							
							
						 | 
						
							2012-08-20 23:16:06 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								abd1a9ecbc
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:11 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								8a9e724979
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1ba87982ba
								
							
						 | 
						
							
							
								
								Multi language and side bar update
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:11 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								e27c1b0175
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								587595f815
								
							
						 | 
						
							
							
								
								gallery translation supported
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								314af3c16f
								
							
						 | 
						
							
							
								
								Major updates for gallery
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0333f97bf3
								
							
						 | 
						
							
							
								
								Gallery update..
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								797c9e57b8
								
							
						 | 
						
							
							
								
								Gallery update
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1daf405b3d
								
							
						 | 
						
							
							
								
								Gallery started.
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								5fd367a8d9
								
							
						 | 
						
							
							
								
								fixed db error
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Joshua
							
						 | 
						
							
							
							
							
							
								
							
							
								22c43e7f7d
								
							
						 | 
						
							
							
								
								database fixing
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								207d360d1e
								
							
						 | 
						
							
							
								
								fixed db error
							
							
							
							
							
						 | 
						
							2012-08-20 23:11:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9f3d22360e
								
							
						 | 
						
							
							
								
								gallery module update
							
							
							
							
							
						 | 
						
							2012-08-20 23:11:32 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								801c7cab0c
								
							
						 | 
						
							
							
								
								tinyscroll bar update
							
							
							
							
							
						 | 
						
							2012-08-20 23:11:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1efb807246
								
							
						 | 
						
							
							
								
								tinyscrollbar extension
							
							
							
							
							
						 | 
						
							2012-08-20 23:11:32 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								9333503545
								
							
						 | 
						
							
							
								
								demo_site widget edit
							
							
							
							
							
						 | 
						
							2012-08-10 15:33:28 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								d5c55c9697
								
							
						 | 
						
							
							
								
								widget & frontend field
							
							
							
							
							
						 | 
						
							2012-08-09 15:25:30 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								c0cac812c5
								
							
						 | 
						
							
							
								
								demo site widget
							
							
							
							
							
						 | 
						
							2012-07-26 16:39:29 +08:00 | 
						
					
				
					
						
							
							
								 
								OrbitServer
							
						 | 
						
							
							
							
							
							
								
							
							
								f223e4bb1e
								
							
						 | 
						
							
							
								
								Ika's changes for orbit bar
							
							
							
							
							
						 | 
						
							2012-07-20 15:41:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								53fb9d456f
								
							
						 | 
						
							
							
								
								Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
							
							
							
							
							
						 | 
						
							2012-07-18 18:08:08 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								10731dc211
								
							
						 | 
						
							
							
								
								demo widget
							
							
							
							
							
						 | 
						
							2012-07-18 18:07:45 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								e3f5532201
								
							
						 | 
						
							
							
								
								Merge branch 'demo_site' of https://github.com/Rulingcom/orbit into demo_site
							
							
							
							
							
						 | 
						
							2012-07-16 16:22:59 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								71742179a8
								
							
						 | 
						
							
							
								
								demo widget
							
							
							
							
							
						 | 
						
							2012-07-16 16:13:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e48735a4ac
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
							
							
							
							
							
						 | 
						
							2012-07-09 16:39:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								400650a905
								
							
						 | 
						
							
							
								
								Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site
							
							
							
							
							
						 | 
						
							2012-07-09 16:31:42 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								89446ba796
								
							
						 | 
						
							
							
								
								demo
							
							
							
							
							
						 | 
						
							2012-07-09 16:28:04 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								fce2762ec3
								
							
						 | 
						
							
							
								
								demo
							
							
							
							
							
						 | 
						
							2012-07-09 16:28:04 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								1d8e386bde
								
							
						 | 
						
							
							
								
								demo website widget
							
							
							
							
							
						 | 
						
							2012-07-09 16:28:03 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								68fd726ce1
								
							
						 | 
						
							
							
								
								little
							
							
							
							
							
						 | 
						
							2012-07-09 16:25:41 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								b6266284b4
								
							
						 | 
						
							
							
								
								dump
							
							
							
							
							
						 | 
						
							2012-07-09 16:21:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								222c0b9564
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_harry' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-07-09 16:12:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4796de882f
								
							
						 | 
						
							
							
								
								Scroll down fixes
							
							
							
							
							
						 | 
						
							2012-07-09 16:11:31 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								bfedf207c9
								
							
						 | 
						
							
							
								
								some changes
							
							
							
							
							
						 | 
						
							2012-07-09 15:37:47 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								58d162d225
								
							
						 | 
						
							
							
								
								publication adjustment
							
							
							
							
							
						 | 
						
							2012-07-09 10:44:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2e94c19019
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_devin' into desktop_harry
							
							
							
							
							
						 | 
						
							2012-07-06 16:12:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								830eb8eb62
								
							
						 | 
						
							
							
								
								Timeline design and timescale update
							
							
							
							
							
						 | 
						
							2012-07-06 16:11:03 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								8948ccca25
								
							
						 | 
						
							
							
								
								little changes
							
							
							
							
							
						 | 
						
							2012-07-06 16:09:26 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								bfaed4deb4
								
							
						 | 
						
							
							
								
								timeline change
							
							
							
							
							
						 | 
						
							2012-07-05 16:49:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								312e63f242
								
							
						 | 
						
							
							
								
								New Timeline with books and seminar pages
							
							
							
							
							
						 | 
						
							2012-07-05 16:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Joshua Milton
							
						 | 
						
							
							
							
							
							
								
							
							
								bb75383ef0
								
							
						 | 
						
							
							
								
								Seminar Pages modified
							
							
							
							
							
						 | 
						
							2012-07-05 16:27:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6923b82284
								
							
						 | 
						
							
							
								
								Added seminar section
							
							
							
							
							
						 | 
						
							2012-07-04 19:12:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f635f642fc
								
							
						 | 
						
							
							
								
								Merge for new timeline updates and font updates
							
							
							
							
							
						 | 
						
							2012-07-04 18:49:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Joshua Milton
							
						 | 
						
							
							
							
							
							
								
							
							
								441929eb74
								
							
						 | 
						
							
							
								
								Latest code by joshua
							
							
							
							
							
						 | 
						
							2012-07-04 18:39:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Joshua Milton
							
						 | 
						
							
							
							
							
							
								
							
							
								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 |