Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								536f0d30af
								
							
						 | 
						
							
							
								
								apps_translate_fix
							
							
							
							
							
						 | 
						
							2013-04-23 11:09:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								ec1605358b
								
							
						 | 
						
							
							
								
								Fix sorting for archive
							
							
							
							
							
						 | 
						
							2013-03-27 06:30:22 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								41311c74d0
								
							
						 | 
						
							
							
								
								Spen's changes in archive
							
							
							
							
							
						 | 
						
							2013-03-21 14:38:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f29ad27b56
								
							
						 | 
						
							
							
								
								Fix pagination in archive back end
							
							
							
							
							
						 | 
						
							2013-03-18 21:53:31 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2427bc5b69
								
							
						 | 
						
							
							
								
								Update CSS for archive and put the call in widget index
							
							
							
							
							
						 | 
						
							2013-03-13 17:21:39 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b864cc0268
								
							
						 | 
						
							
							
								
								Changes in I18n (except personal_conference and personal_journal)
							
							
							
							
							
						 | 
						
							2013-03-12 18:13:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								d7d480ac12
								
							
						 | 
						
							
							
								
								archive edit & plugins edit
							
							
							
							
							
						 | 
						
							2013-03-07 21:12:31 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								bc21840262
								
							
						 | 
						
							
							
								
								Comment out delete link for archive category
							
							
							
							
							
							
							
							Modify the import:
	- hot_news to announcement
	- iso_zone of 20000 to 21100 
							
						 | 
						
							2013-02-19 17:49:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								236f68ba84
								
							
						 | 
						
							
							
								
								Fix archive module back end pagination and front end html
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								de39bce4ce
								
							
						 | 
						
							
							
								
								Fix the tooltips
							
							
							
							
							
						 | 
						
							2013-01-11 12:13:16 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								41dff814fb
								
							
						 | 
						
							
							
								
								Change icons
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								c219792a13
								
							
						 | 
						
							
							
								
								fixed delete function of archive file
							
							
							
							
							
						 | 
						
							2012-12-28 10:02:16 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								390da0e49a
								
							
						 | 
						
							
							
								
								Change icons
							
							
							
							
							
						 | 
						
							2012-11-29 00:49:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1279af0c11
								
							
						 | 
						
							
							
								
								fix and hide for visitors,except for album
							
							
							
							
							
						 | 
						
							2012-11-21 18:31:57 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9b1ada0af9
								
							
						 | 
						
							
							
								
								Fix these bugs:
							
							
							
							
							
							
							
							1.結構部份
    a.原選單,點選編輯,無動作反應
    b.新增選單後,左邊灰色架構部份不會更新
  2.檔案室
    a.無法編輯分類
							
						 | 
						
							2012-11-15 15:51:44 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b40d4702d5
								
							
						 | 
						
							
							
								
								Merge branch 'master' into various_bugs
							
							
							
							
							
							
							
							Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb 
							
						 | 
						
							2012-11-06 11:44:00 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3c85f3ef00
								
							
						 | 
						
							
							
								
								Make the archive module work (it needs more details)
							
							
							
							
							
						 | 
						
							2012-11-06 10:35:11 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								63a57682e6
								
							
						 | 
						
							
							
								
								Fix bugs:
							
							
							
							
							
							
							
							TinyMCE: the size of the textarea change depending on the language
	Page content edit: no tab selected on first load 
							
						 | 
						
							2012-10-30 17:09:00 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								23a3a7eff6
								
							
						 | 
						
							
							
								
								update archive
							
							
							
							
							
						 | 
						
							2012-08-20 17:14:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								bebb8a1c1e
								
							
						 | 
						
							
							
								
								Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
							
							
							
							
							
							
							
							Conflicts:
	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 
							
						 | 
						
							2012-08-10 15:30:33 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								d8b0613147
								
							
						 | 
						
							
							
								
								archive checkbox
							
							
							
							
							
						 | 
						
							2012-08-10 15:26:34 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								d5cc470e5d
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-10 15:23:56 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								81fa2a7428
								
							
						 | 
						
							
							
								
								archive checkbox
							
							
							
							
							
						 | 
						
							2012-08-10 15:19:45 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								e8cea9f0ab
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-08-10 15:14:43 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								cc02ea511c
								
							
						 | 
						
							
							
								
								archive checkbox
							
							
							
							
							
						 | 
						
							2012-05-16 01:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								4e9bb1b583
								
							
						 | 
						
							
							
								
								new archive
							
							
							
							
							
						 | 
						
							2012-05-16 01:06:26 +08:00 |