|  unknown | 97d2380406 | Merge branch 'new' of https://github.com/Rulingcom/orbit into new | 2012-11-06 14:28:03 +08:00 | 
				
					
						|  unknown | b9c8d9d657 | plugin edit | 2012-11-06 14:26:37 +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 | 
				
					
						|  Rueshyna | ed3644fb89 | done journal | 2012-11-05 11:42:49 +08:00 | 
				
					
						|  unknown | bd17641d18 | member plugin list add new | 2012-11-04 20:24:36 +08:00 | 
				
					
						|  unknown | 2f61b3e0c9 | member plugin list add new | 2012-11-02 18:28:23 +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 | 
				
					
						|  chris | cbfa659928 | Changes for side_bar | 2012-10-26 11:19:56 +08:00 | 
				
					
						|  chris | 0babd5f302 | Changes for side_bar | 2012-10-15 15:30:48 +08:00 | 
				
					
						|  unknown | a4c94c4404 | demo site plugin | 2012-10-08 16:20:21 +08:00 | 
				
					
						|  unknown | 975523c8b2 | demo site plugin | 2012-09-24 14:10:44 +08:00 | 
				
					
						|  unknown | 9eed9ec7b6 | demo site plugin | 2012-09-17 13:32:52 +08:00 | 
				
					
						|  unknown | 42d50ae534 | Plugins | 2012-09-14 00:05:31 +08:00 |