Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bedde860a4
								
							
						 | 
						
							
							
								
								minor shit updates
							
							
							
							
							
						 | 
						
							2012-09-13 19:02:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2d053164e8
								
							
						 | 
						
							
							
								
								event_calendar testing
							
							
							
							
							
						 | 
						
							2012-09-12 14:20:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c84b6a626e
								
							
						 | 
						
							
							
								
								minor fix for sidebar
							
							
							
							
							
						 | 
						
							2012-09-11 16:50:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7bab8bf8ad
								
							
						 | 
						
							
							
								
								page added...
							
							
							
							
							
						 | 
						
							2012-09-10 14:44:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8295286c6e
								
							
						 | 
						
							
							
								
								frontend commits
							
							
							
							
							
						 | 
						
							2012-09-05 19:08:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b726c10857
								
							
						 | 
						
							
							
								
								front ends updates
							
							
							
							
							
						 | 
						
							2012-09-04 21:30:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a080667615
								
							
						 | 
						
							
							
								
								frontend updates
							
							
							
							
							
						 | 
						
							2012-09-04 17:17:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4a12c9d6fb
								
							
						 | 
						
							
							
								
								frontend update
							
							
							
							
							
						 | 
						
							2012-09-03 21:49:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								202d736a5d
								
							
						 | 
						
							
							
								
								one more modification
							
							
							
							
							
						 | 
						
							2012-08-31 22:02:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4d6a9a8e87
								
							
						 | 
						
							
							
								
								Modifications in ruby
							
							
							
							
							
						 | 
						
							2012-08-31 22:01:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9cd7aa81a6
								
							
						 | 
						
							
							
								
								Calendar Module
							
							
							
							
							
						 | 
						
							2012-08-29 20:13:41 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								34764fb28d
								
							
						 | 
						
							
							
								
								front update
							
							
							
							
							
						 | 
						
							2012-08-29 17:54:18 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								43294b2f49
								
							
						 | 
						
							
							
								
								backend update
							
							
							
							
							
						 | 
						
							2012-08-29 17:48:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4fc196fb71
								
							
						 | 
						
							
							
								
								resize thumbnails
							
							
							
							
							
						 | 
						
							2012-08-29 17:36:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a2da065ce6
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-08-29 17:19:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4e6703dae6
								
							
						 | 
						
							
							
								
								ruby update for form and edit tagging
							
							
							
							
							
						 | 
						
							2012-08-29 17:13:45 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								e17bc400f1
								
							
						 | 
						
							
							
								
								gallery frontend update
							
							
							
							
							
						 | 
						
							2012-08-29 17:12:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a11d865dd1
								
							
						 | 
						
							
							
								
								Ruby update
							
							
							
							
							
						 | 
						
							2012-08-28 21:04:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								833349bf6c
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-08-28 15:45:20 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								86535874f7
								
							
						 | 
						
							
							
								
								language fix
							
							
							
							
							
						 | 
						
							2012-08-28 15:38:35 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								d2733bde28
								
							
						 | 
						
							
							
								
								front end added
							
							
							
							
							
						 | 
						
							2012-08-28 15:23:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								62abbf9417
								
							
						 | 
						
							
							
								
								Ruby structure implementation
							
							
							
							
							
						 | 
						
							2012-08-27 23:36:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								99096c4ac0
								
							
						 | 
						
							
							
								
								View only update
							
							
							
							
							
						 | 
						
							2012-08-23 21:30:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								33bc430df5
								
							
						 | 
						
							
							
								
								Commit for view only
							
							
							
							
							
						 | 
						
							2012-08-23 19:25:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								861f521da3
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-08-23 17:15:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e2c16e1931
								
							
						 | 
						
							
							
								
								frontend fixes
							
							
							
							
							
						 | 
						
							2012-08-23 17:13:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4d9244005a
								
							
						 | 
						
							
							
								
								Code merge
							
							
							
							
							
						 | 
						
							2012-08-23 01:40:55 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								75b6c447fc
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-22 16:46:37 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								e8a0015365
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-22 15:59:06 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								1437d2dc14
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
							
							
							especially upload panel 
							
						 | 
						
							2012-08-22 01:15:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4a53e5faea
								
							
						 | 
						
							
							
								
								Minor update
							
							
							
							
							
						 | 
						
							2012-08-21 20:26:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								16b1e97685
								
							
						 | 
						
							
							
								
								code merged … ui updated
							
							
							
							
							
						 | 
						
							2012-08-21 20:15:17 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								0ad0ea9acf
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-21 16:32:55 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								cbef7cd368
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-21 14:31:25 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								1a6ecf4d0f
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-21 13:56:50 +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 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								4beedb1aa4
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
						 | 
						
							2012-08-20 23:17:31 +08:00 |