MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-01-08 12:06:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,394 Commits 17 Branches 214 Tags 814 MiB
4cb3a60f16
Commit Graph

6394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GiteaBot
d7fd9bf7bb [skip ci] Updated translations via Crowdin 2018-05-21 02:29:30 +00:00
Lunny Xiao
6bdc556b7f
Fix some webhooks bugs (#3981) 
* fix some webhooks bugs

* update vendor

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* fix test

* fix clearlabels

* fix pullrequest webhook bug fix #3492

* update release webhook description

* remove unused code

* fix push webhook in pull request

* small changes
 2018-05-21 10:28:29 +08:00
GiteaBot
dc0ef38950 [skip ci] Updated translations via Crowdin 2018-05-21 01:06:08 +00:00
Dominik Rimpf
1ef98a6eaa Added doc for 'IMPORT_LOCAL_PATHS' (#3997) 2018-05-21 09:04:41 +08:00
GiteaBot
d7cf7393d4 [skip ci] Updated translations via Crowdin 2018-05-20 10:10:05 +00:00
Antoine GIRARD
edc78b9633 Update to last common x/text (#3994) 2018-05-20 18:09:00 +08:00
GiteaBot
000b2d33a9 [skip ci] Updated translations via Crowdin 2018-05-20 06:10:47 +00:00
Antoine GIRARD
8dca5ad526 Fetch missing file in github.com/davecgh/go-spew/spew (#3995) 2018-05-20 09:09:35 +03:00
Lauris Bukšis-Haberkorns
8ea8209c19
Minor UI improvements 2018-05-19 20:51:23 +03:00
Jonas Franz
a8dc699e74
Merge branch 'master' into feat/approval-new 
# Conflicts:
#	models/error.go
#	models/migrations/migrations.go
#	models/models.go
#	public/js/index.js
 2018-05-19 18:17:01 +02:00
Jonas Franz
e5bde1405f
Resolve conflicts 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
 2018-05-19 18:15:09 +02:00
GiteaBot
81b4d38f01 [skip ci] Updated translations via Crowdin 2018-05-19 14:58:24 +00:00
Anderi Azuki
c7a4317231 Update TRANSLATORS (#3933) 
* Update TRANSLATORS

* Update TRANSLATORS

* Update TRANSLATORS

* Move to correct position so that list stays in alphabetical order
 2018-05-19 22:57:32 +08:00
GiteaBot
01835a4206 [skip ci] Updated translations via Crowdin 2018-05-19 14:13:44 +00:00