Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e486ac5d25
								
							
						 | 
						
							
							
								
								complete visitor dashbroad
							
							
							
							
							
						 | 
						
							2012-09-11 11:30:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								01a8a9b5b6
								
							
						 | 
						
							
							
								
								users new interface controller
							
							
							
							
							
						 | 
						
							2012-09-11 10:53:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								42cfe5ac91
								
							
						 | 
						
							
							
								
								first version for new member html
							
							
							
							
							
						 | 
						
							2012-09-11 10:52:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt
							
						 | 
						
							
							
							
							
							
								
							
							
								71021b8c69
								
							
						 | 
						
							
							
								
								Changes for empty file and link in create and edit for news and announcement + partially fix tinymce
							
							
							
							
							
						 | 
						
							2012-09-11 00:41:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								b110b22daa
								
							
						 | 
						
							
							
								
								Change 熱門 to 頭版 for news
							
							
							
							
							
						 | 
						
							2012-09-10 15:55:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4dfe3e7b3b
								
							
						 | 
						
							
							
								
								Change 熱門 to 頭版 for news
							
							
							
							
							
						 | 
						
							2012-09-10 15:19:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7bab8bf8ad
								
							
						 | 
						
							
							
								
								page added...
							
							
							
							
							
						 | 
						
							2012-09-10 14:44:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								3db2664c14
								
							
						 | 
						
							
							
								
								add missing file
							
							
							
							
							
						 | 
						
							2012-09-10 14:23:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e12701b34b
								
							
						 | 
						
							
							
								
								preview for association  object
							
							
							
							
							
						 | 
						
							2012-09-10 14:19:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								768f907f66
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU
							
							
							
							
							
						 | 
						
							2012-09-10 11:54:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a20db344f1
								
							
						 | 
						
							
							
								
								preview for update
							
							
							
							
							
						 | 
						
							2012-09-10 11:53:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt
							
						 | 
						
							
							
							
							
							
								
							
							
								9d21a86f53
								
							
						 | 
						
							
							
								
								Ray's CSS changes for NCCU email
							
							
							
							
							
						 | 
						
							2012-09-07 18:16:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								6044857fea
								
							
						 | 
						
							
							
								
								complete preview for both new and announcement
							
							
							
							
							
						 | 
						
							2012-09-07 17:55:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								8bd5481b3f
								
							
						 | 
						
							
							
								
								fix object_auth security problem
							
							
							
							
							
						 | 
						
							2012-09-07 17:53:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								8295286c6e
								
							
						 | 
						
							
							
								
								frontend commits
							
							
							
							
							
						 | 
						
							2012-09-05 19:08:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b726c10857
								
							
						 | 
						
							
							
								
								front ends updates
							
							
							
							
							
						 | 
						
							2012-09-04 21:30:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a080667615
								
							
						 | 
						
							
							
								
								frontend updates
							
							
							
							
							
						 | 
						
							2012-09-04 17:17:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								671f86b612
								
							
						 | 
						
							
							
								
								First version of new preview. Only plain text
							
							
							
							
							
						 | 
						
							2012-09-04 12:31:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ecb3b5b25c
								
							
						 | 
						
							
							
								
								stop saving sold files on git
							
							
							
							
							
						 | 
						
							2012-09-04 09:34:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ae1595a008
								
							
						 | 
						
							
							
								
								view for preview
							
							
							
							
							
						 | 
						
							2012-09-04 09:24:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4a12c9d6fb
								
							
						 | 
						
							
							
								
								frontend update
							
							
							
							
							
						 | 
						
							2012-09-03 21:49:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								202d736a5d
								
							
						 | 
						
							
							
								
								one more modification
							
							
							
							
							
						 | 
						
							2012-08-31 22:02:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4d6a9a8e87
								
							
						 | 
						
							
							
								
								Modifications in ruby
							
							
							
							
							
						 | 
						
							2012-08-31 22:01:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								fc4e2ceba5
								
							
						 | 
						
							
							
								
								fix for 403 for new interface
							
							
							
							
							
						 | 
						
							2012-08-31 18:56:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								26f99c296f
								
							
						 | 
						
							
							
								
								fix page blank for 403 forbidden.
							
							
							
							
							
						 | 
						
							2012-08-31 18:33:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								6b904a37ad
								
							
						 | 
						
							
							
								
								let all signed in users at NCCU upload files
							
							
							
							
							
						 | 
						
							2012-08-31 17:54:25 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								0cb573946e
								
							
						 | 
						
							
							
								
								update item page
							
							
							
							
							
						 | 
						
							2012-08-30 15:17:39 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								c739ab3984
								
							
						 | 
						
							
							
								
								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 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								10d9253399
								
							
						 | 
						
							
							
								
								announcement edit to view file
							
							
							
							
							
						 | 
						
							2012-08-30 14:25:51 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								29bcfa3139
								
							
						 | 
						
							
							
								
								archive checkbox
							
							
							
							
							
						 | 
						
							2012-08-30 14:19:51 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								c5c7b0ca7c
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-30 14:18:16 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								d5cc9961e3
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-30 14:14:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b0c13e34d4
								
							
						 | 
						
							
							
								
								Calendar update
							
							
							
							
							
						 | 
						
							2012-08-29 20:21:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3423167600
								
							
						 | 
						
							
							
								
								minor changes
							
							
							
							
							
						 | 
						
							2012-08-29 20:16:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9cd7aa81a6
								
							
						 | 
						
							
							
								
								Calendar Module
							
							
							
							
							
						 | 
						
							2012-08-29 20:13:41 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								34764fb28d
								
							
						 | 
						
							
							
								
								front update
							
							
							
							
							
						 | 
						
							2012-08-29 17:54:18 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								43294b2f49
								
							
						 | 
						
							
							
								
								backend update
							
							
							
							
							
						 | 
						
							2012-08-29 17:48:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4fc196fb71
								
							
						 | 
						
							
							
								
								resize thumbnails
							
							
							
							
							
						 | 
						
							2012-08-29 17:36:12 +08:00 |