Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							2aec6d283c 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into feature-listbox  
						
						
						
						
					 
					
						2016-11-28 08:05:00 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							b580ead080 
							
						 
					 
					
						
						
							
							remove useless code  
						
						
						
						
					 
					
						2016-11-28 07:59:18 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							fb1f3734c1 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into feature-listbox  
						
						
						
						
					 
					
						2016-11-28 07:42:53 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8fef9916a9 
							
						 
					 
					
						
						
							
							fix filebox warning bug that occurs on Linux  
						
						
						
						
					 
					
						2016-11-28 06:23:18 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							abe2f0687f 
							
						 
					 
					
						
						
							
							fix some compiler warnings and errors for GCC  
						
						
						
						
					 
					
						2016-11-27 12:39:26 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							b23cfc8888 
							
						 
					 
					
						
						
							
							fix listbox bordless bug( #170 )  
						
						
						
						
					 
					
						2016-11-27 11:17:47 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8e8e5c4847 
							
						 
					 
					
						
						
							
							add contributor info  
						
						
						
						
					 
					
						2016-11-26 06:13:18 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							1515dc7f79 
							
						 
					 
					
						
						
							
							Merge branch 'dankan1890-group_hotfix-1.4.1' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-11-26 05:45:55 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							39b55e99ba 
							
						 
					 
					
						
						
							
							Merge branch 'group_hotfix-1.4.1' of  https://github.com/dankan1890/nana  into dankan1890-group_hotfix-1.4.1  
						
						
						
						
					 
					
						2016-11-26 05:45:40 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							6e16115726 
							
						 
					 
					
						
						
							
							Merge branch 'qPCR4vir-hotfix-1.4.1' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-11-26 05:40:51 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							4327ec49a7 
							
						 
					 
					
						
						
							
							add noexcept to some functions  
						
						
						
						
					 
					
						2016-11-20 12:04:30 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							a6ccc81623 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into feature-listbox  
						
						
						
						
					 
					
						2016-11-20 11:47:19 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							be2af130c2 
							
						 
					 
					
						
						
							
							remove the extra inclusion of cstring  
						
						
						
						
					 
					
						2016-11-20 11:45:52 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							db2cb5e8d7 
							
						 
					 
					
						
						
							
							change text_editor for reducing binary size  
						
						
						
						
					 
					
						2016-11-19 04:24:03 +08:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							be6625b890 
							
						 
					 
					
						
						
							
							Disable display of field_title with an empty title.  
						
						
						
						
					 
					
						2016-11-17 20:48:56 +01:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							06e1b7a712 
							
						 
					 
					
						
						
							
							test with nana-demo/hotfix  
						
						
						
						
					 
					
						2016-11-15 03:36:01 +01:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							ea8a912045 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into develop  
						
						
						
						
					 
					
						2016-11-14 07:04:42 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							738178dec3 
							
						 
					 
					
						
						
							
							fix freezing of filebox when opens in other thread  
						
						
						
						
					 
					
						2016-11-14 06:57:42 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							2f976c1546 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into develop  
						
						
						
						
					 
					
						2016-11-14 05:44:27 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							0477abfafd 
							
						 
					 
					
						
						
							
							Merge branch 'dread-uo-master' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-11-14 05:43:18 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							421fd3bdcd 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/dread-uo/nana  into dread-uo-master  
						
						
						
						
					 
					
						2016-11-14 05:42:24 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							416d40bbec 
							
						 
					 
					
						
						
							
							Merge branch 'dankan1890-menubar_improvements' into develop  
						
						
						
						
					 
					
						2016-11-14 05:39:18 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							3de48c1991 
							
						 
					 
					
						
						
							
							Merge branch 'menubar_improvements' of  https://github.com/dankan1890/nana  into dankan1890-menubar_improvements  
						
						
						
						
					 
					
						2016-11-14 05:38:49 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							6043009c35 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into develop  
						
						
						
						
					 
					
						2016-11-14 05:35:37 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8594d175e1 
							
						 
					 
					
						
						
							
							Merge branch 'toborrobot-develop' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-11-14 05:34:45 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5564a0299b 
							
						 
					 
					
						
						
							
							Merge branch 'dankan1890-icon_fix' into develop  
						
						
						
						
					 
					
						2016-11-14 03:27:11 +08:00 
						 
				 
			
				
					
						
							
							
								Rei 
							
						 
					 
					
						
						
						
						
							
						
						
							f42cd7b2eb 
							
						 
					 
					
						
						
							
							Include cstring header on image_png.hpp  
						
						... 
						
						
						
						Compilation was failing with the "enable png" flag. This was happening
because the memcpy function was being called without the inclusion of
cstring, which declares it. This fixes it. 
						
						
					 
					
						2016-11-05 04:46:29 -02:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							565b612ea7 
							
						 
					 
					
						
						
							
							Added colors scheme.  
						
						
						
						
					 
					
						2016-11-04 00:21:34 +01:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							6e754e94a8 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/cnjinhao/nana  into icon_fix  
						
						
						
						
					 
					
						2016-11-04 00:03:25 +01:00 
						 
				 
			
				
					
						
							
							
								Toby Case 
							
						 
					 
					
						
						
						
						
							
						
						
							c2640f5524 
							
						 
					 
					
						
						
							
							- Include nana/deploy.hpp to declare to_utf8  
						
						... 
						
						
						
						- Was preventing compilation of nana library 
						
						
					 
					
						2016-11-02 18:09:10 -07:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5e6b13d23b 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into develop  
						
						
						
						
					 
					
						2016-11-02 22:48:56 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							a1eeeee948 
							
						 
					 
					
						
						
							
							fix a widget::i18n compiler error  
						
						
						
						
					 
					
						2016-11-02 21:55:19 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8e228512d5 
							
						 
					 
					
						
						
							
							fix some i18n errors  
						
						
						
						
					 
					
						2016-11-02 21:50:52 +08:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							f9e06c04e2 
							
						 
					 
					
						
						
							
							fixed linux support.  
						
						
						
						
					 
					
						2016-11-02 09:33:18 +01:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							043ebad317 
							
						 
					 
					
						
						
							
							fix some compiler errors and warnings  
						
						
						
						
					 
					
						2016-10-31 06:36:03 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							b1ce0eaff2 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4.1' into develop  
						
						
						
						
					 
					
						2016-10-31 06:21:41 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							a3de89aab5 
							
						 
					 
					
						
						
							
							Merge branch 'PeterAddy960-hotfix-1.4' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-10-31 06:14:10 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							edc8304c22 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.4' of  https://github.com/PeterAddy960/nana  into PeterAddy960-hotfix-1.4  
						
						
						
						
					 
					
						2016-10-31 06:13:41 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							7ffad3c877 
							
						 
					 
					
						
						
							
							Merge branch 'dankan1890-features' into develop  
						
						
						
						
					 
					
						2016-10-31 05:45:34 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							60c35b07f6 
							
						 
					 
					
						
						
							
							Merge branch 'qflow-master' into hotfix-1.4.1  
						
						
						
						
					 
					
						2016-10-31 05:42:45 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							e6438919c0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/qflow/nana  into qflow-master  
						
						
						
						
					 
					
						2016-10-31 05:42:25 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							445f0ed6de 
							
						 
					 
					
						
						
							
							fix issue of menu item_proxy  
						
						
						
						
					 
					
						2016-10-31 04:33:42 +08:00 
						 
				 
			
				
					
						
							
							
								PeterAddy960 
							
						 
					 
					
						
						
						
						
							
						
						
							8e84383a7b 
							
						 
					 
					
						
						
							
							Added an overload to getline to allow an offset from the beginning of the line.  
						
						... 
						
						
						
						Added a clear undo method.
Added an overload to selected to get the selected bounds. 
						
						
					 
					
						2016-10-28 00:17:59 -05:00 
						 
				 
			
				
					
						
							
							
								PeterAddy960 
							
						 
					 
					
						
						
						
						
							
						
						
							78c3527f10 
							
						 
					 
					
						
						
							
							Modified the implementation so that nana: ⌨️ :os_del is sent throght the set_accept function, so that os_del can be blocked.  
						
						... 
						
						
						
						Added overload to selected to get the selection bounds. 
						
						
					 
					
						2016-10-28 00:10:11 -05:00 
						 
				 
			
				
					
						
							
							
								PeterAddy960 
							
						 
					 
					
						
						
						
						
							
						
						
							ea1edb5a4a 
							
						 
					 
					
						
						
							
							Added a clear undo method.  
						
						... 
						
						
						
						Added an overload to selected to get the selection bounds.
Added an overload to the getline method to allow an offset from the beginning of the line. 
						
						
					 
					
						2016-10-28 00:07:33 -05:00 
						 
				 
			
				
					
						
							
							
								PeterAddy960 
							
						 
					 
					
						
						
						
						
							
						
						
							021ee1edb4 
							
						 
					 
					
						
						
							
							Added a clear undo method to the textbox to erase all previous undo actions.  
						
						... 
						
						
						
						Added an overload to the selected method that give back the bounds of the selection. 
						
						
					 
					
						2016-10-28 00:05:56 -05:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							e7ce506f5a 
							
						 
					 
					
						
						
							
							fix an exception of msg_dispatcher  
						
						
						
						
					 
					
						2016-10-19 04:01:40 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							9ed5e81ca2 
							
						 
					 
					
						
						
							
							fix the revertable lock of window_manager  
						
						
						
						
					 
					
						2016-10-19 02:58:49 +08:00 
						 
				 
			
				
					
						
							
							
								dankan1890 
							
						 
					 
					
						
						
						
						
							
						
						
							afa9cffd51 
							
						 
					 
					
						
						
							
							Added multi platform support for ICOns files.  
						
						
						
						
					 
					
						2016-10-18 00:32:58 +02:00 
						 
				 
			
				
					
						
							
							
								Michal Fojtak 
							
						 
					 
					
						
						
						
						
							
						
						
							e7181a7007 
							
						 
					 
					
						
						
							
							vs"15" fix  
						
						
						
						
					 
					
						2016-10-17 15:27:38 +02:00