Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e2c16e1931
								
							
						 | 
						
							
							
								
								frontend fixes
							
							
							
							
							
						 | 
						
							2012-08-23 17:13:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1e4d534908
								
							
						 | 
						
							
							
								
								frontend updates
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:56 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								93da8520ed
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:56 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								9430f66bee
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:56 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								1a4097d1c0
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
							
							
							especially upload panel 
							
						 | 
						
							2012-08-23 01:36:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4fe4dc35de
								
							
						 | 
						
							
							
								
								Minor update
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0799fb4f87
								
							
						 | 
						
							
							
								
								code merged … ui updated
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								94ee16ae01
								
							
						 | 
						
							
							
								
								design update
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								d6b24c6454
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								a732910f35
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								7b42adc9a0
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-23 01:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								68aed18956
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
							
							
							
							
							
							
							
							Conflicts:
	app/views/layouts/_side_bar.html.erb
	config/mongoid.yml
	vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css 
							
						 | 
						
							2012-08-20 23:24:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3d607cfca4
								
							
						 | 
						
							
							
								
								updates for tagging and language fix
							
							
							
							
							
						 | 
						
							2012-08-20 23:20:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2c0058e8c9
								
							
						 | 
						
							
							
								
								authorization
							
							
							
							
							
						 | 
						
							2012-08-20 23:18:50 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								489231166f
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-20 23:17:32 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								1731c4bcf7
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
							
							
							add "tag panel", not complete 
							
						 | 
						
							2012-08-20 23:17:32 +08:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6e90196b77
								
							
						 | 
						
							
							
								
								updates for tagging and language fix
							
							
							
							
							
						 | 
						
							2012-08-20 22:00:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e86d5ab338
								
							
						 | 
						
							
							
								
								tagging
							
							
							
							
							
						 | 
						
							2012-08-13 16:43:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4d676d9ee9
								
							
						 | 
						
							
							
								
								Merge
							
							
							
							
							
						 | 
						
							2012-08-13 16:17:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								34e4928ee1
								
							
						 | 
						
							
							
								
								authorization
							
							
							
							
							
						 | 
						
							2012-08-11 17:28:49 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								7fb6a1e86b
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-11 01:32:53 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								9333503545
								
							
						 | 
						
							
							
								
								demo_site widget edit
							
							
							
							
							
						 | 
						
							2012-08-10 15:33:28 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								50baac2cb7
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
							
							
							add "tag panel", not complete 
							
						 | 
						
							2012-08-09 18:09:36 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								d5c55c9697
								
							
						 | 
						
							
							
								
								widget & frontend field
							
							
							
							
							
						 | 
						
							2012-08-09 15:25:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2f4b93db59
								
							
						 | 
						
							
							
								
								Page added for desktop
							
							
							
							
							
						 | 
						
							2012-08-08 21:35:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ee03bd5b65
								
							
						 | 
						
							
							
								
								code merge
							
							
							
							
							
						 | 
						
							2012-08-08 19:35:36 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								b5227c7b6c
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-07 14:33:30 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								0f5707394b
								
							
						 | 
						
							
							
								
								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-06 22:11:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								13f3d4db70
								
							
						 | 
						
							
							
								
								tp
							
							
							
							
							
						 | 
						
							2012-08-06 20:10:38 +08:00 |