Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6b8c79a9a8
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_devin' into desktop_harry
							
							
							
							
							
						 | 
						
							2012-05-02 17:06:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								5b7c422446
								
							
						 | 
						
							
							
								
								position update fixed..
							
							
							
							
							
						 | 
						
							2012-05-02 17:05:40 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								887bda1491
								
							
						 | 
						
							
							
								
								lots of change
							
							
							
							
							
						 | 
						
							2012-05-02 17:04:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								92a53c1b27
								
							
						 | 
						
							
							
								
								Ray's fix
							
							
							
							
							
						 | 
						
							2012-05-02 16:20:59 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								bfc4507696
								
							
						 | 
						
							
							
								
								Connection page design
							
							
							
							
							
						 | 
						
							2012-05-01 18:05:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								769a67f026
								
							
						 | 
						
							
							
								
								the group more structured and also demo connecting with gmail account..
							
							
							
							
							
						 | 
						
							2012-04-30 21:17:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1b7fb106f8
								
							
						 | 
						
							
							
								
								lot of updates
							
							
							
							
							
						 | 
						
							2012-04-30 14:33:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								aacd9da9fb
								
							
						 | 
						
							
							
								
								auto login encryption done…
							
							
							
							
							
						 | 
						
							2012-04-30 14:29:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a9ab016d52
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
						 | 
						
							2012-04-30 08:33:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								bda21baed2
								
							
						 | 
						
							
							
								
								Add missing js
							
							
							
							
							
						 | 
						
							2012-04-30 08:32:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								20504b2205
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb 
							
						 | 
						
							2012-04-30 07:57:20 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								b6fceadff4
								
							
						 | 
						
							
							
								
								column group experiment
							
							
							
							
							
						 | 
						
							2012-04-30 06:41:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								32faef0c70
								
							
						 | 
						
							
							
								
								DRY code for sorting
							
							
							
							
							
						 | 
						
							2012-04-30 06:30:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								c4db7e2157
								
							
						 | 
						
							
							
								
								Fix approval setting ajax problem
							
							
							
							
							
						 | 
						
							2012-04-30 00:24:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								94d61abf83
								
							
						 | 
						
							
							
								
								A modal view for approval user
							
							
							
							
							
						 | 
						
							2012-04-30 00:24:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								851dc72f42
								
							
						 | 
						
							
							
								
								Ray's changes in css and html
							
							
							
							
							
						 | 
						
							2012-04-30 00:17:18 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								03f19b80b4
								
							
						 | 
						
							
							
								
								small change
							
							
							
							
							
						 | 
						
							2012-04-28 01:49:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2362e1cfdd
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
						 | 
						
							2012-04-27 15:28:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								799fd1e3ac
								
							
						 | 
						
							
							
								
								Fix css bugs (opacity=) and changes in sign_in page
							
							
							
							
							
						 | 
						
							2012-04-27 15:27:59 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								2ebba577eb
								
							
						 | 
						
							
							
								
								journal start
							
							
							
							
							
						 | 
						
							2012-04-27 14:04:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3beb035101
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
						 | 
						
							2012-04-27 11:11:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5aca3db95f
								
							
						 | 
						
							
							
								
								Ray's changes for structure and web_links
							
							
							
							
							
						 | 
						
							2012-04-27 11:02:56 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								682880c5bf
								
							
						 | 
						
							
							
								
								skip it
							
							
							
							
							
						 | 
						
							2012-04-26 23:18:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c158375d02
								
							
						 | 
						
							
							
								
								with connection and some save settings…
							
							
							
							
							
						 | 
						
							2012-04-26 21:30:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								7d6b82d9dd
								
							
						 | 
						
							
							
								
								Merge branch 'ad_banner' into ldap
							
							
							
							
							
						 | 
						
							2012-04-26 17:15:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3d293f6419
								
							
						 | 
						
							
							
								
								Fix for quick edit file and link in announcement
							
							
							
							
							
							
							
							Change submit_button into ajax_for_submit 
							
						 | 
						
							2012-04-26 16:42:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6f1eb97ace
								
							
						 | 
						
							
							
								
								Fix for structure js and css
							
							
							
							
							
						 | 
						
							2012-04-25 18:41:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								58d52c60d3
								
							
						 | 
						
							
							
								
								Fix for structure: restore js and change manifests
							
							
							
							
							
						 | 
						
							2012-04-25 18:17:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								1f4fe65430
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
							
							
							Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb 
							
						 | 
						
							2012-04-25 16:45:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								876036dd20
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb 
							
						 | 
						
							2012-04-25 16:39:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								65a6f9c416
								
							
						 | 
						
							
							
								
								Ray's css fix for quick edit
							
							
							
							
							
						 | 
						
							2012-04-25 16:26:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								7f285f4719
								
							
						 | 
						
							
							
								
								Change ad_banner preview from using title to id
							
							
							
							
							
						 | 
						
							2012-04-25 16:10:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a298cbd5f6
								
							
						 | 
						
							
							
								
								Publication started
							
							
							
							
							
						 | 
						
							2012-04-24 16:45:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								d1f687e43e
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
						 | 
						
							2012-04-24 16:32:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								c7d8e0b27b
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb 
							
						 | 
						
							2012-04-24 16:32:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								291d5e3a03
								
							
						 | 
						
							
							
								
								Ray's changes in css
							
							
							
							
							
						 | 
						
							2012-04-24 16:24:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								70f6c7b540
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb 
							
						 | 
						
							2012-04-24 15:28:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								c0abaa643c
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
						 | 
						
							2012-04-24 15:21:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								45c194e870
								
							
						 | 
						
							
							
								
								Ray's changes in css
							
							
							
							
							
						 | 
						
							2012-04-24 15:15:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								c57ba305e9
								
							
						 | 
						
							
							
								
								Fix ad_banner
							
							
							
							
							
						 | 
						
							2012-04-24 14:37:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								42aeaead93
								
							
						 | 
						
							
							
								
								Ray's changes, put the js for upload image component in a separate file
							
							
							
							
							
						 | 
						
							2012-04-24 12:15:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								b80339d704
								
							
						 | 
						
							
							
								
								Ray's changes for image upload component and sign-in page
							
							
							
							
							
						 | 
						
							2012-04-24 11:35:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								308cfc7cf2
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
							
							
							Conflicts:
	app/views/devise/sessions/new.html.erb 
							
						 | 
						
							2012-04-24 02:46:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6831a3dbbb
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
						 | 
						
							2012-04-24 02:44:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0c4328987a
								
							
						 | 
						
							
							
								
								Ray's changes for css files, sort headers in announcement and pagination
							
							
							
							
							
						 | 
						
							2012-04-24 02:37:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								d4aea664e2
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb 
							
						 | 
						
							2012-04-24 02:37:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a5b13e680f
								
							
						 | 
						
							
							
								
								Add sub_menu in r_tags
							
							
							
							
							
						 | 
						
							2012-04-24 02:30:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								670ec2a40e
								
							
						 | 
						
							
							
								
								Themes from db fixed..
							
							
							
							
							
						 | 
						
							2012-04-23 21:04:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5a423178e3
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
							
							
							Conflicts:
	app/assets/stylesheets/new_admin.css.erb
	app/assets/stylesheets/widget.css 
							
						 | 
						
							2012-04-23 15:16:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								499930a680
								
							
						 | 
						
							
							
								
								Pull from github
							
							
							
							
							
						 | 
						
							2012-04-23 14:29:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2eeb530422
								
							
						 | 
						
							
							
								
								Merge branch 'master' into ldap
							
							
							
							
							
							
							
							Conflicts:
	app/assets/stylesheets/new_admin.css.erb 
							
						 | 
						
							2012-04-23 14:13:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0c46b4da23
								
							
						 | 
						
							
							
								
								AdImage and AnBanner JS fixed
							
							
							
							
							
						 | 
						
							2012-04-23 14:07:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								81b0046f42
								
							
						 | 
						
							
							
								
								Preview now can be use at both ad_banner and ad_image,however it won't run correctly  if user change its ad_banner at ad_image.
							
							
							
							
							
						 | 
						
							2012-04-23 14:07:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1b70852ff7
								
							
						 | 
						
							
							
								
								realtime preview is working. but save to object when preview
							
							
							
							
							
						 | 
						
							2012-04-23 14:06:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8cc0611c4a
								
							
						 | 
						
							
							
								
								Ray's fix for ad_banner
							
							
							
							
							
						 | 
						
							2012-04-23 14:06:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2f279c53ff
								
							
						 | 
						
							
							
								
								Apply patch from ldap
							
							
							
							
							
						 | 
						
							2012-04-23 14:04:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								868118116b
								
							
						 | 
						
							
							
								
								Merge commit 'b6f64cd8a5b48ad84703e3824ef4d968ed71779d' into ldap
							
							
							
							
							
						 | 
						
							2012-04-23 13:58:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								6a4203b850
								
							
						 | 
						
							
							
								
								Ray's css fix with widget css
							
							
							
							
							
						 | 
						
							2012-04-23 11:53:36 +08:00 | 
						
					
				
					
						
							
							
								 
								nccu
							
						 | 
						
							
							
							
							
							
								
							
							
								fe9032787c
								
							
						 | 
						
							
							
								
								NCCU ldap debug
							
							
							
							
							
						 | 
						
							2012-04-23 10:13:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8c42f6bb7c
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_harry' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-04-20 14:44:57 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								2ebed9e44a
								
							
						 | 
						
							
							
								
								javascript update
							
							
							
							
							
						 | 
						
							2012-04-20 09:45:40 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								1f077cf2b3
								
							
						 | 
						
							
							
								
								javascript update
							
							
							
							
							
						 | 
						
							2012-04-20 07:31:48 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								19750d69e0
								
							
						 | 
						
							
							
								
								some update
							
							
							
							
							
						 | 
						
							2012-04-20 05:38:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3eaf97babe
								
							
						 | 
						
							
							
								
								title and heading and welcome msg…
							
							
							
							
							
						 | 
						
							2012-04-19 20:26:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3c5b7a5de3
								
							
						 | 
						
							
							
								
								Modified confirm box…
							
							
							
							
							
						 | 
						
							2012-04-19 15:36:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ba0677a001
								
							
						 | 
						
							
							
								
								Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap
							
							
							
							
							
						 | 
						
							2012-04-19 14:09:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								f55b3a4374
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
							
							
							
							
							
							
							
							Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb 
							
						 | 
						
							2012-04-19 14:06:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								72efdbd742
								
							
						 | 
						
							
							
								
								changes before Chirs and Ray's trip
							
							
							
							
							
						 | 
						
							2012-04-19 11:50:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4bad25e682
								
							
						 | 
						
							
							
								
								Msg box added and background image saving complete
							
							
							
							
							
						 | 
						
							2012-04-18 22:01:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b4bf81d40a
								
							
						 | 
						
							
							
								
								background image…
							
							
							
							
							
						 | 
						
							2012-04-18 18:20:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6b35cf821e
								
							
						 | 
						
							
							
								
								some updates
							
							
							
							
							
						 | 
						
							2012-04-18 18:15:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								30a6dc6a95
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_harry' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-04-18 17:58:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								11a0875c44
								
							
						 | 
						
							
							
								
								color changes in custom color…
							
							
							
							
							
						 | 
						
							2012-04-18 17:57:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d14630769a
								
							
						 | 
						
							
							
								
								Bg color fixed…
							
							
							
							
							
						 | 
						
							2012-04-18 14:57:00 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								b743413be9
								
							
						 | 
						
							
							
								
								function update
							
							
							
							
							
						 | 
						
							2012-04-18 13:17:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7b391904f7
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
							
							
							
							
							
						 | 
						
							2012-04-17 21:20:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								95a1e266ae
								
							
						 | 
						
							
							
								
								Custom thème done and theme id done…
							
							
							
							
							
						 | 
						
							2012-04-17 21:15:40 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								1f44a10206
								
							
						 | 
						
							
							
								
								wallpaper added
							
							
							
							
							
						 | 
						
							2012-04-17 18:06:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b2d72902c3
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_harry' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-04-17 16:35:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								02c6933d0b
								
							
						 | 
						
							
							
								
								Tiles position saved in db and also change them from section manager
							
							
							
							
							
						 | 
						
							2012-04-17 16:33:41 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								8cd4844689
								
							
						 | 
						
							
							
								
								html change
							
							
							
							
							
						 | 
						
							2012-04-17 16:32:11 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								4f18257733
								
							
						 | 
						
							
							
								
								try
							
							
							
							
							
						 | 
						
							2012-04-17 01:32:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8d2e5210a1
								
							
						 | 
						
							
							
								
								alert removes
							
							
							
							
							
						 | 
						
							2012-04-13 17:06:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d92451d079
								
							
						 | 
						
							
							
								
								alert removed
							
							
							
							
							
						 | 
						
							2012-04-13 17:05:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7479a64c95
								
							
						 | 
						
							
							
								
								width changes in section page
							
							
							
							
							
						 | 
						
							2012-04-13 17:01:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								430b0fd9ae
								
							
						 | 
						
							
							
								
								Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/ad_banners/_ad_image_update.html.erb 
							
						 | 
						
							2012-04-13 16:52:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4af73ecf6f
								
							
						 | 
						
							
							
								
								fix preview window size.
							
							
							
							
							
						 | 
						
							2012-04-13 16:46:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0fe5baf93f
								
							
						 | 
						
							
							
								
								fix for letting ad_banner display even when file in not uploaded
							
							
							
							
							
						 | 
						
							2012-04-13 16:14:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								957d4eaebb
								
							
						 | 
						
							
							
								
								Merge branch 'master' into desktop_harry
							
							
							
							
							
						 | 
						
							2012-04-13 16:03:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ca0fc4c767
								
							
						 | 
						
							
							
								
								Comment out code that bugged upload image in ad_banner
							
							
							
							
							
						 | 
						
							2012-04-13 15:53:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f54dba8b0b
								
							
						 | 
						
							
							
								
								Merge branch 'master' into desktop_harry
							
							
							
							
							
						 | 
						
							2012-04-13 13:39:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								64a9579b92
								
							
						 | 
						
							
							
								
								final on 13 april 00:00
							
							
							
							
							
						 | 
						
							2012-04-13 00:00:24 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6b43e70f53
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_harry' into desktop_devin
							
							
							
							
							
						 | 
						
							2012-04-12 22:21:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								193cee2df7
								
							
						 | 
						
							
							
								
								new icons and widgets
							
							
							
							
							
						 | 
						
							2012-04-12 22:18:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f8873267a2
								
							
						 | 
						
							
							
								
								Ray's fix for announcement list
							
							
							
							
							
						 | 
						
							2012-04-12 18:41:14 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								eabbba76fc
								
							
						 | 
						
							
							
								
								css change
							
							
							
							
							
						 | 
						
							2012-04-12 18:14:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								93ac99d235
								
							
						 | 
						
							
							
								
								Add missing css in "inc"
							
							
							
							
							
						 | 
						
							2012-04-12 18:12:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								92427e8831
								
							
						 | 
						
							
							
								
								section page done…
							
							
							
							
							
						 | 
						
							2012-04-12 16:25:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7b423877bf
								
							
						 | 
						
							
							
								
								new updates
							
							
							
							
							
						 | 
						
							2012-04-12 14:50:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								48323ac1af
								
							
						 | 
						
							
							
								
								lot of changes in fetching
							
							
							
							
							
						 | 
						
							2012-04-12 14:44:08 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								67d1f7ad08
								
							
						 | 
						
							
							
								
								lots of change
							
							
							
							
							
						 | 
						
							2012-04-12 14:19:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								83b4443910
								
							
						 | 
						
							
							
								
								add pic and js for permission checkbox and filter
							
							
							
							
							
						 | 
						
							2012-04-12 07:14:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								57402b8602
								
							
						 | 
						
							
							
								
								add permission-checkbox js
							
							
							
							
							
						 | 
						
							2012-04-12 07:14:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e4c41ab54c
								
							
						 | 
						
							
							
								
								A filter UI for permission select. with Harry's JS
							
							
							
							
							
						 | 
						
							2012-04-12 07:14:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5417c6fec0
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb 
							
						 | 
						
							2012-04-12 07:13:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								7bca339a5b
								
							
						 | 
						
							
							
								
								Ray's fix for columns width in bulletins
							
							
							
							
							
						 | 
						
							2012-04-12 07:01:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								486845460c
								
							
						 | 
						
							
							
								
								Filter and delete for bulletins
							
							
							
							
							
						 | 
						
							2012-04-12 06:50:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								25ca29403c
								
							
						 | 
						
							
							
								
								section page added
							
							
							
							
							
						 | 
						
							2012-04-11 17:58:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								5a6541a592
								
							
						 | 
						
							
							
								
								Setting page update
							
							
							
							
							
						 | 
						
							2012-04-11 17:26:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c55cd5c9bb
								
							
						 | 
						
							
							
								
								Last commit
							
							
							
							
							
						 | 
						
							2012-04-11 15:50:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								68803c0c97
								
							
						 | 
						
							
							
								
								Lets see
							
							
							
							
							
						 | 
						
							2012-04-11 15:36:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								edf6089e0c
								
							
						 | 
						
							
							
								
								Devin complete
							
							
							
							
							
						 | 
						
							2012-04-11 15:34:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4875b339f8
								
							
						 | 
						
							
							
								
								Fetching desktop from db
							
							
							
							
							
						 | 
						
							2012-04-11 15:31:10 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								1fabe3d8f7
								
							
						 | 
						
							
							
								
								theme setting update
							
							
							
							
							
						 | 
						
							2012-04-11 15:22:05 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								0219c3df28
								
							
						 | 
						
							
							
								
								various update
							
							
							
							
							
						 | 
						
							2012-04-11 15:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								42f45aa137
								
							
						 | 
						
							
							
								
								theme setting update
							
							
							
							
							
						 | 
						
							2012-04-11 13:46:32 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								ee85380ab2
								
							
						 | 
						
							
							
								
								little update
							
							
							
							
							
						 | 
						
							2012-04-10 18:09:29 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								360e5228b7
								
							
						 | 
						
							
							
								
								custom theme settings
							
							
							
							
							
						 | 
						
							2012-04-10 17:44:36 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								6006f1b3c6
								
							
						 | 
						
							
							
								
								start editing setting page
							
							
							
							
							
							
							
							some relevant stuff updated 
							
						 | 
						
							2012-04-10 01:06:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								32a1be624b
								
							
						 | 
						
							
							
								
								Fully updated..
							
							
							
							
							
						 | 
						
							2012-04-09 17:55:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f807cd026d
								
							
						 | 
						
							
							
								
								app section modified…
							
							
							
							
							
						 | 
						
							2012-04-09 17:40:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								963a0cb604
								
							
						 | 
						
							
							
								
								Change filter to js with history for bulletins
							
							
							
							
							
						 | 
						
							2012-04-07 00:20:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								35567c2139
								
							
						 | 
						
							
							
								
								Widgets Loading dynamically and semi structured
							
							
							
							
							
						 | 
						
							2012-04-06 23:48:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bb2375b15e
								
							
						 | 
						
							
							
								
								Temp Commit
							
							
							
							
							
						 | 
						
							2012-04-06 19:05:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f65bb9b323
								
							
						 | 
						
							
							
								
								Merge branch 'master' into desktop_harry
							
							
							
							
							
							
							
							Conflicts:
	app/assets/stylesheets/style.css.erb 
							
						 | 
						
							2012-04-06 19:02:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								253f4bcb54
								
							
						 | 
						
							
							
								
								Ray's changes for orbit bar
							
							
							
							
							
						 | 
						
							2012-04-06 18:06:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e1ef2b28e7
								
							
						 | 
						
							
							
								
								theme changes
							
							
							
							
							
						 | 
						
							2012-04-06 17:49:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7309d9c446
								
							
						 | 
						
							
							
								
								Dock change and getting values from db
							
							
							
							
							
						 | 
						
							2012-04-06 17:49:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b2c9229099
								
							
						 | 
						
							
							
								
								route fixed.
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3acd8a86c7
								
							
						 | 
						
							
							
								
								commit temp
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								cd3e04c55c
								
							
						 | 
						
							
							
								
								add tinyscrollbar
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								293e084bea
								
							
						 | 
						
							
							
								
								dock effect
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f5c080efd4
								
							
						 | 
						
							
							
								
								Model commit
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								79f005c88e
								
							
						 | 
						
							
							
								
								new icons
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								58b51f0d17
								
							
						 | 
						
							
							
								
								Themes fixed…
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ddf6a606a2
								
							
						 | 
						
							
							
								
								with notifications and other changes
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6158799a47
								
							
						 | 
						
							
							
								
								Stupid theme
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								77b2919d8c
								
							
						 | 
						
							
							
								
								Desktop Commit
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								da7b415ad8
								
							
						 | 
						
							
							
								
								Desktop commit
							
							
							
							
							
						 | 
						
							2012-04-06 17:47:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								94816ce224
								
							
						 | 
						
							
							
								
								js change
							
							
							
							
							
						 | 
						
							2012-04-06 15:18:39 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								74f083b226
								
							
						 | 
						
							
							
								
								details changed
							
							
							
							
							
							
							
							orbitdesktop.js, orbitdesktopAPI.js update! 
							
						 | 
						
							2012-04-06 04:42:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								39e1bc8948
								
							
						 | 
						
							
							
								
								new setting page
							
							
							
							
							
						 | 
						
							2012-04-05 20:09:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								01bda515a6
								
							
						 | 
						
							
							
								
								fact_check with Ray's permission check.
							
							
							
							
							
							
							
							needs Ray's new css 
							
						 | 
						
							2012-04-05 17:41:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ef8eb0450b
								
							
						 | 
						
							
							
								
								Changes in tinymce bar
							
							
							
							
							
						 | 
						
							2012-04-05 17:28:21 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								f7997bbd85
								
							
						 | 
						
							
							
								
								layout adjustment
							
							
							
							
							
						 | 
						
							2012-04-05 15:52:15 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								d45725cf3b
								
							
						 | 
						
							
							
								
								fix announcement & add lang tab
							
							
							
							
							
						 | 
						
							2012-04-05 15:23:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								1259d62249
								
							
						 | 
						
							
							
								
								Fix mainTablePosition in js -> remove the notable class
							
							
							
							
							
						 | 
						
							2012-04-05 14:55:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e0f5583f43
								
							
						 | 
						
							
							
								
								route fixed.
							
							
							
							
							
						 | 
						
							2012-04-05 13:58:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								07dadbef70
								
							
						 | 
						
							
							
								
								commit temp
							
							
							
							
							
						 | 
						
							2012-04-05 13:54:49 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								a7d84e8583
								
							
						 | 
						
							
							
								
								add tinyscrollbar
							
							
							
							
							
						 | 
						
							2012-04-05 02:31:32 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								c4b9a9e275
								
							
						 | 
						
							
							
								
								dock effect
							
							
							
							
							
						 | 
						
							2012-04-04 05:53:49 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								11d3906951
								
							
						 | 
						
							
							
								
								new icons
							
							
							
							
							
						 | 
						
							2012-04-03 18:06:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8f28d45379
								
							
						 | 
						
							
							
								
								The new AdBanner.
							
							
							
							
							
						 | 
						
							2012-04-02 03:04:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								503f71e554
								
							
						 | 
						
							
							
								
								Ray's changes in tags, css and js
							
							
							
							
							
						 | 
						
							2012-04-02 02:55:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6c50aa5243
								
							
						 | 
						
							
							
								
								Add pagination to bulletin index and remove ajax to make it simple
							
							
							
							
							
						 | 
						
							2012-04-02 02:55:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bbd2c23b3d
								
							
						 | 
						
							
							
								
								Themes fixed…
							
							
							
							
							
						 | 
						
							2012-03-30 18:06:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								aa3997f7cf
								
							
						 | 
						
							
							
								
								with notifications and other changes
							
							
							
							
							
						 | 
						
							2012-03-29 19:50:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								176597f5af
								
							
						 | 
						
							
							
								
								Stupid theme
							
							
							
							
							
						 | 
						
							2012-03-29 15:23:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2e283a039d
								
							
						 | 
						
							
							
								
								Desktop Commit
							
							
							
							
							
						 | 
						
							2012-03-28 18:53:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4798cd43c1
								
							
						 | 
						
							
							
								
								Desktop commit
							
							
							
							
							
						 | 
						
							2012-03-28 18:53:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								d6e4da6dad
								
							
						 | 
						
							
							
								
								Ray's fix for margin-top
							
							
							
							
							
						 | 
						
							2012-03-28 11:31:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								55d12e50f2
								
							
						 | 
						
							
							
								
								Ray's changes in announcenment back-end
							
							
							
							
							
						 | 
						
							2012-03-27 18:58:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f9c5ee5d18
								
							
						 | 
						
							
							
								
								Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
							
							
							
							
							
							
							
							Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb 
							
						 | 
						
							2012-03-27 18:37:14 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								e8d1352890
								
							
						 | 
						
							
							
								
								fix announcement
							
							
							
							
							
						 | 
						
							2012-03-27 14:29:11 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								a30bc499c7
								
							
						 | 
						
							
							
								
								fix announcement & links
							
							
							
							
							
						 | 
						
							2012-03-27 14:19:58 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								42519d9f78
								
							
						 | 
						
							
							
								
								fix announcement & links
							
							
							
							
							
						 | 
						
							2012-03-23 18:04:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								61698f3f2c
								
							
						 | 
						
							
							
								
								Remove quick_edit on bulletin index load
							
							
							
							
							
						 | 
						
							2012-03-23 17:32:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								472744fc87
								
							
						 | 
						
							
							
								
								Changes for IE9 with html5
							
							
							
							
							
						 | 
						
							2012-03-21 15:51:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3aa7c5120d
								
							
						 | 
						
							
							
								
								Put tinymce in its own js file.
							
							
							
							
							
							
							
							To use on a text area just add the class "tinymce_textarea". 
							
						 | 
						
							2012-03-21 12:41:32 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								a755eb184b
								
							
						 | 
						
							
							
								
								fix announcement links & files
							
							
							
							
							
						 | 
						
							2012-03-16 16:49:25 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								7d553acaec
								
							
						 | 
						
							
							
								
								fix announcement link & files
							
							
							
							
							
						 | 
						
							2012-03-16 15:53:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								07edf44643
								
							
						 | 
						
							
							
								
								Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
						 | 
						
							2012-03-16 15:13:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								29ec36130e
								
							
						 | 
						
							
							
								
								css and js changes
							
							
							
							
							
						 | 
						
							2012-03-16 15:06:45 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								6f6e84b015
								
							
						 | 
						
							
							
								
								fix dashboard & announcement
							
							
							
							
							
						 | 
						
							2012-03-16 14:44:57 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								00ab773942
								
							
						 | 
						
							
							
								
								fix dashboard & announcement
							
							
							
							
							
						 | 
						
							2012-03-14 20:05:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6b2aeadde6
								
							
						 | 
						
							
							
								
								Changes for nccu
							
							
							
							
							
						 | 
						
							2012-02-29 16:01:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5223a7a3e9
								
							
						 | 
						
							
							
								
								Css and js changes
							
							
							
							
							
						 | 
						
							2012-02-29 12:45:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								9aa4173933
								
							
						 | 
						
							
							
								
								Change orbit-bar for language but bug when user name is too long
							
							
							
							
							
						 | 
						
							2012-02-29 04:21:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6a30b0a1e4
								
							
						 | 
						
							
							
								
								Add RSS event
							
							
							
							
							
						 | 
						
							2012-02-28 18:29:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f13ebc6c46
								
							
						 | 
						
							
							
								
								Fix bugs and changes for nccu
							
							
							
							
							
						 | 
						
							2012-02-27 18:50:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f8d1d7242d
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into dashboard
							
							
							
							
							
						 | 
						
							2012-02-23 16:05:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								1a6e497b3d
								
							
						 | 
						
							
							
								
								Ika's changes
							
							
							
							
							
						 | 
						
							2012-02-23 15:53:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								63d7810b35
								
							
						 | 
						
							
							
								
								Add isotope, categories for announcement page, sort for announcement
							
							
							
							
							
						 | 
						
							2012-02-23 15:52:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								22d9741ac8
								
							
						 | 
						
							
							
								
								Fix for orbit_bar
							
							
							
							
							
						 | 
						
							2012-02-23 15:51:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ba4d71a026
								
							
						 | 
						
							
							
								
								Changes in orbit_bar and js in announcements
							
							
							
							
							
						 | 
						
							2012-02-23 15:51:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								cf038183b9
								
							
						 | 
						
							
							
								
								Ika's changes in modules
							
							
							
							
							
						 | 
						
							2012-02-20 08:48:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a3f152b200
								
							
						 | 
						
							
							
								
								Changes for jquery 1.7 (.live -> .on), create module_layout
							
							
							
							
							
						 | 
						
							2012-02-20 03:24:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								44a346ffe9
								
							
						 | 
						
							
							
								
								Changes for orbit bar, login
							
							
							
							
							
						 | 
						
							2012-02-19 16:33:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								9cd3cbc478
								
							
						 | 
						
							
							
								
								Modifications for design, pages, page_parts…
							
							
							
							
							
							
							
							Move orbit_bar out of kernel.js 
							
						 | 
						
							2012-02-17 02:09:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e0accbecaa
								
							
						 | 
						
							
							
								
								Changes into page_part edition.
							
							
							
							
							
							
							
							Can choose between 'text', 'public_r_tag' and 'widget' 
							
						 | 
						
							2012-02-16 13:09:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								1913f0aca8
								
							
						 | 
						
							
							
								
								Add tinymce
							
							
							
							
							
						 | 
						
							2012-02-15 10:02:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3e70634add
								
							
						 | 
						
							
							
								
								Announcement modifications and tags
							
							
							
							
							
						 | 
						
							2012-02-15 00:34:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								55ae7de01c
								
							
						 | 
						
							
							
								
								Orbit-bar in front-end and back-end, side-bar and drop-down menu
							
							
							
							
							
						 | 
						
							2012-02-15 00:34:22 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								f097f83f2b
								
							
						 | 
						
							
							
								
								announcement_category edit
							
							
							
							
							
						 | 
						
							2012-02-06 16:20:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								8b3b71ca58
								
							
						 | 
						
							
							
								
								fix js bugs,partial bugs
							
							
							
							
							
						 | 
						
							2012-02-06 16:17:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								394099c388
								
							
						 | 
						
							
							
								
								Ad banner close complete,need validation
							
							
							
							
							
						 | 
						
							2012-02-04 09:37:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								f530eb7112
								
							
						 | 
						
							
							
								
								Revert "mistake commit"
							
							
							
							
							
							
							
							This reverts commit 2608b72d65. 
							
						 | 
						
							2012-02-03 14:39:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								2608b72d65
								
							
						 | 
						
							
							
								
								mistake commit
							
							
							
							
							
						 | 
						
							2012-02-03 14:28:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								a980847eb3
								
							
						 | 
						
							
							
								
								Basic function for AdBanner
							
							
							
							
							
						 | 
						
							2012-02-01 14:27:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5518ae362d
								
							
						 | 
						
							
							
								
								Ray's modification before redesign
							
							
							
							
							
						 | 
						
							2012-01-24 11:57:27 +08:00 |