|  Spen | 5d3bc07488 | archive and web_resouce for new ui Conflicts:
	app/assets/stylesheets/lib/main-forms.css | 2013-07-22 18:14:33 +08:00 | 
				
					
						|  chris | 856898016b | New UI changes(tags, categories, authorisations, module index…) To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) | 2013-07-02 16:46:44 +08:00 | 
				
					
						|  Spen | 8751b15385 | archive app add Module Authorization & Category Authorization | 2013-06-26 15:35:35 +08:00 | 
				
					
						|  chris | 253cca06cc | New widget for tag cloud | 2013-06-06 17:17:45 +08:00 | 
				
					
						|  Matt K. Fu | 30824d1620 | add search to archive | 2013-06-05 18:03:09 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | d047a3d62a | chris tags update | 2013-04-26 11:26:10 +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 | 
				
					
						|  Fu Matthew | 15b9839b76 | fix archive category fix page adding failed | 2013-03-04 14:40:29 +08:00 | 
				
					
						|  chris | 680d7908b9 | member plugin init edit | 2013-02-21 17:53:08 +08:00 | 
				
					
						|  unknown | f59da3ce81 | member plugin init edit | 2013-02-20 18:05:09 +08:00 | 
				
					
						|  unknown | bc44d38948 | member plugin edit | 2013-02-20 17:25:20 +08:00 | 
				
					
						|  Fu Matthew | 0a115906f1 | fix i18n,reload problems | 2013-02-19 14:21:54 +08:00 | 
				
					
						|  Fu Matthew | b7d797f9dd | fix member sidebar add i18n for modules and default_widgets | 2013-02-19 14:21:54 +08:00 | 
				
					
						|  Fu Matthew | a6f6dc271c | fix i18n,reload problems | 2013-02-18 15:13:31 +08:00 | 
				
					
						|  Fu Matthew | 29bb92f841 | fix member sidebar add i18n for modules and default_widgets | 2013-02-06 17:44:38 +08:00 | 
				
					
						|  Fu Matthew | 71d5abae2e | first version of app config and modified inits. | 2013-01-29 20:33:40 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 2dd2368378 | remove merge marks | 2012-12-25 11:26:23 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 49e6c33b57 | Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml | 2012-12-25 11:01:36 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 41bcbdd2f0 | missing file? | 2012-12-24 16:39:53 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 062ebecae3 | fix serval bugs on sidebar. | 2012-12-24 16:39:53 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 53afb6ea0c | sidebar rewrited | 2012-12-24 16:39:53 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 858e942da2 | fix serval bugs on sidebar. | 2012-12-07 12:40:47 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 99f28a0cba | sidebar rewrited | 2012-12-05 18:35:58 +08:00 |