Commit Graph

5888 Commits

Author SHA1 Message Date
Konrad
2dca487e0b
gofmt 2017-11-01 11:45:13 +01:00
Konrad
6b3a51abaa
Removed unrelated changes in locales 2017-11-01 11:41:47 +01:00
Konrad
762266f007
Removed unrelated changes in routes 2017-11-01 11:39:37 +01:00
Konrad
a2b652e14c
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-01 11:31:54 +01:00
Konrad
2fe66c2fb3
Removed unrelated changes in routes 2017-11-01 11:31:08 +01:00
Konrad
5302ecafa1
Removed unrelated changes in gitgraph 2017-11-01 11:24:26 +01:00
Konrad
5e4b6fc00c
Removed unrelated changes in locales 2017-11-01 11:23:56 +01:00
Konrad
ba734d6207
Removed unrelated changes 2017-11-01 11:21:27 +01:00
Konrad
5a9f2735f9
Removed unrelated changes 2017-11-01 11:17:53 +01:00
Konrad
58e7c2bc94
Rebased Font-awesome License file with master 2017-11-01 11:06:29 +01:00
Konrad
f188031b44
Rebased sidebar template to remove unrelated changes 2017-11-01 11:03:59 +01:00
Konrad
a651cc3646
Rebased Font-awesome with master 2017-11-01 10:52:01 +01:00
appleboy
6f84569629 '[skip ci] Updated translations via Crowdin' 2017-11-01 09:14:08 +00:00
Bo-Yi Wu
c22f443f58
add gitea remote in drone. (#2817)
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-11-01 04:13:47 -05:00
Bo-Yi Wu
dc6dad87d4
add remote name for git push. (#2816)
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-11-01 03:48:40 -05:00
Jonas Franz
e9595a962b Download and pushing translations (#2727)
* Download and pushing translations

* Adding empty line between build steps
2017-11-01 14:14:49 +08:00
Ethan Koenig
1b6a962e70 Include HTTP method in test error message (#2815) 2017-11-01 00:54:24 -05:00
Ethan Koenig
e6a97b6675 Use api.TrackedTime in API (#2807)
* Use api.TrackedTime in API

* APIFormat() method

* Rename function
2017-11-01 10:25:14 +08:00
Mulia Nasution
e22549747c Fix dropdown menu position on explore repo (#2808)
Signed-off-by: Mulia Arifandi Nasution <mul14.net@gmail.com>
2017-10-31 21:16:07 +02:00
Mulia Nasution
605038dca9 Fix typo (#2810)
Signed-off-by: Mulia Arifandi Nasution <mul14.net@gmail.com>
2017-10-31 19:10:22 +02:00
Tao Wang
d545e32b56 Add environment variable support for Docker image (#2201)
* Add `gettext` dependencies as we need `envsubst` command;
* Modified s6's gitea setup script, instead of `cp` the template if no
`app.ini` exist, it will substitude the envvars and generate the new
`app.ini`;
* Make `/docker/etc/templates/app.ini` a template contains environment
variables;

Signed-off-by: Tao Wang <twang2218@gmail.com>
2017-10-31 16:55:46 +08:00
cstyles
b0b24a2dbb Use RelAvatarLink() in GetActAvatar() (#2800) 2017-10-31 16:08:23 +08:00
Konrad Langenberg
0bbc695915
Fixed a bug where a border in the issue dependency list was on the wrong place
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-31 08:17:23 +01:00
Konrad Langenberg
14aa1d2052
When adding a dependency, the current issue is not shown in the list anymore.
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-31 08:02:36 +01:00
Konrad Langenberg
53ec08fc71
fmt
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-30 21:56:01 +01:00
Konrad Langenberg
913584aa6f
fmt
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-30 21:45:48 +01:00
Konrad Langenberg
751bbee534 Merge branch 'master' of https://github.com/go-gitea/gitea
Signed-off-by: Konrad <konrad@kola-entertainments.de>

# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v46.go
#	models/repo.go
#	public/js/index.js
2017-10-30 21:26:38 +01:00
Konrad Langenberg
30fe97a55e Merge branch 'master' of https://github.com/go-gitea/gitea
Signed-off-by: Konrad <konrad@kola-entertainments.de>

# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v46.go
#	models/repo.go
#	public/js/index.js
2017-10-30 21:17:36 +01:00
Lauris BH
82fc50f4ee Fix Git LFS object/repo link storage in database and small refactoring (#2803) 2017-10-30 20:11:56 +08:00
Ethan Koenig
513375c429 Make URL scheme unambiguous (#2408)
* Make URL scheme unambiguous

Redirect old routes to new routes

* Fix redirects to new URL scheme, and update template

* Fix branches/_new endpoints, and update integration test
2017-10-30 10:04:25 +08:00
Arif
6e98812ecf Fix copy in email templates (#2801) 2017-10-29 23:57:05 +02:00
Bastian Rinsche
638509b217 Add Safari pinned tab icon (#2799)
Closes #2753

Signed-off-by: Bastian Rinsche <bastian.rinsche@gmail.com>
2017-10-28 20:01:42 -05:00
Lunny Xiao
9ddbbd9d5a improve force push detect when push (#2798) 2017-10-28 22:36:20 +03:00
Konrad Langenberg
55f6cf9c91 Fixed issue where an issue could not be closed because of non-existing unresolved dependencies
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-28 18:37:08 +02:00
Konrad Langenberg
021a7e0ecf Fixed whitespace
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-28 18:14:51 +02:00
Konrad Langenberg
c5992f51c3 Fixed translation issue
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-28 18:13:44 +02:00
Konrad Langenberg
2a02c097c5 Added check to only show dependencies if the user is logged in
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-28 18:10:51 +02:00
Omar Assadi
1da17db717 Fix Various Grammar Issues and Adjust Unnatural Wording (#2737)
* Fix Comma Splices

Replace comma splices with more fitting punctuation—usually semicolons.

Signed-off-by: Omar Assadi <omar@assadi.ru>

* Turn Some Conjunctions into Sentences

Turn conjunctions—which are capable of standing on their own—into their standalone sentences.

Signed-off-by: Omar Assadi <omar@assadi.ru>

* Reword Sections and Fix Issues in Docs

Reword sections of the contributing docs and readme file to be more
natural and clear. Additionally, fix the majority of the grammar
mistakes.

Signed-off-by: Omar Assadi <omar@assadi.co.il>
2017-10-28 18:22:44 +03:00
Ethan Koenig
5866eb2321 Code/repo search (#2582)
Indexed search of repository contents (for default branch only)
2017-10-27 09:10:54 +03:00
Lauris BH
762f1d7237 Add wrapping to long diff lines (#2789)
* Add wrapping to long diff lines to fix #1827

* Fix  css class and make changes to source (less) files

* Fix wrong space indentation

* Fix indentation inconsistencies and remove very old WebKit workaround
2017-10-27 12:30:54 +08:00
Morlinest
ddb7f59ef4 Add search mode option to /api/repo/search (#2756)
* Add repo type option to /api/repo/search

* Add tests and fix result of collaborative filter in specific condition

* Fix/optimize search & tests

* Improve integration tests

* Fix lint errors

* Fix unit tests

* Change and improve internal implementation of repo search

* Use NonexistentID

* Make search api more general

* Change mirror and fork search behaviour

* Fix tests & typo in comment
2017-10-27 00:16:13 +03:00
Jonas Bröms
4d01ecaef3 Show Sendmail settings on admin config page (#2782)
* Show Sendmail settings on admin config page

* Remove unecessary if statement
2017-10-26 16:47:16 +08:00
Lauris BH
6a107e57f6 Add checks for commits with missing author and time (#2771)
* Add checks for commits with missing author and time

* Fix validate commits with emails if it has no Author
2017-10-26 15:45:14 +08:00
Gibheer
bc84110989 don't check minimum key size when disabled (#1754)
* cleanup old comments for ed25519

These comments were added when x/crypto/ed25519 could not yet handle
ed25519. It does now, so it should be removed.
Also the key type is now replaced with the proper constant.

* move the minimum key size config before the check

This moves the actual config lookup before any check is done. This
avoids problems with calling to ssh-keygen which doesn't support the
expected output format and returning an error, when the check is disabled.
2017-10-26 09:49:41 +08:00
Lauris BH
eca05b09aa Add commit count caching (#2774)
* Add commit count caching

* Small refactoring

* Add different key prefix for refs and commits

* Add configuratuion option to allow to change caching time or disable it
2017-10-26 09:37:33 +08:00
Bwko
3ab580c8d6 Add branch overiew page (#2108)
* Add branch overiew page

* fix changed method name on sub menu

* remove unused code
2017-10-26 08:49:16 +08:00
Jonas Bröms
e86a0bf3fe Add support for extra sendmail arguments (#2731)
* Add support for extra sendmail arguments

* Sendmail args to exec.command should be a list

* Add go-shellquote package

* Use go-shellquote lib for parsing Sendmail args

* Only parse if sendmail is configured
2017-10-25 22:27:25 +03:00
Michael Kuhn
3af5b67ed0 Sync MaxGitDiffLineCharacters with conf/app.ini (#2779)
MAX_GIT_DIFF_LINE_CHARACTERS was updated in #1845 but the corresponding
default value of MaxGitDiffLineCharacters was not changed. This can lead
to inconsistencies.
2017-10-25 16:28:58 +08:00
Lunny Xiao
178bd498b9
fix imports 2017-10-25 13:30:29 +08:00
Lunny Xiao
219ca5cadb
some fixes 2017-10-25 13:26:14 +08:00