ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							920862884d
							
						
					 | 
					
						
						
							
							Merge branch 'astaxie/develop' into emptybodyfix
						
						
						
						
						
						
						
						# Conflicts:
#	config.go 
						
						
					 | 
					
						2016-03-06 21:19:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuchun
							
						 
					 | 
					
						
						
						
						
							
						
						
							48ec7f736e
							
						
					 | 
					
						
						
							
							fix GetMulti bug
						
						
						
						
						
						
					 | 
					
						2016-03-06 14:46:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuchun
							
						 
					 | 
					
						
						
						
						
							
						
						
							292d8f2c00
							
						
					 | 
					
						
						
							
							add ssdb cache adapter
						
						
						
						
						
						
					 | 
					
						2016-03-06 13:17:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6f34306ee
							
						
					 | 
					
						
						
							
							Merge pull request #1740 from ysqi/configer
						
						
						
						
						
						
						
						Fixed #1735 Return nil if config value does not exist or is empty 
						
						
					 | 
					
						2016-03-05 22:05:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							a40c0dd156
							
						
					 | 
					
						
						
							
							Merge pull request #1750 from JessonChan/staticfile_map_race
						
						
						
						
						
						
						
						static file map race bug fixed 
						
						
					 | 
					
						2016-03-05 20:43:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							795092bdd2
							
						
					 | 
					
						
						
							
							Merge pull request #1751 from FlamingTree/develop
						
						
						
						
						
						
						
						Update phone regexp 
						
						
					 | 
					
						2016-03-05 20:41:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							524446c857
							
						
					 | 
					
						
						
							
							Merge pull request #1752 from JessonChan/ab_lock_race
						
						
						
						
						
						
						
						fix template  read-write lock race 
						
						
					 | 
					
						2016-03-05 20:40:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5adec31c6
							
						
					 | 
					
						
						
							
							improve the template reader function
						
						
						
						
						
						
					 | 
					
						2016-03-04 14:49:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							6747c55a81
							
						
					 | 
					
						
						
							
							remove unused cache
						
						
						
						
						
						
					 | 
					
						2016-03-04 12:01:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f46c1d231
							
						
					 | 
					
						
						
							
							add template read lock when dev mode
						
						
						
						
						
						
					 | 
					
						2016-03-04 12:00:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								FlamingTree
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bd1be8e29
							
						
					 | 
					
						
						
							
							Update validators.go
						
						
						
						
						
						
						
						增加178号段 
						
						
					 | 
					
						2016-03-04 11:16:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							226e54e0d8
							
						
					 | 
					
						
						
							
							static file map race bug fixed
						
						
						
						
						
						
					 | 
					
						2016-03-04 10:54:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							3379a2b7ed
							
						
					 | 
					
						
						
							
							remove file bug fixed
						
						
						
						
						
						
						
						remove file by filename and file suffix 
						
						
					 | 
					
						2016-03-04 10:43:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							19d921d3f5
							
						
					 | 
					
						
						
							
							Return nil not empty []string{}
						
						
						
						
						
						
						
						Return nil if config value does not exist or is empty 
						
						
					 | 
					
						2016-03-03 20:03:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b99e41880
							
						
					 | 
					
						
						
							
							Merge pull request #1688 from ysqi/configIssue
						
						
						
						
						
						
						
						fixed handle config issue 
						
						
					 | 
					
						2016-03-03 09:50:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ff74e71cb
							
						
					 | 
					
						
						
							
							Fixed #1735 Return empty []string
						
						
						
						
						
						
						
						Need return empty []string  if config value is empty.
split `“”` ==> []string{}, Not []string{“”}
						
						
					 | 
					
						2016-03-02 22:44:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a148473e9
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'remotes/upstream/develop' into log_enhancement
						
						
						
						
						
						
					 | 
					
						2016-03-02 13:34:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							b30ce768f8
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'remotes/upstream/develop' into err_ctrler
						
						
						
						
						
						
					 | 
					
						2016-03-02 13:34:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							70e63570f5
							
						
					 | 
					
						
						
							
							Merge pull request #1731 from math345/develop
						
						
						
						
						
						
						
						fix bug: session id undecoded when destroy and sesssion memory provider push wrong 
						
						
					 | 
					
						2016-03-02 13:26:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							36e3160904
							
						
					 | 
					
						
						
							
							add go1.6.0 and remove 1.3.3
						
						
						
						
						
						
					 | 
					
						2016-03-01 21:41:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca3c57fbc6
							
						
					 | 
					
						
						
							
							add a line of comment
						
						
						
						
						
						
					 | 
					
						2016-03-01 17:13:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							387dd6ec0e
							
						
					 | 
					
						
						
							
							add a line of comment
						
						
						
						
						
						
					 | 
					
						2016-03-01 17:12:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							26cc040f9a
							
						
					 | 
					
						
						
							
							daily log name dot fixed
						
						
						
						
						
						
					 | 
					
						2016-03-01 17:00:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							d81a768802
							
						
					 | 
					
						
						
							
							change couchbase to beego/go-couchbase
						
						
						
						
						
						
					 | 
					
						2016-03-01 16:54:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0dcaa7f84
							
						
					 | 
					
						
						
							
							remove couchbase dependence
						
						
						
						
						
						
					 | 
					
						2016-03-01 16:43:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							9da4d1d847
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into log_enhancement
						
						
						
						
						
						
					 | 
					
						2016-03-01 13:59:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iexploree
							
						 
					 | 
					
						
						
						
						
							
						
						
							a144f117a3
							
						
					 | 
					
						
						
							
							remove comment
						
						
						
						
						
						
					 | 
					
						2016-03-01 13:39:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iexploree
							
						 
					 | 
					
						
						
						
						
							
						
						
							477de9a3f3
							
						
					 | 
					
						
						
							
							fix bug: session id undecoded when destroy and sesssion memory provider push wrong
						
						
						
						
						
						
					 | 
					
						2016-03-01 10:51:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffbb45e567
							
						
					 | 
					
						
						
							
							Revert "ignore parse include config file error"
						
						
						
						
						
						
						
						This reverts commit 891016a0a25cdda21b119d07972bddf0a2f995ea. 
						
						
					 | 
					
						2016-02-27 20:18:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							67fbafb380
							
						
					 | 
					
						
						
							
							Merge pull request #1680 from ysqi/fix-router-error
						
						
						
						
						
						
						
						fix #1595 
						
						
					 | 
					
						2016-02-26 16:17:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							6eaa5537f5
							
						
					 | 
					
						
						
							
							Merge pull request #1652 from JessonChan/develop
						
						
						
						
						
						
						
						colorful console and go fmt 
						
						
					 | 
					
						2016-02-26 16:10:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							62cc987620
							
						
					 | 
					
						
						
							
							Merge pull request #1639 from youngsterxyf/logger-flush-close
						
						
						
						
						
						
						
						try to fix the little bug when calling Close or Flush in async mode 
						
						
					 | 
					
						2016-02-26 16:04:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								astaxie
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0a41f978f
							
						
					 | 
					
						
						
							
							Merge pull request #1727 from JessonChan/templates_bug_fix
						
						
						
						
						
						
						
						lock the templates map when goroutie update the map 
						
						
					 | 
					
						2016-02-26 15:56:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							3da28535fe
							
						
					 | 
					
						
						
							
							lock the templates map when goroutie update the map
						
						
						
						
						
						
					 | 
					
						2016-02-25 17:37:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								miraclesu
							
						 
					 | 
					
						
						
						
						
							
						
						
							85f55fcb41
							
						
					 | 
					
						
						
							
							orm: inline struct support
						
						
						
						
						
						
					 | 
					
						2016-02-24 18:46:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c37e76503
							
						
					 | 
					
						
						
							
							the net/http should set header first,the set http status code and then write the content
						
						
						
						
						
						
					 | 
					
						2016-02-24 14:14:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							76d69b6e51
							
						
					 | 
					
						
						
							
							prevent auto detect of content-type
						
						
						
						
						
						
						
						https://golang.org/src/net/http/server.go#L1031 
						
						
					 | 
					
						2016-02-24 10:34:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							20301bc212
							
						
					 | 
					
						
						
							
							multiple response.WriteHeader calls
						
						
						
						
						
						
					 | 
					
						2016-02-24 10:31:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mickaël GALLARD
							
						 
					 | 
					
						
						
						
						
							
						
						
							9119f766d2
							
						
					 | 
					
						
						
							
							Fix cookies in accordance with the "net / http" and Flash usage
						
						
						
						
						
						
						
						Fixed issue of Flash cookies that are deleted before being read
Max-age parameter conform to "net/http" Cookie 
						
						
					 | 
					
						2016-02-22 13:35:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							891016a0a2
							
						
					 | 
					
						
						
							
							ignore parse include config file error
						
						
						
						
						
						
					 | 
					
						2016-02-14 18:55:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5f07d65bb
							
						
					 | 
					
						
						
							
							panic parse config error
						
						
						
						
						
						
					 | 
					
						2016-02-14 18:54:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							9411063574
							
						
					 | 
					
						
						
							
							fix #1595
						
						
						
						
						
						
					 | 
					
						2016-02-12 14:45:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							23860e6807
							
						
					 | 
					
						
						
							
							go fmt
						
						
						
						
						
						
					 | 
					
						2016-02-12 11:36:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							d35c50a8e0
							
						
					 | 
					
						
						
							
							return write body error
						
						
						
						
						
						
					 | 
					
						2016-02-12 11:36:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							810f6db8d2
							
						
					 | 
					
						
						
							
							fix #1669 write empty body panic error
						
						
						
						
						
						
					 | 
					
						2016-02-12 11:27:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ysqi
							
						 
					 | 
					
						
						
						
						
							
						
						
							36f69a04a9
							
						
					 | 
					
						
						
							
							remove interfaceToStr function to package config
						
						
						
						
						
						
					 | 
					
						2016-02-04 20:15:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f716dda3e
							
						
					 | 
					
						
						
							
							add test files and bug fixed
						
						
						
						
						
						
					 | 
					
						2016-02-03 17:54:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8c4b3aa4c
							
						
					 | 
					
						
						
							
							add files logger to separate different logs
						
						
						
						
						
						
					 | 
					
						2016-02-03 17:11:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							51b1095e73
							
						
					 | 
					
						
						
							
							add files logger
						
						
						
						
						
						
					 | 
					
						2016-02-03 16:32:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JessonChan
							
						 
					 | 
					
						
						
						
						
							
						
						
							68cc53e92b
							
						
					 | 
					
						
						
							
							when rotate by date ,there's no num after log file
						
						
						
						
						
						
					 | 
					
						2016-02-03 15:43:15 +08:00 | 
					
					
						
						
							
							
							
						
					 |