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 | 
						
					
				
					
						
							
							
								 
								OrbitServer
							
						 | 
						
							
							
							
							
							
								
							
							
								fbed496034
								
							
						 | 
						
							
							
								
								Harry's changes in i18n
							
							
							
							
							
						 | 
						
							2012-12-06 23:08:13 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9095713769
								
							
						 | 
						
							
							
								
								Fix bugs in Json when missing files
							
							
							
							
							
						 | 
						
							2012-11-13 15:21:59 +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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								63a57682e6
								
							
						 | 
						
							
							
								
								Fix bugs:
							
							
							
							
							
							
							
							TinyMCE: the size of the textarea change depending on the language
	Page content edit: no tab selected on first load 
							
						 | 
						
							2012-10-30 17:09:00 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								8c6e5deb64
								
							
						 | 
						
							
							
								
								gallery update
							
							
							
							
							
							
							
							please don't forget to add translation in other language 
							
						 | 
						
							2012-10-26 11:15:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								45ccc315c7
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
							
							
							
							
							
						 | 
						
							2012-09-12 17:53:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4dff15cffb
								
							
						 | 
						
							
							
								
								Add before_filter in gallery
							
							
							
							
							
						 | 
						
							2012-09-12 17:52:24 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								5443aba43e
								
							
						 | 
						
							
							
								
								with gallery json
							
							
							
							
							
						 | 
						
							2012-09-12 16:50:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4ea0c0ec9c
								
							
						 | 
						
							
							
								
								minor fix for sidebar
							
							
							
							
							
						 | 
						
							2012-09-12 02:14:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8dd69a140f
								
							
						 | 
						
							
							
								
								frontend commits
							
							
							
							
							
						 | 
						
							2012-09-12 02:12:15 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								3fc07b9ff1
								
							
						 | 
						
							
							
								
								one more modification
							
							
							
							
							
						 | 
						
							2012-09-12 02:07:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2a66b89d33
								
							
						 | 
						
							
							
								
								Modifications in ruby
							
							
							
							
							
						 | 
						
							2012-09-12 02:07:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7ae1dcd8e0
								
							
						 | 
						
							
							
								
								Calendar Module
							
							
							
							
							
						 | 
						
							2012-09-12 02:06:22 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								a05fff98ac
								
							
						 | 
						
							
							
								
								front update
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:10 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								4e662c744a
								
							
						 | 
						
							
							
								
								backend update
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								97923a4d31
								
							
						 | 
						
							
							
								
								resize thumbnails
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7903d2ae36
								
							
						 | 
						
							
							
								
								ruby update for form and edit tagging
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:10 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								789c2df7fd
								
							
						 | 
						
							
							
								
								gallery frontend update
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8259dee4a3
								
							
						 | 
						
							
							
								
								Ruby update
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:10 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								cc6986cb16
								
							
						 | 
						
							
							
								
								language fix
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:10 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								0be494c62b
								
							
						 | 
						
							
							
								
								front end added
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6a23e29f33
								
							
						 | 
						
							
							
								
								Ruby structure implementation
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								26ff2af078
								
							
						 | 
						
							
							
								
								View only update
							
							
							
							
							
						 | 
						
							2012-09-12 02:04:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f62eba182e
								
							
						 | 
						
							
							
								
								Commit for view only
							
							
							
							
							
						 | 
						
							2012-09-12 02:04:36 +08:00 |