|  Harry Bomrah | 5f9190db39 | few updates with fb integration and some other changes in user and supports data to android Conflicts:
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb | 2013-07-30 16:43:11 +08:00 | 
				
					
						|  saurabhbhatia | 06ab24374b | Gallery - categories, module_authorization and tags to new_ui | 2013-07-23 18:16:19 +08:00 | 
				
					
						|  Harry Bomrah | 3287a2ef17 | gallery migrated to new ui | 2013-07-19 17:38:27 +08:00 | 
				
					
						|  chris | b864cc0268 | Changes in I18n (except personal_conference and personal_journal) | 2013-03-12 18:13:48 +08:00 | 
				
					
						|  Fu Matthew | 71d5abae2e | first version of app config and modified inits. | 2013-01-29 20:33:40 +08:00 | 
				
					
						|  Fu Matthew | 8413e31048 | add i18n | 2013-01-15 10:25:55 +08:00 | 
				
					
						|  Fu Matthew | baf1240b76 | gallery options | 2012-12-28 15:30:46 +08:00 | 
				
					
						|  OrbitServer | fbed496034 | Harry's changes in i18n | 2012-12-06 23:08:13 +08:00 | 
				
					
						|  chris | df58d4c5f3 | Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb | 2012-11-20 12:14:53 +08:00 | 
				
					
						|  Rueshyna | 47075944e7 | make gallery json format to two layer | 2012-11-20 12:13:18 +08:00 | 
				
					
						|  Rueshyna | 310d7523bd | modified gallery json format but it have some bugs... | 2012-11-20 12:11:35 +08:00 | 
				
					
						|  Harry Bomrah | 04469ff845 | Minor update for gallery frontend | 2012-11-19 18:18:46 +08:00 | 
				
					
						|  Rueshyna | 4a7b5a1bf6 | make gallery json format to two layer | 2012-11-15 12:11:58 +08:00 | 
				
					
						|  Harry Bomrah | 46f80ade6a | Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb | 2012-11-14 16:25:02 +08:00 | 
				
					
						|  Harry Bomrah | d7d1b9e31b | widget update | 2012-11-14 15:28:55 +08:00 | 
				
					
						|  Rueshyna | 96622b168f | modified gallery json format but it have some bugs... | 2012-11-14 12:01:42 +08:00 | 
				
					
						|  Rueshyna | 275c6f4c8a | get_album_json function can get readable json | 2012-11-09 16:25:11 +08:00 | 
				
					
						|  Rueshyna | b4f5a0b04b | all of user can get json of gallery from outside | 2012-11-08 01:24:01 +08:00 | 
				
					
						|  devin | 8c6e5deb64 | gallery update please don't forget to add translation in other language | 2012-10-26 11:15:37 +08:00 | 
				
					
						|  Harry Bomrah | 3749e919cb | front ends updates | 2012-09-12 02:12:15 +08:00 | 
				
					
						|  Harry Bomrah | a42a651f90 | frontend updates | 2012-09-12 02:08:02 +08:00 | 
				
					
						|  Harry Bomrah | 199839a42a | frontend update | 2012-09-12 02:08:02 +08:00 | 
				
					
						|  Harry Bomrah | 2a66b89d33 | Modifications in ruby | 2012-09-12 02:07:40 +08:00 | 
				
					
						|  Harry Bomrah | 7903d2ae36 | ruby update for form and edit tagging | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  Harry Bomrah | 8259dee4a3 | Ruby update | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  Harry Bomrah | 6a23e29f33 | Ruby structure implementation | 2012-09-12 02:05:09 +08:00 | 
				
					
						|  Harry Bomrah | f4dde67344 | frontend fixes | 2012-09-12 02:04:36 +08:00 | 
				
					
						|  Harry Bomrah | 8caa798c08 | frontend updates | 2012-09-12 02:04:36 +08:00 | 
				
					
						|  devin | b6f10951b8 | gallery update especially upload panel | 2012-09-12 02:04:07 +08:00 | 
				
					
						|  devin | ede9727a18 | gallery update | 2012-09-12 02:02:00 +08:00 | 
				
					
						|  devin | 887b2d528d | gallery update especially upload panel | 2012-09-12 01:58:23 +08:00 | 
				
					
						|  devin | a2ed9e3350 | gallery update | 2012-09-12 01:58:22 +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 | 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 | 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 | 9f3d22360e | gallery module update | 2012-08-20 23:11:32 +08:00 |