Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								19db9d0037
								
							
						 | 
						
							
							
								
								basic function
							
							
							
							
							
						 | 
						
							2012-09-17 13:32:52 +08:00 | 
						
					
				
					
						
							
							
								 
								OrbitServer
							
						 | 
						
							
							
							
							
							
								
							
							
								ee51240102
								
							
						 | 
						
							
							
								
								Ray's changes for new backend
							
							
							
							
							
						 | 
						
							2012-09-14 02:38:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								29ea95b4c6
								
							
						 | 
						
							
							
								
								event_calendar testing
							
							
							
							
							
						 | 
						
							2012-09-13 23:57:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								17195a9a23
								
							
						 | 
						
							
							
								
								fix for admin has no orbit menu
							
							
							
							
							
						 | 
						
							2012-09-12 16:20:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								98e8f5f607
								
							
						 | 
						
							
							
								
								complete visitor dashbroad
							
							
							
							
							
						 | 
						
							2012-09-12 16:20:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								45ef7fd302
								
							
						 | 
						
							
							
								
								guest user
							
							
							
							
							
						 | 
						
							2012-09-12 16:20:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								9196deb997
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU
							
							
							
							
							
						 | 
						
							2012-08-14 01:00:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								c32b0dd4b4
								
							
						 | 
						
							
							
								
								Move delete checkboxes to js
							
							
							
							
							
						 | 
						
							2012-08-14 00:59:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								6cc470ede9
								
							
						 | 
						
							
							
								
								nccu fix
							
							
							
							
							
						 | 
						
							2012-08-13 18:35:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								18e18a4add
								
							
						 | 
						
							
							
								
								Fix for banner on ie
							
							
							
							
							
						 | 
						
							2012-08-13 15:10:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								05e61b63bb
								
							
						 | 
						
							
							
								
								Fix fb share, redirect with js when the page is not requested by fb but by user
							
							
							
							
							
						 | 
						
							2012-08-08 11:04:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a03d1ad10b
								
							
						 | 
						
							
							
								
								Change for getting url from key
							
							
							
							
							
						 | 
						
							2012-08-08 11:04:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4bed925e0f
								
							
						 | 
						
							
							
								
								Try fb from override and generated page
							
							
							
							
							
						 | 
						
							2012-08-08 11:04:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								acf4446523
								
							
						 | 
						
							
							
								
								Add meta to head for fb share
							
							
							
							
							
						 | 
						
							2012-08-08 11:04:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								85a556a4a2
								
							
						 | 
						
							
							
								
								first version of fb_share
							
							
							
							
							
						 | 
						
							2012-08-08 11:04:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								39b63a970c
								
							
						 | 
						
							
							
								
								Fix .class to .class.to_s
							
							
							
							
							
						 | 
						
							2012-07-30 18:34:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								7440727acd
								
							
						 | 
						
							
							
								
								Fix: "._type" to ".class"
							
							
							
							
							
						 | 
						
							2012-07-30 17:21:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								49dd3a1770
								
							
						 | 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models
							
							
							
							
							
						 | 
						
							2012-07-27 19:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								c5fdff764e
								
							
						 | 
						
							
							
								
								orbit disable object for categories
							
							
							
							
							
						 | 
						
							2012-07-05 16:00:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								56b1bd9eaa
								
							
						 | 
						
							
							
								
								add translation
							
							
							
							
							
						 | 
						
							2012-06-26 10:57:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4f484599b7
								
							
						 | 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar
							
							
							
							
							
						 | 
						
							2012-05-29 15:23:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								eab82269c1
								
							
						 | 
						
							
							
								
								Remove seconds from date display
							
							
							
							
							
						 | 
						
							2012-05-22 20:19:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5e9836f371
								
							
						 | 
						
							
							
								
								Changes for structure
							
							
							
							
							
						 | 
						
							2012-05-22 14:45:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4d33c7a56d
								
							
						 | 
						
							
							
								
								Changes for dat and time format
							
							
							
							
							
							
							
							Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title 
							
						 | 
						
							2012-05-18 19:42:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								7c6b807170
								
							
						 | 
						
							
							
								
								Change impression count to exclude when :referrer is nil
							
							
							
							
							
						 | 
						
							2012-05-18 14:13:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2f7d561310
								
							
						 | 
						
							
							
								
								Put back I18n for file_upload
							
							
							
							
							
						 | 
						
							2012-05-17 19:40:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								cd1640482a
								
							
						 | 
						
							
							
								
								Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
							
							
							
							
							
							
							
							Conflicts:
	app/views/layouts/_side_bar.html.erb 
							
						 | 
						
							2012-05-17 06:45:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								82d78acbad
								
							
						 | 
						
							
							
								
								First version of app and object auth for web_resource module. Basic fund is ok.  backend need to be secued
							
							
							
							
							
						 | 
						
							2012-05-17 06:43:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								03387d3c07
								
							
						 | 
						
							
							
								
								Object auth for ad_banner
							
							
							
							
							
						 | 
						
							2012-05-17 06:42:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								f663985a40
								
							
						 | 
						
							
							
								
								starting ad_banner auth
							
							
							
							
							
						 | 
						
							2012-05-17 06:42:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								9129835f23
								
							
						 | 
						
							
							
								
								Add tags to assets
							
							
							
							
							
						 | 
						
							2012-05-16 18:19:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								befd3bcdec
								
							
						 | 
						
							
							
								
								AdBanner reopen new banner and delete.   Rename title with content editable tag.
							
							
							
							
							
						 | 
						
							2012-05-16 16:42:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a31a9c4792
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb 
							
						 | 
						
							2012-05-16 12:13:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e54f4409fb
								
							
						 | 
						
							
							
								
								Add impressionist
							
							
							
							
							
						 | 
						
							2012-05-15 21:26:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								3f744dab05
								
							
						 | 
						
							
							
								
								First version of app and object auth for web_resource module. Basic fund is ok.  backend need to be secued
							
							
							
							
							
						 | 
						
							2012-05-15 18:55:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b23b5e8ec5
								
							
						 | 
						
							
							
								
								Object auth for ad_banner
							
							
							
							
							
						 | 
						
							2012-05-15 16:39:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0a9f0bcc45
								
							
						 | 
						
							
							
								
								starting ad_banner auth
							
							
							
							
							
						 | 
						
							2012-05-15 09:57:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9ba4c2cf2f
								
							
						 | 
						
							
							
								
								Change to apply page to had object_auth
							
							
							
							
							
						 | 
						
							2012-05-14 12:40:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								2cd67356a5
								
							
						 | 
						
							
							
								
								Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
							
							
							
							
							
							
							
							Conflicts:
	config/locales/zh_tw.yml 
							
						 | 
						
							2012-05-14 12:36:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e1450ec748
								
							
						 | 
						
							
							
								
								Change to apply page to had object_auth
							
							
							
							
							
						 | 
						
							2012-05-14 12:34:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0119ab1a74
								
							
						 | 
						
							
							
								
								New Interface for App Auth and Object Auth
							
							
							
							
							
						 | 
						
							2012-05-14 00:50:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								82fa85def8
								
							
						 | 
						
							
							
								
								Clean the parsers code
							
							
							
							
							
						 | 
						
							2012-05-13 19:32:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ef49df448d
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
							
							
							Conflicts:
	app/helpers/admin/item_helper.rb 
							
						 | 
						
							2012-05-11 18:09:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								076f5ad6ef
								
							
						 | 
						
							
							
								
								Ray's changes for drag and drop in structure's side_bar
							
							
							
							
							
						 | 
						
							2012-05-11 17:54:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								20a1a6e30f
								
							
						 | 
						
							
							
								
								New Interface for App Auth and Object Auth
							
							
							
							
							
						 | 
						
							2012-05-11 16:44:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6a443f0976
								
							
						 | 
						
							
							
								
								Add mongoid-tree to Item
							
							
							
							
							
						 | 
						
							2012-05-11 16:16:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								fd52d00187
								
							
						 | 
						
							
							
								
								Add drag and drop to structure side_bar
							
							
							
							
							
						 | 
						
							2012-05-11 10:00:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b6aad17681
								
							
						 | 
						
							
							
								
								Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
							
							
							
							
							
						 | 
						
							2012-05-10 14:16:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								87ebcc48e7
								
							
						 | 
						
							
							
								
								Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
							
							
							
							
							
						 | 
						
							2012-05-10 11:51:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2b03263fb7
								
							
						 | 
						
							
							
								
								Dashboard partial implementation
							
							
							
							
							
						 | 
						
							2012-05-09 05:53:07 +08:00 |