Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								beb843f75b
								
							
						 | 
						
							
							
								
								add new member with role interface. add more not usable.
							
							
							
							
							
							
							
							role management new attribute is ok. delete is ok. 
							
						 | 
						
							2012-11-04 20:42:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								bd0d975014
								
							
						 | 
						
							
							
								
								for user new interface, member  role is working.
							
							
							
							
							
						 | 
						
							2012-10-26 11:27:37 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								d7fd61ce55
								
							
						 | 
						
							
							
								
								Edit uploaded package
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0a1a9d2c2e
								
							
						 | 
						
							
							
								
								member for THU
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								cbfa659928
								
							
						 | 
						
							
							
								
								Changes for side_bar
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								f4f07c7206
								
							
						 | 
						
							
							
								
								fix sub role attribute fields
							
							
							
							
							
							
							
							run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code. 
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9c16da4f46
								
							
						 | 
						
							
							
								
								fixed html for add link. form html
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								03b608593d
								
							
						 | 
						
							
							
								
								can add member
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0a56c555bb
								
							
						 | 
						
							
							
								
								new code for attribute fields and values for new member interface
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8b9cffd4f2
								
							
						 | 
						
							
							
								
								new code for attribute fields and values for new member interface
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d2fea92969
								
							
						 | 
						
							
							
								
								GPRS and CALENDAR
							
							
							
							
							
						 | 
						
							2012-10-09 06:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9f825de288
								
							
						 | 
						
							
							
								
								user new interface 70%
							
							
							
							
							
						 | 
						
							2012-10-09 06:40:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								fb3364b28e
								
							
						 | 
						
							
							
								
								Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
							
							
							
							
							
						 | 
						
							2012-09-24 14:14:13 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								975523c8b2
								
							
						 | 
						
							
							
								
								demo site plugin
							
							
							
							
							
						 | 
						
							2012-09-24 14:10:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								3a65f599e6
								
							
						 | 
						
							
							
								
								first version app config for Spen  durning Chris's leave.
							
							
							
							
							
						 | 
						
							2012-09-24 11:43:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0907324a2f
								
							
						 | 
						
							
							
								
								add member link to orbit menu
							
							
							
							
							
						 | 
						
							2012-09-17 14:18:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								228fa0fca3
								
							
						 | 
						
							
							
								
								Remove setting from side bar
							
							
							
							
							
						 | 
						
							2012-09-17 13:40:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								19db9d0037
								
							
						 | 
						
							
							
								
								basic function
							
							
							
							
							
						 | 
						
							2012-09-17 13:32:52 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								9eed9ec7b6
								
							
						 | 
						
							
							
								
								demo site plugin
							
							
							
							
							
						 | 
						
							2012-09-17 13:32:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b09b1cf2f5
								
							
						 | 
						
							
							
								
								commit for calendar
							
							
							
							
							
						 | 
						
							2012-09-14 21:59:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0e507d549d
								
							
						 | 
						
							
							
								
								some more changes
							
							
							
							
							
						 | 
						
							2012-09-14 15:32:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3d9fb548e1
								
							
						 | 
						
							
							
								
								calendar fixed
							
							
							
							
							
						 | 
						
							2012-09-14 15:20:01 +08:00 | 
						
					
				
					
						
							
							
								 
								OrbitServer
							
						 | 
						
							
							
							
							
							
								
							
							
								ee51240102
								
							
						 | 
						
							
							
								
								Ray's changes for new backend
							
							
							
							
							
						 | 
						
							2012-09-14 02:38:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								194773f064
								
							
						 | 
						
							
							
								
								Fix bugs after merge
							
							
							
							
							
						 | 
						
							2012-09-14 02:27:49 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								42d50ae534
								
							
						 | 
						
							
							
								
								Plugins
							
							
							
							
							
						 | 
						
							2012-09-14 00:05:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								5fb94f644d
								
							
						 | 
						
							
							
								
								break down Ray's HTML
							
							
							
							
							
						 | 
						
							2012-09-14 00:02:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4818e3f444
								
							
						 | 
						
							
							
								
								first version for new member html
							
							
							
							
							
						 | 
						
							2012-09-14 00:02:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2e9af5d1a8
								
							
						 | 
						
							
							
								
								fix commit bugs
							
							
							
							
							
						 | 
						
							2012-09-13 15:53:36 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								816b542ca6
								
							
						 | 
						
							
							
								
								Change side bar to use key instead of title for ModuleApps
							
							
							
							
							
						 | 
						
							2012-09-12 03:07:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e88b09cf72
								
							
						 | 
						
							
							
								
								Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/pages_controller.rb
	app/views/layouts/_side_bar.html.erb
	lib/parsers/parser_common.rb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
	vendor/built_in_modules/gallery/config/locales/en.yml
	vendor/built_in_modules/gallery/config/locales/zh_tw.yml 
							
						 | 
						
							2012-09-12 02:21:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4ea0c0ec9c
								
							
						 | 
						
							
							
								
								minor fix for sidebar
							
							
							
							
							
						 | 
						
							2012-09-12 02:14:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8a71bd530f
								
							
						 | 
						
							
							
								
								page added...
							
							
							
							
							
						 | 
						
							2012-09-12 02:14:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7ae1dcd8e0
								
							
						 | 
						
							
							
								
								Calendar Module
							
							
							
							
							
						 | 
						
							2012-09-12 02:06:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6a23e29f33
								
							
						 | 
						
							
							
								
								Ruby structure implementation
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c84b6a626e
								
							
						 | 
						
							
							
								
								minor fix for sidebar
							
							
							
							
							
						 | 
						
							2012-09-11 16:50:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7bab8bf8ad
								
							
						 | 
						
							
							
								
								page added...
							
							
							
							
							
						 | 
						
							2012-09-10 14:44:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								dcdd730a01
								
							
						 | 
						
							
							
								
								Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
							
							
							
							
							
							
							
							Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb 
							
						 | 
						
							2012-08-31 14:31:54 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								a1560ebcf5
								
							
						 | 
						
							
							
								
								update archive
							
							
							
							
							
						 | 
						
							2012-08-30 15:17:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3ebe7378b9
								
							
						 | 
						
							
							
								
								Delete duplicate side_bar code
							
							
							
							
							
						 | 
						
							2012-08-30 14:49:31 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								bc5235aa9f
								
							
						 | 
						
							
							
								
								archive checkbox
							
							
							
							
							
						 | 
						
							2012-08-30 14:49:31 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								e281262b6d
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-30 14:49:31 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								2a4c737cdd
								
							
						 | 
						
							
							
								
								archive checkbox
							
							
							
							
							
						 | 
						
							2012-08-30 14:48:42 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								7ce4a51b73
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-30 14:45:28 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								eb7e73b393
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-30 14:44:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								becf88bc20
								
							
						 | 
						
							
							
								
								Delete duplicate side_bar code
							
							
							
							
							
						 | 
						
							2012-08-30 14:39:48 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								c74ebb91b8
								
							
						 | 
						
							
							
								
								archive checkbox
							
							
							
							
							
						 | 
						
							2012-08-30 14:37:56 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								57717eef33
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-30 14:36:48 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								8a5519073b
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-30 14:32:32 +08:00 |