Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								af103fa427
								
							
						 | 
						
							
							
								
								gallery frontend ui fixed.
							
							
							
							
							
						 | 
						
							2013-11-05 13:28:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bd3462df7f
								
							
						 | 
						
							
							
								
								small change left in last commit. commiting for gallery widget
							
							
							
							
							
						 | 
						
							2013-09-16 11:19:24 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f5f1822f0a
								
							
						 | 
						
							
							
								
								no data file added
							
							
							
							
							
						 | 
						
							2013-09-16 11:19:18 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d532ded8e4
								
							
						 | 
						
							
							
								
								widget code for gallery rewritten for new_ui
							
							
							
							
							
						 | 
						
							2013-09-16 11:19:11 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3595c59810
								
							
						 | 
						
							
							
								
								some unmerged code i pushd 3 months back not update by chris
							
							
							
							
							
						 | 
						
							2013-09-13 15:58:42 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f920a4f6ba
								
							
						 | 
						
							
							
								
								filemanager and some update for file uploader . added file uploader to kernel
							
							
							
							
							
						 | 
						
							2013-09-11 14:03:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								335991e152
								
							
						 | 
						
							
							
								
								by mistake pushed code with debugger
							
							
							
							
							
						 | 
						
							2013-09-05 12:51:15 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								131dd3fea8
								
							
						 | 
						
							
							
								
								child images tag adding and deleting updated.
							
							
							
							
							
						 | 
						
							2013-09-05 12:51:13 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4209356e9d
								
							
						 | 
						
							
							
								
								new features in gallery image view.. and also tags for gallery completed.
							
							
							
							
							
						 | 
						
							2013-09-02 11:23:01 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e75873273c
								
							
						 | 
						
							
							
								
								Updated Gallery with authorizations
							
							
							
							
							
						 | 
						
							2013-08-22 16:25:11 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								4c217ec12f
								
							
						 | 
						
							
							
								
								Updated Authorizations for Adbanner, Calendar, Location
							
							
							
							
							
						 | 
						
							2013-08-22 15:20:50 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1dc7884ec0
								
							
						 | 
						
							
							
								
								Changes for default index:
							
							
							
							
							
							
							
							- remove approvable and filterable
 - add display_option
 - change params
Update web link and gallery index 
							
						 | 
						
							2013-07-25 11:32:25 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								06ab24374b
								
							
						 | 
						
							
							
								
								Gallery - categories, module_authorization and tags to new_ui
							
							
							
							
							
						 | 
						
							2013-07-23 18:16:19 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								b642072cbe
								
							
						 | 
						
							
							
								
								Removed the category reference for now
							
							
							
							
							
						 | 
						
							2013-07-19 17:38:43 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0921d7731b
								
							
						 | 
						
							
							
								
								my favorite update :) lazy loading for theater view plus a very smooth navigation of images.
							
							
							
							
							
						 | 
						
							2013-07-19 17:38:41 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3c0d2da9a7
								
							
						 | 
						
							
							
								
								description fixed for gallery
							
							
							
							
							
						 | 
						
							2013-07-19 17:38:38 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e6c411b8e1
								
							
						 | 
						
							
							
								
								Updated tagging with galleries in new ui
							
							
							
							
							
						 | 
						
							2013-07-19 17:38:33 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								1c558a1783
								
							
						 | 
						
							
							
								
								added tags to index page, added html safe for show
							
							
							
							
							
						 | 
						
							2013-07-19 17:38:30 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3287a2ef17
								
							
						 | 
						
							
							
								
								gallery migrated to new ui
							
							
							
							
							
						 | 
						
							2013-07-19 17:38:27 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								856898016b
								
							
						 | 
						
							
							
								
								New UI changes(tags, categories, authorisations, module index…)
							
							
							
							
							
							
							
							To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) 
							
						 | 
						
							2013-07-02 16:46:44 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								127ab3845c
								
							
						 | 
						
							
							
								
								Changes for queries
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								167a71272a
								
							
						 | 
						
							
							
								
								queries need to be rethink
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								d047a3d62a
								
							
						 | 
						
							
							
								
								chris tags update
							
							
							
							
							
						 | 
						
							2013-04-26 11:26:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								11067ef34f
								
							
						 | 
						
							
							
								
								english mandatory removed from albums
							
							
							
							
							
						 | 
						
							2013-04-23 11:09:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b864cc0268
								
							
						 | 
						
							
							
								
								Changes in I18n (except personal_conference and personal_journal)
							
							
							
							
							
						 | 
						
							2013-03-12 18:13:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								874648eacf
								
							
						 | 
						
							
							
								
								add Devin's css file for gallery
							
							
							
							
							
						 | 
						
							2013-03-04 17:27:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								71d5abae2e
								
							
						 | 
						
							
							
								
								first version of app config and modified inits.
							
							
							
							
							
						 | 
						
							2013-01-29 20:33:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								dca4f5d0be
								
							
						 | 
						
							
							
								
								mv gallery_uploader
							
							
							
							
							
						 | 
						
							2013-01-16 01:35:38 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								41dff814fb
								
							
						 | 
						
							
							
								
								Change icons
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c6111460f5
								
							
						 | 
						
							
							
								
								Fix album widget options
							
							
							
							
							
						 | 
						
							2013-01-07 00:40:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								7e045959b6
								
							
						 | 
						
							
							
								
								Gallery i18n
							
							
							
							
							
						 | 
						
							2013-01-04 12:01:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								8815533075
								
							
						 | 
						
							
							
								
								correct pic file format
							
							
							
							
							
						 | 
						
							2013-01-03 18:32:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								baf1240b76
								
							
						 | 
						
							
							
								
								gallery options
							
							
							
							
							
						 | 
						
							2012-12-28 15:30:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								e9815c3d9b
								
							
						 | 
						
							
							
								
								Fix css bug when precompiling assets
							
							
							
							
							
						 | 
						
							2012-12-20 14:34:02 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2983b181e6
								
							
						 | 
						
							
							
								
								Fix some translations
							
							
							
							
							
						 | 
						
							2012-12-04 01:03:28 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6a12aec67c
								
							
						 | 
						
							
							
								
								Fix album images display
							
							
							
							
							
						 | 
						
							2012-11-22 20:01:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ec0ec46303
								
							
						 | 
						
							
							
								
								visitor now can browse gallery
							
							
							
							
							
						 | 
						
							2012-11-21 18:39:28 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								0aaadbc82d
								
							
						 | 
						
							
							
								
								Merge branch 'openness' of github.com:Rulingcom/orbit into openness
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb 
							
						 | 
						
							2012-11-21 18:33:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1f8f58e930
								
							
						 | 
						
							
							
								
								album and gallery is now opened
							
							
							
							
							
						 | 
						
							2012-11-21 17:52:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9fc8ec8e16
								
							
						 | 
						
							
							
								
								back button fix for frontend
							
							
							
							
							
						 | 
						
							2012-11-21 15:00:07 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								f2e76d27b8
								
							
						 | 
						
							
							
								
								minor update for gallery and calendar backend
							
							
							
							
							
						 | 
						
							2012-11-21 07:36:59 +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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								747b0d4620
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb 
							
						 | 
						
							2012-11-20 10:11:59 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								609c932cca
								
							
						 | 
						
							
							
								
								Fix some gallery routes
							
							
							
							
							
						 | 
						
							2012-11-20 10:05:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								04469ff845
								
							
						 | 
						
							
							
								
								Minor update for gallery frontend
							
							
							
							
							
						 | 
						
							2012-11-19 18:18:46 +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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9095713769
								
							
						 | 
						
							
							
								
								Fix bugs in Json when missing files
							
							
							
							
							
						 | 
						
							2012-11-13 15:21:59 +08:00 |