Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2c0058e8c9
								
							
						 | 
						
							
							
								
								authorization
							
							
							
							
							
						 | 
						
							2012-08-20 23:18:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								faf2d914b6
								
							
						 | 
						
							
							
								
								Page added for desktop
							
							
							
							
							
						 | 
						
							2012-08-20 23:17:31 +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 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1ba87982ba
								
							
						 | 
						
							
							
								
								Multi language and side bar 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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								10731dc211
								
							
						 | 
						
							
							
								
								demo widget
							
							
							
							
							
						 | 
						
							2012-07-18 18:07:45 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Joshua Milton
							
						 | 
						
							
							
							
							
							
								
							
							
								3f42a22094
								
							
						 | 
						
							
							
								
								Books section added
							
							
							
							
							
						 | 
						
							2012-07-04 17:55:30 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								e133673736
								
							
						 | 
						
							
							
								
								some change
							
							
							
							
							
						 | 
						
							2012-07-04 13:38:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a0c09046a8
								
							
						 | 
						
							
							
								
								Timeline merge plus font update
							
							
							
							
							
						 | 
						
							2012-07-03 19:53:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f20f36383e
								
							
						 | 
						
							
							
								
								Timeline ajax load fixed… a bit change in structure..
							
							
							
							
							
						 | 
						
							2012-07-03 19:45:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bacb1f1e63
								
							
						 | 
						
							
							
								
								Timeline ajax loading
							
							
							
							
							
						 | 
						
							2012-07-02 21:06:36 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								f34cb47618
								
							
						 | 
						
							
							
								
								font aweosme change
							
							
							
							
							
						 | 
						
							2012-07-02 16:23:14 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								08fd07b6aa
								
							
						 | 
						
							
							
								
								timeline and font update
							
							
							
							
							
						 | 
						
							2012-07-02 16:22:51 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								6533abf214
								
							
						 | 
						
							
							
								
								font awesome update
							
							
							
							
							
						 | 
						
							2012-07-02 11:10:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7151102a86
								
							
						 | 
						
							
							
								
								new page add and timeline changes
							
							
							
							
							
						 | 
						
							2012-06-28 17:31:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4aa155a44d
								
							
						 | 
						
							
							
								
								timeline updates major ones..
							
							
							
							
							
						 | 
						
							2012-06-26 21:09:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								555ec86403
								
							
						 | 
						
							
							
								
								Timeline commit
							
							
							
							
							
						 | 
						
							2012-06-26 15:59:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								11247ce84c
								
							
						 | 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar
							
							
							
							
							
						 | 
						
							2012-05-29 17:17:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4d288fb9d1
								
							
						 | 
						
							
							
								
								add script for cache user
							
							
							
							
							
						 | 
						
							2012-05-29 17:17:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1f1868a75f
								
							
						 | 
						
							
							
								
								cache privilege user list.
							
							
							
							
							
						 | 
						
							2012-05-29 17:17:26 +08:00 |