OrbitServer
							
						 | 
						
							
							
							
							
							
								
							
							
								fbed496034
								
							
						 | 
						
							
							
								
								Harry's changes in i18n
							
							
							
							
							
						 | 
						
							2012-12-06 23:08:13 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								25a9987f13
								
							
						 | 
						
							
							
								
								calendar js minor update
							
							
							
							
							
						 | 
						
							2012-11-21 19:02:54 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								1279af0c11
								
							
						 | 
						
							
							
								
								fix and hide for visitors,except for album
							
							
							
							
							
						 | 
						
							2012-11-21 18:31:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1f8f58e930
								
							
						 | 
						
							
							
								
								album and gallery is now opened
							
							
							
							
							
						 | 
						
							2012-11-21 17:52:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ef3fddd863
								
							
						 | 
						
							
							
								
								fixed sutpid bug for calendar
							
							
							
							
							
						 | 
						
							2012-11-21 16:55:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								fda7c43efc
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/orbit into openness
							
							
							
							
							
						 | 
						
							2012-11-21 11:46:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ee053cd8ac
								
							
						 | 
						
							
							
								
								fix and hide for visitors,except for album
							
							
							
							
							
						 | 
						
							2012-11-21 11:46:06 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								f2e76d27b8
								
							
						 | 
						
							
							
								
								minor update for gallery and calendar backend
							
							
							
							
							
						 | 
						
							2012-11-21 07:36:59 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								e5d31f50a0
								
							
						 | 
						
							
							
								
								calendar "edit calendar" update
							
							
							
							
							
						 | 
						
							2012-11-12 15:11:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d904163090
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-11-01 10:47:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a25199d33b
								
							
						 | 
						
							
							
								
								Calander view updated...
							
							
							
							
							
						 | 
						
							2012-11-01 10:45:22 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								167c993108
								
							
						 | 
						
							
							
								
								calendar update
							
							
							
							
							
						 | 
						
							2012-10-30 17:26:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								5da35ee65b
								
							
						 | 
						
							
							
								
								Agenda View
							
							
							
							
							
						 | 
						
							2012-10-29 19:52:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b73981b19a
								
							
						 | 
						
							
							
								
								Devin commit
							
							
							
							
							
						 | 
						
							2012-10-29 10:17:49 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								12b7618cc7
								
							
						 | 
						
							
							
								
								calendar agenda view update
							
							
							
							
							
						 | 
						
							2012-10-27 00:11:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								5e25cf5849
								
							
						 | 
						
							
							
								
								lot of updates
							
							
							
							
							
						 | 
						
							2012-10-26 19:04:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a5722af315
								
							
						 | 
						
							
							
								
								Calendar updates for day view
							
							
							
							
							
						 | 
						
							2012-10-26 11:15:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								79e0b8e383
								
							
						 | 
						
							
							
								
								week view updates
							
							
							
							
							
						 | 
						
							2012-10-26 11:15:37 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								98ef582e17
								
							
						 | 
						
							
							
								
								shit calendar update
							
							
							
							
							
						 | 
						
							2012-10-26 11:15:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d7e8663c1d
								
							
						 | 
						
							
							
								
								calendar updated for week
							
							
							
							
							
						 | 
						
							2012-10-26 11:15:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f4eb95881f
								
							
						 | 
						
							
							
								
								Calendar updates for day view
							
							
							
							
							
						 | 
						
							2012-10-24 18:55:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a810312da4
								
							
						 | 
						
							
							
								
								week view updates
							
							
							
							
							
						 | 
						
							2012-10-18 22:21:13 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								47df69f8cf
								
							
						 | 
						
							
							
								
								shit calendar update
							
							
							
							
							
						 | 
						
							2012-10-17 17:35:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0971e00511
								
							
						 | 
						
							
							
								
								calendar updated for week
							
							
							
							
							
						 | 
						
							2012-10-16 21:51:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f76253f512
								
							
						 | 
						
							
							
								
								Week View changes
							
							
							
							
							
						 | 
						
							2012-10-09 06:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bb626470e7
								
							
						 | 
						
							
							
								
								week view updates
							
							
							
							
							
						 | 
						
							2012-10-09 06:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								022d28e5e7
								
							
						 | 
						
							
							
								
								change in algo of event generation plus now multi week events enabled
							
							
							
							
							
						 | 
						
							2012-10-09 06:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d2fea92969
								
							
						 | 
						
							
							
								
								GPRS and CALENDAR
							
							
							
							
							
						 | 
						
							2012-10-09 06:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c5743a50bb
								
							
						 | 
						
							
							
								
								event bug fixed
							
							
							
							
							
						 | 
						
							2012-09-17 13:28:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								221ffc08dd
								
							
						 | 
						
							
							
								
								Some calendar updates
							
							
							
							
							
						 | 
						
							2012-09-17 04:34:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9491945fd4
								
							
						 | 
						
							
							
								
								calendar month view update
							
							
							
							
							
						 | 
						
							2012-09-16 05:59:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b09b1cf2f5
								
							
						 | 
						
							
							
								
								commit for calendar
							
							
							
							
							
						 | 
						
							2012-09-14 21:59:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0cf2f1b9a1
								
							
						 | 
						
							
							
								
								final commit for calendar
							
							
							
							
							
						 | 
						
							2012-09-14 16:10:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								619ae7e260
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
							
							
							
							
							
							
							
							Conflicts:
	Gemfile.lock
	vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb 
							
						 | 
						
							2012-09-14 16:05:04 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								af19f11668
								
							
						 | 
						
							
							
								
								calendar update
							
							
							
							
							
							
							
							- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality) 
							
						 | 
						
							2012-09-14 15:57:44 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								f1485556bd
								
							
						 | 
						
							
							
								
								calendar update
							
							
							
							
							
						 | 
						
							2012-09-14 15:55:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6b791539f5
								
							
						 | 
						
							
							
								
								final calendar change...
							
							
							
							
							
						 | 
						
							2012-09-14 15:35:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3d9fb548e1
								
							
						 | 
						
							
							
								
								calendar fixed
							
							
							
							
							
						 | 
						
							2012-09-14 15:20:01 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								17768867a5
								
							
						 | 
						
							
							
								
								calendar update
							
							
							
							
							
							
							
							- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality) 
							
						 | 
						
							2012-09-14 00:27:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								73d5074037
								
							
						 | 
						
							
							
								
								minor shit updates
							
							
							
							
							
						 | 
						
							2012-09-13 23:57:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								29ea95b4c6
								
							
						 | 
						
							
							
								
								event_calendar testing
							
							
							
							
							
						 | 
						
							2012-09-13 23:57:47 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								3e3699c873
								
							
						 | 
						
							
							
								
								calendar update
							
							
							
							
							
						 | 
						
							2012-09-13 18:06:18 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								e96ebefe9c
								
							
						 | 
						
							
							
								
								calendar update
							
							
							
							
							
						 | 
						
							2012-09-12 16:16:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7bab8bf8ad
								
							
						 | 
						
							
							
								
								page added...
							
							
							
							
							
						 | 
						
							2012-09-10 14:44:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9cd7aa81a6
								
							
						 | 
						
							
							
								
								Calendar Module
							
							
							
							
							
						 | 
						
							2012-08-29 20:13:41 +08:00 |