Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							229129db33 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'lafriks/feat/approval' into feat/approval-new  
						
						
						
						
					 
					
						2018-05-25 15:58:14 +02:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e2f60f434b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feat/approval-new  
						
						
						
						
					 
					
						2018-05-25 15:57:53 +02:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4ad72dec57 
							
						 
					 
					
						
						
							
							Check if reviewer is nil  
						
						... 
						
						
						
						Signed-off-by: Jonas Franz <info@jonasfranz.software> 
						
						
					 
					
						2018-05-25 15:57:32 +02:00 
						 
				 
			
				
					
						
							
							
								David Schneiderbauer 
							
						 
					 
					
						
						
						
						
							
						
						
							2eabf18c9b 
							
						 
					 
					
						
						
							
							add api section to config cheat sheet ( #4037 )  
						
						
						
						
					 
					
						2018-05-24 16:36:45 -04:00 
						 
				 
			
				
					
						
							
							
								Fluf 
							
						 
					 
					
						
						
						
						
							
						
						
							2a9799493a 
							
						 
					 
					
						
						
							
							Make home.tmpl visible with Signin-View enabled ( #4040 )  
						
						... 
						
						
						
						Fix  #3846  
					
						2018-05-24 15:51:28 -04:00 
						 
				 
			
				
					
						
							
							
								3_1_3_u 
							
						 
					 
					
						
						
						
						
							
						
						
							8ebd15e6a6 
							
						 
					 
					
						
						
							
							fix add a Ukrainian language ( #4036 ) ( #4042 )  
						
						
						
						
					 
					
						2018-05-24 15:35:46 -04:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							69e82c1761 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-24 18:08:15 +00:00 
						 
				 
			
				
					
						
							
							
								David Schneiderbauer 
							
						 
					 
					
						
						
						
						
							
						
						
							3b35c6e47c 
							
						 
					 
					
						
						
							
							add i18n section in config cheat sheet, reordered app.ini.sample ( #4038 )  
						
						... 
						
						
						
						* add i18n section in config cheat sheet, reordered app.ini.sample
* fix wrong default config 
						
						
					 
					
						2018-05-24 14:07:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f07b4e1d02 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feat/approval  
						
						
						
						
					 
					
						2018-05-24 17:57:10 +02:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							062111de3b 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-24 15:30:53 +00:00 
						 
				 
			
				
					
						
							
							
								3_1_3_u 
							
						 
					 
					
						
						
						
						
							
						
						
							e225b5c512 
							
						 
					 
					
						
						
							
							add a Ukrainian language ( #4036 )  
						
						
						
						
					 
					
						2018-05-24 23:29:33 +08:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							81241b9380 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-24 14:30:48 +00:00 
						 
				 
			
				
					
						
							
							
								Lunny Xiao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3623f12a28 
							
						 
					 
					
						
						
							
							fix writer cannot read bare repo guide ( #4033 )  
						
						
						
						
					 
					
						2018-05-24 22:28:53 +08:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f64f8e0b1d 
							
						 
					 
					
						
						
							
							Add missing vendor files  
						
						... 
						
						
						
						Signed-off-by: Jonas Franz <info@jonasfranz.software> 
						
						
					 
					
						2018-05-24 16:12:21 +02:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4cb3a60f16 
							
						 
					 
					
						
						
							
							Show add button only if no comments already exist for the line  
						
						... 
						
						
						
						Signed-off-by: Jonas Franz <info@jonasfranz.software> 
						
						
					 
					
						2018-05-24 15:54:18 +02:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7592f5bbbd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feat/approval-new  
						
						... 
						
						
						
						# Conflicts:
#	models/migrations/migrations.go 
						
						
					 
					
						2018-05-24 15:44:11 +02:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d25df5b5f0 
							
						 
					 
					
						
						
							
							Prepare solving conflicts  
						
						... 
						
						
						
						Signed-off-by: Jonas Franz <info@jonasfranz.software> 
						
						
					 
					
						2018-05-24 15:43:33 +02:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2b6001b189 
							
						 
					 
					
						
						
							
							Fix ui bug reported by @lunny causing wrong position of add button  
						
						... 
						
						
						
						Add functionality to "Cancel" button
Add scale effects to add button
Hide "Cancel" button for existing comments
Signed-off-by: Jonas Franz <info@jonasfranz.software> 
						
						
					 
					
						2018-05-24 15:41:57 +02:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							11da1e6146 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-24 05:00:07 +00:00 
						 
				 
			
				
					
						
							
							
								Magnus Lindvall 
							
						 
					 
					
						
						
						
						
							
						
						
							cdb9478774 
							
						 
					 
					
						
						
							
							LDAP Public SSH Keys synchronization ( #1844 )  
						
						... 
						
						
						
						* Add LDAP Key Synchronization feature
Signed-off-by: Magnus Lindvall <magnus@dnmgns.com>
* Add migration: add login source id column for public_key table
* Only update keys if needed
* Add function to only list pubkey synchronized from ldap
* Only list pub ssh keys synchronized from ldap. Do not sort strings as ExistsInSlice does it.
* Only get keys belonging to current login source id
* Set default login source id to 0
* Some minor cleanup. Add integration tests (updete dep testify) 
						
						
					 
					
						2018-05-24 07:59:02 +03:00 
						 
				 
			
				
					
						
							
							
								Alexey Terentyev 
							
						 
					 
					
						
						
						
						
							
						
						
							b908ac9fab 
							
						 
					 
					
						
						
							
							Added repository search ordered by stars or forks. Forks column in admin repo list. ( #3969 )  
						
						... 
						
						
						
						* Added repository search order by stars or forks.
Added Forks column to admin repository list.
Signed-off-by: Alexey Terentyev <axifnx@gmail.com>
* Renamed search repo template
Signed-off-by: Alexey Terentyev <axifnx@gmail.com> 
						
						
					 
					
						2018-05-24 09:03:42 +08:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							ea2a938e8a 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-24 00:25:30 +00:00 
						 
				 
			
				
					
						
							
							
								Fluf 
							
						 
					 
					
						
						
						
						
							
						
						
							48797e7199 
							
						 
					 
					
						
						
							
							Gitea with Caddy with sub-path documentation. ( #4028 )  
						
						... 
						
						
						
						Matches rest of headings 
						
						
					 
					
						2018-05-24 08:24:04 +08:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							27c488e3a3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feat/approval  
						
						
						
						
					 
					
						2018-05-23 20:33:04 +02:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba9745cee 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-23 15:33:10 +00:00 
						 
				 
			
				
					
						
							
							
								Fluf 
							
						 
					 
					
						
						
						
						
							
						
						
							b299d7bceb 
							
						 
					 
					
						
						
							
							Add Environment Variables to Docker template ( #4012 )  
						
						... 
						
						
						
						* Add disable registration as an environment variable
for docker
* Add REQUIRE_SIGNIN_VIEW as env var to docker
* Add variables to template
* Update docker docs 
						
						
					 
					
						2018-05-23 23:31:12 +08:00 
						 
				 
			
				
					
						
							
							
								Lunny Xiao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							60d95a0b85 
							
						 
					 
					
						
						
							
							fix bugs caused by  #3929  ( #3999 )  
						
						
						
						
					 
					
						2018-05-23 15:23:23 +08:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							71a8fe3e7c 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-23 06:13:29 +00:00 
						 
				 
			
				
					
						
							
							
								Lunny Xiao 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4ec8551490 
							
						 
					 
					
						
						
							
							fix webhook bug of response info is not displayed in UI ( #4000 )  
						
						
						
						
					 
					
						2018-05-23 14:12:02 +08:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							a2f0c57584 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-23 05:22:18 +00:00 
						 
				 
			
				
					
						
							
							
								Fluf 
							
						 
					 
					
						
						
						
						
							
						
						
							416ded5f3e 
							
						 
					 
					
						
						
							
							Add documentation for reverse proxies ( #4022 )  
						
						... 
						
						
						
						Fixes  #3904  
					
						2018-05-23 13:21:17 +08:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a05d052d01 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feat/approval  
						
						
						
						
					 
					
						2018-05-23 06:23:42 +02:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							2c4b54dccc 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-22 23:10:02 +00:00 
						 
				 
			
				
					
						
							
							
								Antoine GIRARD 
							
						 
					 
					
						
						
						
						
							
						
						
							6f31911497 
							
						 
					 
					
						
						
							
							Add $GOPATH/bin to PATH for make releases ( #4020 )  
						
						... 
						
						
						
						Needed to access go tool gxz 
						
						
					 
					
						2018-05-22 12:12:10 -04:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e60b3f6e09 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feat/approval  
						
						... 
						
						
						
						# Conflicts:
#	vendor/vendor.json 
						
						
					 
					
						2018-05-22 17:53:02 +02:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							45f3d4a719 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-22 05:34:25 +00:00 
						 
				 
			
				
					
						
							
							
								Fluf 
							
						 
					 
					
						
						
						
						
							
						
						
							dd3d78ffed 
							
						 
					 
					
						
						
							
							Fix support channels ( #4014 )  
						
						... 
						
						
						
						Now matches navigation on Gitea website 
						
						
					 
					
						2018-05-22 08:34:02 +03:00 
						 
				 
			
				
					
						
							
							
								Timothée Ravier 
							
						 
					 
					
						
						
						
						
							
						
						
							b3a3024f03 
							
						 
					 
					
						
						
							
							doc: update LOCAL_ROOT_URL description for PROTOCOL = 'unix' case ( #3760 )  
						
						... 
						
						
						
						Update the sample configuration and config cheat sheet description for
the LOCAL_ROOT_URL configuration variable to mention the special case
required if PROTOCOL is set to 'unix'.
Fixes  #3741 .
Signed-off-by: Timothée Ravier <tim@siosm.fr> 
						
						
					 
					
						2018-05-22 09:35:36 +08:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							d97bb9516c 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-21 23:10:17 +00:00 
						 
				 
			
				
					
						
							
							
								Aleksandr Bulyshchenko 
							
						 
					 
					
						
						
						
						
							
						
						
							ee878e3951 
							
						 
					 
					
						
						
							
							Support secure cookie for csrf-token ( #3839 )  
						
						... 
						
						
						
						* dep: Update github.com/go-macaron/csrf
Update github.com/go-macaron/csrf with dep to revision 503617c6b372
to fix issue of csrf-token security.
This update includes following commits:
- Add support for the Cookie HttpOnly flag
- Support secure mode for csrf cookie
Signed-off-by: Aleksandr Bulyshchenko <A.Bulyshchenko@globallogic.com>
* routers: set csrf-token security depending on COOKIE_SECURE
Signed-off-by: Aleksandr Bulyshchenko <A.Bulyshchenko@globallogic.com> 
						
						
					 
					
						2018-05-22 02:09:48 +03:00 
						 
				 
			
				
					
						
							
							
								David Schneiderbauer 
							
						 
					 
					
						
						
						
						
							
						
						
							31067c0a89 
							
						 
					 
					
						
						
							
							remove collaborative repositories from search on user profiles ( #3996 )  
						
						... 
						
						
						
						* remove collaborative repositories from search on user profiles
* rename 'My Repositories' to 'Repositories' 
						
						
					 
					
						2018-05-21 23:07:34 +03:00 
						 
				 
			
				
					
						
							
							
								Antoine GIRARD 
							
						 
					 
					
						
						
						
						
							
						
						
							08c9617caa 
							
						 
					 
					
						
						
							
							Provide compressed releases ( #3991 )  
						
						... 
						
						
						
						* Add release-compress to provide compressed releases
* check after compress 
						
						
					 
					
						2018-05-21 14:50:39 -04:00 
						 
				 
			
				
					
						
							
							
								Antoine GIRARD 
							
						 
					 
					
						
						
						
						
							
						
						
							75982127c8 
							
						 
					 
					
						
						
							
							[doc] Update vendor tool section to dep ( #4008 )  
						
						
						
						
					 
					
						2018-05-21 14:10:35 -04:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							b2bf1c9422 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-21 17:24:25 +00:00 
						 
				 
			
				
					
						
							
							
								Fluf 
							
						 
					 
					
						
						
						
						
							
						
						
							74e05e60ca 
							
						 
					 
					
						
						
							
							Fix typo in U2F description ( #4007 )  
						
						
						
						
					 
					
						2018-05-21 13:15:25 -04:00 
						 
				 
			
				
					
						
							
							
								奶爸 
							
						 
					 
					
						
						
						
						
							
						
						
							d94472e89b 
							
						 
					 
					
						
						
							
							fix   #4003  ( #4004 )  
						
						... 
						
						
						
						Webhook and hook_task not cleaned up when delete repository 
						
						
					 
					
						2018-05-21 21:30:30 +08:00 
						 
				 
			
				
					
						
							
							
								GiteaBot 
							
						 
					 
					
						
						
						
						
							
						
						
							2690542adb 
							
						 
					 
					
						
						
							
							[skip ci] Updated translations via Crowdin  
						
						
						
						
					 
					
						2018-05-21 12:35:56 +00:00 
						 
				 
			
				
					
						
							
							
								Antoine GIRARD 
							
						 
					 
					
						
						
						
						
							
						
						
							3f3383dc0a 
							
						 
					 
					
						
						
							
							Migrate to dep ( #3972 )  
						
						... 
						
						
						
						* Update makefile to use dep
* Migrate to dep
* Fix some deps
* Try to find a better version for golang.org/x/net
* Try to find a better version for golang.org/x/oauth2 
						
						
					 
					
						2018-05-21 15:34:20 +03:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
						
						
							
						
						
							0f88cb8843 
							
						 
					 
					
						
						
							
							update code.gitea.io/git  
						
						
						
						
					 
					
						2018-05-21 10:38:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jonas Franz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a550052b96 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feat/approval  
						
						
						
						
					 
					
						2018-05-21 11:15:51 +02:00