Commit Graph

551 Commits

Author SHA1 Message Date
GiteaBot d62bc3362b [skip ci] Updated translations via Crowdin 2018-06-04 05:35:46 +00:00
GiteaBot da466b0505 [skip ci] Updated translations via Crowdin 2018-06-03 01:15:41 +00:00
GiteaBot 9a1772b0fa [skip ci] Updated translations via Crowdin 2018-06-02 15:21:24 +00:00
GiteaBot b8c1dc55b4 [skip ci] Updated translations via Crowdin 2018-06-02 11:30:08 +00:00
GiteaBot 0549762fd0 [skip ci] Updated translations via Crowdin 2018-06-01 05:52:46 +00:00
GiteaBot af05212bf8 [skip ci] Updated translations via Crowdin 2018-05-30 13:25:15 +00:00
GiteaBot 9aa8fdc5d7 [skip ci] Updated translations via Crowdin 2018-05-29 00:26:42 +00:00
GiteaBot 5095dfaed6 [skip ci] Updated translations via Crowdin 2018-05-27 10:49:19 +00:00
GiteaBot 69e82c1761 [skip ci] Updated translations via Crowdin 2018-05-24 18:08:15 +00:00
GiteaBot 062111de3b [skip ci] Updated translations via Crowdin 2018-05-24 15:30:53 +00:00
GiteaBot 81241b9380 [skip ci] Updated translations via Crowdin 2018-05-24 14:30:48 +00: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
GiteaBot 4ba9745cee [skip ci] Updated translations via Crowdin 2018-05-23 15:33:10 +00:00
GiteaBot 71a8fe3e7c [skip ci] Updated translations via Crowdin 2018-05-23 06:13:29 +00:00
GiteaBot a2f0c57584 [skip ci] Updated translations via Crowdin 2018-05-23 05:22:18 +00:00
GiteaBot 2c4b54dccc [skip ci] Updated translations via Crowdin 2018-05-22 23:10:02 +00:00
GiteaBot 45f3d4a719 [skip ci] Updated translations via Crowdin 2018-05-22 05:34:25 +00:00
GiteaBot d97bb9516c [skip ci] Updated translations via Crowdin 2018-05-21 23:10:17 +00: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
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
GiteaBot 2690542adb [skip ci] Updated translations via Crowdin 2018-05-21 12:35:56 +00: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
GiteaBot d7cf7393d4 [skip ci] Updated translations via Crowdin 2018-05-20 10:10:05 +00:00
GiteaBot 000b2d33a9 [skip ci] Updated translations via Crowdin 2018-05-20 06:10:47 +00: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
Jonas Franz 951309f76a Add support for FIDO U2F (#3971)
* Add support for U2F

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add vendor library
Add missing translations

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Minor improvements

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add U2F support for Firefox, Chrome (Android) by introducing a custom JS library
Add U2F error handling

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add U2F login page to OAuth

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Move U2F user settings to a separate file

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add unit tests for u2f model
Renamed u2f table name

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fix problems caused by refactoring

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add U2F documentation

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Remove not needed console.log-s

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add default values to app.ini.sample
Add FIDO U2F to comparison

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-05-19 17:12:37 +03:00
GiteaBot f933bcdfee [skip ci] Updated translations via Crowdin 2018-05-19 13:23:21 +00:00
GiteaBot 1b7cd3d0b0 [skip ci] Updated translations via Crowdin 2018-05-19 01:03:22 +00:00
GiteaBot b574af27b8 [skip ci] Updated translations via Crowdin 2018-05-18 09:18:02 +00:00
GiteaBot 8f4d11af0b [skip ci] Updated translations via Crowdin 2018-05-17 01:36:23 +00:00
GiteaBot 4ceb92f311 [skip ci] Updated translations via Crowdin 2018-05-16 14:26:58 +00:00
GiteaBot d79829fc47 [skip ci] Updated translations via Crowdin 2018-05-16 14:03:37 +00:00
Lunny Xiao 24941a1046
Add more webhooks support and refactor webhook templates directory (#3929)
* add more webhook support

* move hooks templates to standalone dir and add more webhooks ui

* fix tests

* update vendor checksum

* add more webhook support

* move hooks templates to standalone dir and add more webhooks ui

* fix tests

* update vendor checksum

* update vendor

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

* load attributes when created release

* update comparsion doc
2018-05-16 22:01:55 +08:00
GiteaBot 188fe6c301 [skip ci] Updated translations via Crowdin 2018-05-15 14:16:11 +00:00
GiteaBot d3dce01cf7 [skip ci] Updated translations via Crowdin 2018-05-15 10:08:59 +00:00
David Schneiderbauer 099372d76c Refactor User Settings (#3900)
* moved avatar to profile page

* combined password change, email and account deletion into account settings page

* combined totp, access tokens, linked accounts and openid into security settings page

* move access tokens to applications settings page

* small change to restart drone build

* fix change avatar url on profile page

* redirect old settings urls to new ones

* enforce only one autofocus attribute on settings pages

* set correct redirect status code

* fmt fix
2018-05-15 13:07:32 +03:00
FabioFortini 1546458f7d issue-2768: added new option allow_only_external_registration (#3910) 2018-05-13 15:51:16 +08:00
GiteaBot 2c34ef5d97 [skip ci] Updated translations via Crowdin 2018-05-13 01:51:56 +00:00
GiteaBot bc8400747a [skip ci] Updated translations via Crowdin 2018-05-11 07:56:33 +00:00
GiteaBot 253a2d636b [skip ci] Updated translations via Crowdin 2018-05-11 02:32:27 +00:00
GiteaBot e5f7f7dbc7 [skip ci] Updated translations via Crowdin 2018-05-11 01:44:55 +00:00
GiteaBot 4dc43b37be [skip ci] Updated translations via Crowdin 2018-05-11 00:43:53 +00:00
GiteaBot 15d0ac7ed4 [skip ci] Updated translations via Crowdin 2018-05-10 15:46:04 +00:00
GiteaBot 4607e1ac3d [skip ci] Updated translations via Crowdin 2018-05-10 12:55:00 +00:00
GiteaBot 0e0036106f [skip ci] Updated translations via Crowdin 2018-05-10 08:33:20 +00:00
GiteaBot 2efdb0907c [skip ci] Updated translations via Crowdin 2018-05-10 07:00:07 +00:00
techknowlogick 32deee9e52 Fix #3828 (#3935) 2018-05-10 14:58:49 +08:00
GiteaBot ce791454cb [skip ci] Updated translations via Crowdin 2018-05-10 01:19:03 +00:00
kolaente 95f2e2b57b Multiple assignees (#3705) 2018-05-09 19:29:04 +03:00
GiteaBot 238a997ec0 [skip ci] Updated translations via Crowdin 2018-05-09 14:54:02 +00:00
GiteaBot 02ecc03d6d [skip ci] Updated translations via Crowdin 2018-05-09 09:58:04 +00:00
GiteaBot 139ebf806e [skip ci] Updated translations via Crowdin 2018-05-08 12:42:15 +00:00
bugreport0 b11b3a7a7c Fix English translation grammar and consistency. (#3921) 2018-05-08 15:40:52 +03:00
GiteaBot bb8014885f [skip ci] Updated translations via Crowdin 2018-05-08 06:06:49 +00:00
GiteaBot 773530c917 [skip ci] Updated translations via Crowdin 2018-05-07 18:46:25 +00:00
GiteaBot eec2179e73 [skip ci] Updated translations via Crowdin 2018-05-07 09:52:15 +00:00
GiteaBot e6b0a2db62 [skip ci] Updated translations via Crowdin 2018-05-07 05:09:51 +00:00
GiteaBot 04889b7ae5 [skip ci] Updated translations via Crowdin 2018-05-06 21:27:36 +00:00
Jonas Franz c6a881e71b Fix placeholder of due date form (#3906) 2018-05-07 00:26:40 +03:00
GiteaBot 8685b315a2 [skip ci] Updated translations via Crowdin 2018-05-05 14:31:50 +00:00
Lauris BH 501fb228e6
Add option to use paged LDAP search when synchronizing users (#3895) 2018-05-05 17:30:47 +03:00
GiteaBot 7467ff3d94 [skip ci] Updated translations via Crowdin 2018-05-05 00:29:34 +00:00
kolaente 1fdf560678 Added user language setting (#3875)
* Added user language setting

* Added translation string for setting

* Fixed import order + typo

* improved checking if the user has a language saved in the db

* The current saved language is now set a default inside the dropdown

* fmt

* When a user signs in and doesn't have a language saved, the current browser language is saved

* updated gitea-sdk

* Merge branch 'master' of https://github.com/go-gitea/gitea into save-user-language

# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v62.go

* Made tests work again

* trigger CI

* trigger CI

* fmt

* re-trigger that FUCKING CI SO IT REALLY PICKS UP THE LATEST COMMIT ISTEAD OF PREDENDING TO DO SO

* re-trigger that FUCKING CI SO IT REALLY PICKS UP THE LATEST COMMIT ISTEAD OF PREDENDING TO DO SO

* When loggin in, only the language col gets updated instead of everything
2018-05-05 08:28:30 +08:00
GiteaBot 795dcc8ecf [skip ci] Updated translations via Crowdin 2018-05-04 13:24:58 +00:00
GiteaBot 0ca359cdb4 [skip ci] Updated translations via Crowdin 2018-05-02 13:24:19 +00:00
GiteaBot 954e69f66d [skip ci] Updated translations via Crowdin 2018-05-02 06:11:27 +00:00
GiteaBot a98add1974 [skip ci] Updated translations via Crowdin 2018-05-01 19:05:52 +00:00
kolaente 1a97030017 Issue due date (#3794)
* Started adding deadline to ui

* Implemented basic issue due date managing

* Improved UI for due date managing

* Added at least write access to the repo in order to modify issue due dates

* Ui improvements

* Added issue comments creation when adding/modifying/removing a due date

* Show due date in issue list

* Added api support for issue due dates

* Fixed lint suggestions

* Added deadline to sdk

* Updated css

* Added support for adding/modifiying deadlines for pull requests via api

* Fixed comments not created when updating or removing a deadline

* update sdk (will do properly once go-gitea/go-sdk#103 is merged)

* enhanced updateIssueDeadline

* Removed unnessecary Issue.DeadlineString

* UI improvements

* Small improvments to comment creation
+ ui & validation improvements

* Check if an issue is overdue is now a seperate function

* Updated go-sdk with govendor as it was merged

* Simplified isOverdue method

* removed unessecary deadline to 0 set

* Update swagger definitions

* Added missing return

* Added an explanary comment

* Improved updateIssueDeadline method so it'll only update `deadline_unix`

* Small changes and improvements
* no need to explicitly load the issue when updating a deadline, just use whats already there
* small optimisations

* Added check if a deadline was modified before updating it

* Moved comment creating logic into its own function

* Code cleanup for creating deadline comment

* locale improvement

* When modifying a deadline, the old deadline is saved with the comment

* small improvments to xorm session handling when updating an issue deadline
+ style nitpicks

* style nitpicks

* Moved checking for if the user has write acces to middleware
2018-05-01 22:05:28 +03:00
GiteaBot 1928920a08 [skip ci] Updated translations via Crowdin 2018-05-01 01:46:31 +00:00
GiteaBot fff022ef8a [skip ci] Updated translations via Crowdin 2018-04-30 17:55:00 +00:00
GiteaBot 6f62d4f180 [skip ci] Updated translations via Crowdin 2018-04-29 19:36:12 +00:00
Jonas Franz 8d5f58d834 Shows total tracked time in issue and milestone list (#3341)
* Show total tracked time in issue and milestone list
Show total tracked time at issue page

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Optimizing TotalTimes by using SumInt

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fixing wrong total times for milestones caused by a missing JOIN
Adding unit tests for total times

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Logging error instead of ignoring it

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Correcting spelling mistakes

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Change error message to a short version

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add error handling to TotalTimes
Add variable for totalTimes

Signed-off-by: Jonas Franz <info@jonasfranz.de>

* Introduce TotalTrackedTimes as variable of issue
Load TotalTrackedTimes by loading attributes of IssueList
Load TotalTrackedTimes by loading attributes of single issue
Add Sec2Time as helper to use it in templates

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fixed test + gofmt

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Load TotalTrackedTimes via MilestoneList instead of single requests

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add documentation for MilestoneList

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add documentation for MilestoneList

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fix test

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Change comment from SQL query to description

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fix unit test by using int64 instead of int

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fix unit test by using int64 instead of int

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Check if timetracker is enabled

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Fix test by enabling timetracking

Signed-off-by: Jonas Franz <info@jonasfranz.de>
2018-04-29 13:58:47 +08:00
GiteaBot 76106ab080 [skip ci] Updated translations via Crowdin 2018-04-29 04:48:36 +00:00
GiteaBot c3f2b8803f [skip ci] Updated translations via Crowdin 2018-04-28 20:46:38 +00:00
GiteaBot fb2f8dcf3c [skip ci] Updated translations via Crowdin 2018-04-23 05:56:09 +00:00
GiteaBot bae26421aa [skip ci] Updated translations via Crowdin 2018-04-21 01:23:11 +00:00
GiteaBot 725835b5b1 [skip ci] Updated translations via Crowdin 2018-04-20 09:15:19 +00:00
GiteaBot cf8c2e5951 [skip ci] Updated translations via Crowdin 2018-04-20 00:26:45 +00:00
bugreport0 bac6d05e78 Improve English grammar and consistency. (#3614)
* Start improving English grammar and consistency.

* Apply review comments, push translation further.

* Additional review changes; expand translation.

* Undo team/organization change, further translation.

* Add site administration; review comments; merge.

* Update hardcoded branch protection string tests.

* Update hardcoded branch deletion string test.

* Update another hardcoded translation string test.

* Add my nickname to the list of translators.

* Implement @lafriks review comments.

* Remove (now) unused branch deletion warnings.

* Remove (now) unused branch deletion warnings.
2018-04-19 17:24:31 +03:00
GiteaBot 1d82e775cc [skip ci] Updated translations via Crowdin 2018-04-19 12:31:42 +00:00
GiteaBot a0ea370c8c [skip ci] Updated translations via Crowdin 2018-04-19 01:10:26 +00:00
GiteaBot 66d3c541a0 [skip ci] Updated translations via Crowdin 2018-04-17 09:11:59 +00:00
GiteaBot 9add96a872 [skip ci] Updated translations via Crowdin 2018-04-17 00:57:59 +00:00
GiteaBot b84e165ab4 [skip ci] Updated translations via Crowdin 2018-04-16 05:28:09 +00:00
GiteaBot 804bc0aa2f [skip ci] Updated translations via Crowdin 2018-04-16 04:05:22 +00:00
Lunny Xiao bec69f702b
Add topic support (#3711)
* add topic models and unit tests

* fix comments

* fix comment

* add the UI to show or add topics for a repo

* show topics on repositories list

* fix test

* don't show manage topics link when no permission

* use green basic as topic label

* fix topic label color

* remove trace content

* remove debug function
2018-04-11 10:51:44 +08:00
GiteaBot 1946ce2954 [skip ci] Updated translations via Crowdin 2018-04-10 12:40:23 +00:00
Bwko 8ee45eb614 Add EnableTimetracking option to app settings (#3719) 2018-04-09 23:15:32 +08:00
GiteaBot 7000b41851 [skip ci] Updated translations via Crowdin 2018-04-04 21:09:19 +00:00
GiteaBot 5512ed3699 [skip ci] Updated translations via Crowdin 2018-04-04 12:01:02 +00:00
GiteaBot 36ea53332d [skip ci] Updated translations via Crowdin 2018-03-29 13:34:02 +00:00
GiteaBot a8beef890d [skip ci] Updated translations via Crowdin 2018-03-29 01:41:06 +00:00
GiteaBot 4c6e170ceb [skip ci] Updated translations via Crowdin 2018-03-27 14:14:57 +00:00
Allen Wild 15c6bb500b Add repository setting to enable/disable health checks (#3607)
New Feature:
  * Repository struct field for IsFsckEnabled (default true of course)
  * Admin Settings section on repo options page, accessible only by
    admin users

Possible Enhancements:
  * There's no way to force running health checks on all repos
    regardless of their IsFsckEnabled setting. This would be useful if
    there were an admin API or dashboard button to run fsck immediately.

Issue: https://github.com/go-gitea/gitea/issues/1712
Signed-off-by: Allen Wild <allenwild93@gmail.com>
2018-03-27 22:13:20 +08:00
Chri-s 9350ba7947 Add protected branch whitelists for merging (#3689)
* Add database migrations for merge whitelist

* Add merge whitelist settings for protected branches

* Add checks for merge whitelists
2018-03-25 13:01:32 +03:00
GiteaBot 04b7fd87b9 [skip ci] Updated translations via Crowdin 2018-03-23 14:12:13 +00:00
GiteaBot 05abd03011 [skip ci] Updated translations via Crowdin 2018-03-20 21:40:24 +00:00
GiteaBot 47422c2635 [skip ci] Updated translations via Crowdin 2018-03-19 14:30:44 +00:00
GiteaBot c28bf94252 [skip ci] Updated translations via Crowdin 2018-03-18 01:33:53 +00:00
kolaente 88aef6eea9 Codesearch message fix (#3684) 2018-03-18 03:32:36 +02:00
GiteaBot 86bf3704ea [skip ci] Updated translations via Crowdin 2018-03-17 03:55:24 +00:00
GiteaBot 1324d62cd3 [skip ci] Updated translations via Crowdin 2018-03-16 14:05:58 +00:00
Lunny Xiao 9e5d0a09eb
Global code search support (#3664)
* add global code search on explore

* fix bug when no anyone public repos

* change the icon

* fix typo and add UnitTypeCode check for login non-admin user

* fix ui description when no match
2018-03-16 22:04:33 +08:00
GiteaBot 4163cdf3ea [skip ci] Updated translations via Crowdin 2018-03-15 21:14:38 +00:00
Lauris BH c0d41b1b77 Add label descriptions (#3662)
* Add label descriptions

* Add default descriptions to label template
2018-03-13 10:03:55 +08:00
GiteaBot 575c109a02 [skip ci] Updated translations via Crowdin 2018-03-12 10:00:16 +00:00
bugreport0 b333e7129d Add separate string for the 'Create Team' button. (#3647)
* Add separate string for the 'Create Team' button.

* Add separate string for the 'Create Team' button.
2018-03-09 19:37:24 +02:00
GiteaBot f0aee3c467 [skip ci] Updated translations via Crowdin 2018-03-09 01:22:23 +00:00
GiteaBot d71f510c62 [skip ci] Updated translations via Crowdin 2018-03-07 06:45:23 +00:00
bugreport0 9fc418a652 Add string to confirm wiki data erasure (#3629)
* Add a string to confirm wiki data erasure.

* Add a string to confirm wiki data erasure.
2018-03-06 15:25:21 +08:00
GiteaBot 7ea7c57406 [skip ci] Updated translations via Crowdin 2018-03-04 02:46:24 +00:00
GiteaBot 990709da8f [skip ci] Updated translations via Crowdin 2018-03-02 20:32:20 +00:00
GiteaBot f44c31f869 [skip ci] Updated translations via Crowdin 2018-03-02 09:11:11 +00:00
Allen Wild 8606d9f5bc Add admin dashboard option to run health checks (#3606)
There's one for git gc, why not git fsck too?

Also add a couple more trace logs to GitFsck to see progress
2018-03-02 11:09:43 +02:00
GiteaBot 2cd3622ddc [skip ci] Updated translations via Crowdin 2018-02-27 07:10:26 +00:00
GiteaBot fb2c176491 [skip ci] Updated translations via Crowdin 2018-02-18 21:20:48 +00:00
GiteaBot e59fe7c8d9 [skip ci] Updated translations via Crowdin 2018-02-18 14:39:52 +00:00
GiteaBot b29c358315 [skip ci] Updated translations via Crowdin 2018-02-16 14:03:54 +00:00
bugreport0 9303fc2015 Fix ellipses, 'a[n]' and 'username' (issue #3512). (#3518) 2018-02-16 08:02:40 -06:00
GiteaBot 4b48a45bac [skip ci] Updated translations via Crowdin 2018-02-16 01:57:33 +00:00
Jonas Franz e87c063c90 Add missing licenses (#3497)
Signed-off-by:  Jonas Franz <info@jonasfranz.de>
2018-02-13 07:10:40 +02:00
Jonas Franz fbdc00f464 Updating generate-licenses.go to fetch licenses from maintained repository. (#3484)
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2018-02-12 20:20:30 +02:00
Jonas Franz 58771acacb Add EUPL v1.2 as license (Fixes go-gitea/gitea#3439) (#3475)
Signed-off-by: Jonas Franz <info@jonasfranz.de>
2018-02-09 15:11:19 +02:00
GiteaBot b62ce2e246 [skip ci] Updated translations via Crowdin 2018-01-31 15:41:59 +00:00
GiteaBot d09704e903 [skip ci] Updated translations via Crowdin 2018-01-30 12:30:54 +00:00
GiteaBot 5911f98392 [skip ci] Updated translations via Crowdin 2018-01-29 17:50:28 +00:00
GiteaBot 7af81973cb [skip ci] Updated translations via Crowdin 2018-01-29 11:15:41 +00:00
GiteaBot 7fd2d8e392 [skip ci] Updated translations via Crowdin 2018-01-28 12:25:26 +00:00
GiteaBot 9e87fe8c06 [skip ci] Updated translations via Crowdin 2018-01-27 02:18:45 +00:00
Kazuki Sawada 07b4e47a56 Add myself to TRANSLATORS (#3415) 2018-01-26 20:17:26 -06:00
GiteaBot 82a7b0292e [skip ci] Updated translations via Crowdin 2018-01-25 14:03:22 +00:00
GiteaBot a880b17296 [skip ci] Updated translations via Crowdin 2018-01-16 21:27:57 +00:00
GiteaBot cc0c4a30a7 [skip ci] Updated translations via Crowdin 2018-01-15 22:45:41 +00:00
GiteaBot e2bb7933e8 [skip ci] Updated translations via Crowdin 2018-01-15 06:04:51 +00:00
Ethan Koenig d29aa76777 Fix en-US locale (#3371) 2018-01-15 00:27:57 +02:00
GiteaBot 6b9073b3a4 [skip ci] Updated translations via Crowdin 2018-01-14 22:10:15 +00:00
viktike 18bf6be398 Add myself as a translator (#3370) 2018-01-15 00:09:30 +02:00
GiteaBot 6da5ed2594 [skip ci] Updated translations via Crowdin 2018-01-14 17:35:34 +00:00
GiteaBot a8325dd1cb [skip ci] Updated translations via Crowdin 2018-01-13 09:46:18 +00:00
GiteaBot f7088292bb [skip ci] Updated translations via Crowdin 2018-01-12 22:17:50 +00:00
Antoine GIRARD 079273e2ff Add MSSQL to supported database list of intall page (#3359) 2018-01-12 19:23:28 +02:00
GiteaBot 51a18f7e54 [skip ci] Updated translations via Crowdin 2018-01-11 22:20:44 +00:00
GiteaBot 9aed18073d [skip ci] Updated translations via Crowdin 2018-01-11 19:57:53 +00:00
GiteaBot 6070c9a5b8 [skip ci] Updated translations via Crowdin 2018-01-09 18:41:13 +00:00
GiteaBot 9d8260b3d6 [skip ci] Updated translations via Crowdin 2018-01-07 09:42:08 +00:00
GiteaBot 87f67fd392 [skip ci] Updated translations via Crowdin 2018-01-07 09:14:19 +00:00
GiteaBot 4002328179 [skip ci] Updated translations via Crowdin 2018-01-06 22:56:53 +00:00
Vlad Temian e78786ef39 Writable deploy keys (closes #671) (#3225)
* Add is_writable checkbox to deploy keys interface

* Add writable key option to deploy key form

* Add support for writable ssh keys in the interface

* Rename IsWritable to ReadOnly

* Test: create read-only and read-write deploy keys via api

* Add DeployKey access mode migration

* Update gitea sdk via govendor

* Fix deploykey migration

* Add unittests for writable deploy keys

* Move template text to locale

* Remove implicit column update

* Remove duplicate locales

* Replace ReadOnly field with IsReadOnly method

* Fix deploy_keys related integration test

* Rename v54 migration with v55

* Fix migration hell
2018-01-07 00:55:53 +02:00
GiteaBot 52d93f7c31 [skip ci] Updated translations via Crowdin 2018-01-06 19:53:48 +00:00
GiteaBot 2d31986236 [skip ci] Updated translations via Crowdin 2018-01-06 11:29:31 +00:00
GiteaBot 15b8720c5d [skip ci] Updated translations via Crowdin 2018-01-05 18:57:58 +00:00
Lauris BH 8ac1501ad7
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)
* Pull request options migration and UI in settings

* Add ignore whitespace functionality

* Fix settings if pull requests are disabled

* Fix migration transaction

* Merge with Rebase functionality

* UI changes and related functionality for pull request merging button

* Implement squash functionality

* Fix rebase merging

* Fix pull request merge tests

* Add squash and rebase tests

* Fix API method to reuse default message functions

* Some refactoring and small fixes

* Remove more hardcoded values from tests

* Remove unneeded check from API method

* Fix variable name and comment typo

* Fix reset commit count after PR merge
2018-01-05 20:56:50 +02:00
GiteaBot daf08aeacd [skip ci] Updated translations via Crowdin 2018-01-03 08:35:03 +00:00
GiteaBot de9e36e90e [skip ci] Updated translations via Crowdin 2018-01-02 12:14:47 +00:00
GiteaBot 274241c044 [skip ci] Updated translations via Crowdin 2018-01-02 10:33:40 +00:00
GiteaBot a22037713e [skip ci] Updated translations via Crowdin 2018-01-02 02:38:10 +00:00
Piotr Orzechowski 50b7ba1b70 Fix MS AD Search Attributes English translation (#3282) 2018-01-02 10:37:16 +08:00
GiteaBot 7944ff7e71 [skip ci] Updated translations via Crowdin 2018-01-01 13:39:43 +00:00
GiteaBot b05a17249b [skip ci] Updated translations via Crowdin 2017-12-31 14:47:00 +00:00
GiteaBot ae9cc8f972 [skip ci] Updated translations via Crowdin 2017-12-31 03:09:06 +00:00
GiteaBot a995ad90e1 [skip ci] Updated translations via Crowdin 2017-12-22 07:01:25 +00:00
GiteaBot 7cf17e376b [skip ci] Updated translations via Crowdin 2017-12-20 03:42:21 +00:00
GiteaBot e693fda325 [skip ci] Updated translations via Crowdin 2017-12-12 22:27:18 +00:00
GiteaBot 2ad633344e [skip ci] Updated translations via Crowdin 2017-12-12 06:46:42 +00:00
GiteaBot eb6cbedcc0 [skip ci] Updated translations via Crowdin 2017-12-10 02:52:04 +00:00
GiteaBot 5b30964e54 [skip ci] Updated translations via Crowdin 2017-12-08 17:21:10 +00:00
GiteaBot f8967fc638 [skip ci] Updated translations via Crowdin 2017-12-08 12:23:00 +00:00
GiteaBot aecfc56156 [skip ci] Updated translations via Crowdin 2017-12-08 05:23:04 +00:00
Sasha Varlamov 7ec6cddd27 Add 'mark all read' option to notifications (#3097)
* Add 'mark all read' option to notifications

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Fix exported comment

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Format method comments

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

* Fix exported comment

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

Format method comments

Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>

Tests for reactions (#3083)

* Unit tests for reactions

* Fix import order

Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>

Fix reaction possition when there is attachments (#3099)

Refactor notifications swap function

* Accept change to drop beforeupdate call

* Update purge notifications error message for consistency

* Drop unnecessary check for mark all as read button

* Remove debugging comment
2017-12-07 13:52:57 +08:00
GiteaBot 0332b8fb18 [skip ci] Updated translations via Crowdin 2017-12-04 14:06:04 +00:00
Lauris BH 5dc37b187c
Add reactions to issues/PR and comments (#2856) 2017-12-04 01:14:26 +02:00
techknowlogick 993b86628b Minor copy changes (#3074)
* Minor copy changes
Fixes #3058

* Use TrN for translations that depend on count
Fix minor type with branches count
2017-12-03 22:52:30 +02:00
GiteaBot 6d99840d1f [skip ci] Updated translations via Crowdin 2017-12-03 05:31:04 +00:00
GiteaBot 4cf90aa865 [skip ci] Updated translations via Crowdin 2017-11-29 20:53:22 +00:00
GiteaBot 033ad9a79f [skip ci] Updated translations via Crowdin 2017-11-29 12:50:43 +00:00
GiteaBot b9452c48ac [skip ci] Updated translations via Crowdin 2017-11-29 09:11:10 +00:00
GiteaBot cbc6bbfbeb [skip ci] Updated translations via Crowdin 2017-11-29 01:52:11 +00:00
GiteaBot 0c69b768b9 [skip ci] Updated translations via Crowdin 2017-11-28 09:44:21 +00:00
Ethan Koenig b7ebaf6d20 Various wiki bug fixes (#2996)
* Update macaron

* Various wiki bug fixes
2017-11-28 17:43:51 +08:00
GiteaBot 16c55e1a5b [skip ci] Updated translations via Crowdin 2017-11-26 02:01:56 +00:00
Lunny Xiao 10b54df2b2 Add dingtalk webhook (#2777)
* add dingtalk webhook type

* add vendor

* some fixes

* fix name check

* fix name check & improvment
2017-11-21 06:26:43 +02:00
Michael Kuhn 420fc8efc2 Disable add key button if SSH is disabled (#2873) 2017-11-21 11:49:33 +08:00
GiteaBot e00df9fb8e [skip ci] Updated translations via Crowdin 2017-11-20 23:37:46 +00:00
GiteaBot 1cb01817c9 [skip ci] Updated translations via Crowdin 2017-11-17 03:17:21 +00:00
GiteaBot b33ce46a48 [skip ci] Updated translations via Crowdin 2017-11-16 13:17:13 +00:00
GiteaBot 222e7c3f06 [skip ci] Updated translations via Crowdin 2017-11-16 05:54:31 +00:00
GiteaBot 074f6c1b49 [skip ci] Updated translations via Crowdin 2017-11-15 08:12:05 +00:00
GiteaBot a30cc637c6 [skip ci] Updated translations via Crowdin 2017-11-15 03:35:51 +00:00
Lauris BH a6f337046f Update go-ini dependency and remove semicolon hack in translations (#2913) 2017-11-15 11:34:42 +08:00
Ethan Koenig bd23e36bec Add owner to delete repo message (#2886) 2017-11-15 09:37:16 +08:00
GiteaBot a8832e1227 [skip ci] Updated translations via Crowdin 2017-11-14 23:40:26 +00:00
GiteaBot 72fc829b05 [skip ci] Updated translations via Crowdin 2017-11-14 11:25:14 +00:00
GiteaBot 44bd5ff466 [skip ci] Updated translations via Crowdin 2017-11-14 00:57:08 +00:00
GiteaBot afa85f9b55 [skip ci] Updated translations via Crowdin 2017-11-13 14:54:11 +00:00
GiteaBot e9728bf3b4 [skip ci] Updated translations via Crowdin 2017-11-13 09:33:29 +00:00
Lauris BH 134958fd9f
Fix localization texts that contain semicolon (#2900) 2017-11-13 09:56:10 +02:00
GiteaBot 4287d100b3 [skip ci] Updated translations via Crowdin 2017-11-13 01:37:21 +00:00
GiteaBot 1ebf257bed [skip ci] Updated translations via Crowdin 2017-11-11 23:19:22 +00:00
GiteaBot 524cca3a1e [skip ci] Updated translations via Crowdin 2017-11-11 01:33:50 +00:00
GiteaBot e22be08ab6 [skip ci] Updated translations via Crowdin 2017-11-08 13:06:17 +00:00
GiteaBot 61f5c22503 [skip ci] Updated translations via Crowdin 2017-11-07 06:34:16 +00:00
GiteaBot ddb75191ec [skip ci] Updated translations via Crowdin 2017-11-07 04:34:18 +00:00
GiteaBot 76b8c3c68f "[skip ci] Updated translations via Crowdin" 2017-11-04 15:56:28 +00:00
Discusal Media 6a49ada260 Update TRANSLATORS (#2843)
* Update TRANSLATORS

* Change order to alphabetical
2017-11-04 17:56:06 +02:00
GiteaBot 1febbf0da9 "[skip ci] Updated translations via Crowdin" 2017-11-04 13:33:10 +00:00
GiteaBot 1621069f83 "[skip ci] Updated translations via Crowdin" 2017-11-04 11:54:55 +00:00
lafriks dcb009aa86 '[skip ci] Updated translations via Crowdin' 2017-11-03 23:24:26 +00:00
Joel da Rosa e6bb8e7a4d Translator pt-BR (#2838)
* Translator pt-BR

* rectification translators pt-BR
2017-11-03 16:45:21 +02:00
lafriks 3ee7248970 '[skip ci] Updated translations via Crowdin' 2017-11-02 23:33:59 +00:00
lafriks d94e2a1c22 '[skip ci] Updated translations via Crowdin' 2017-11-02 13:01:46 +00:00
Jonathan Lozada D 8a9cc86bf6 added myself to the translation list (#2828) 2017-11-02 15:00:42 +02:00
lafriks 85e99b6a6b '[skip ci] Updated translations via Crowdin' 2017-11-01 19:44:17 +00:00
Lauris BH 266ebf8200 Revert en-US locale (#2821) 2017-11-02 00:03:10 +08:00
lunny 3217102516 '[skip ci] Updated translations via Crowdin' 2017-11-01 15:47:40 +00:00
lunny 1ccaddcfbb '[skip ci] Updated translations via Crowdin' 2017-11-01 12:53:57 +00:00
appleboy 6f84569629 '[skip ci] Updated translations via Crowdin' 2017-11-01 09:14:08 +00: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
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
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
Patrick G bc8d72666c Admin grammar fixes and improvements (#2056) 2017-10-21 16:30:21 +03:00
Lunny Xiao 9e865cee67 Merge password and 2fa page on user settings (#2695)
* merge password and 2fa page on user settings
2017-10-16 11:14:12 +02:00
Lauris BH f3833b7ce4 Create new branch from branch selection dropdown (#2130)
* Create new branch from branch selection dropdown and rewrite it to VueJS

* Make updateLocalCopyToCommit as not exported

* Move branch name validation to model

* Fix possible race condition
2017-10-15 22:59:24 +03:00
Ethan Koenig c25303b11c Fix activity locale (#2709) 2017-10-15 21:30:26 +03:00
Lauris BH 32ca299650 Remove direct user adding to organization members (#2641) 2017-10-15 10:24:24 +08:00
Lauris BH f42dbdbae5 Add Activity page to repository (#2674)
* Add Activity page to repository

* Add request data for activity

* Add issue data for activity

* Add user unit right checks

* Add releases to activity

* Log repository unit loading error
2017-10-15 02:17:39 +03:00
David Schneiderbauer 1eedd983ea Complete push webhooks (#2530)
* implemented missing 'delete' push webhooks

moreover created ActionDeleteBranch and ActionDeleteTag

* add CommitRepoAction tests for tag/branch creation/deletion

* fixed error where push webhook not called if is new branch or tag
removed unnecessary code

* moved prepare unit test environment into separate method to be used across unit tests

* add missing if clause in pushUpdate

Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>
2017-09-21 10:43:26 +03:00
Jorge Maldonado Ventura d155d0e665 Make basic functionality work without JavaScript (#2541) 2017-09-19 01:03:01 +02:00
Rémy Boulanouar e5d80b7090 Implementation of all repositories of a user from user->settings (#1740)
* Implementation of all repositories of a user from user->settings

* Update message when no repository found

* Update according to comments

* Change UI to have a better look

* improved user repositories UI
2017-09-14 14:46:14 +03:00
Lunny Xiao 1739e84ac0 improve protected branch to add whitelist support (#2451)
* improve protected branch to add whitelist support

* fix lint

* fix style check

* fix tests

* fix description on UI and import

* fix test

* bug fixed

* fix tests and languages

* move isSliceInt64Eq to util pkg; improve function names & typo
2017-09-14 16:16:22 +08:00
Jonas Franz 5ccecb44ad Feature: Timetracking (#2211)
* Added comment's hashtag to url for mail notifications.
* Added explanation to return statement + documentation.
* Replacing in-line link generation with HTMLURL. (+gofmt)
* Replaced action-based model with nil-based model. (+gofmt)
* Replaced mailIssueActionToParticipants with mailIssueCommentToParticipants.
* Updating comment for mailIssueCommentToParticipants
* Added link to comment in "Dashboard"
* Deleting feed entry if a comment is going to be deleted
* Added migration
* Added improved migration to add a CommentID column to action.
* Added improved links to comments in feed entries.
* Fixes #1956 by filtering for deleted comments that are referenced in actions.
* Introducing "IsDeleted" column to action.
* Adding design draft (not functional)
* Adding database models for stopwatches and trackedtimes
* See go-gitea/gitea#967
* Adding design draft (not functional)
* Adding translations and improving design
* Implementing stopwatch (for timetracking)
* Make UI functional
* Add hints in timeline for time tracking events
* Implementing timetracking feature
* Adding "Add time manual" option
* Improved stopwatch
* Created report of total spent time by user
* Only showing total time spent if theire is something to show.
* Adding license headers.
* Improved error handling for "Add Time Manual"
* Adding @sapks 's changes, refactoring
* Adding API for feature tracking
* Adding unit test
* Adding DISABLE/ENABLE option to Repository settings page
* Improving translations
* Applying @sapk 's changes
* Removing repo_unit and using IssuesSetting for disabling/enabling timetracker
* Adding DEFAULT_ENABLE_TIMETRACKER to config, installation and admin menu
* Improving documentation
* Fixing vendor/ folder
* Changing timtracking routes by adding subgroups /times and /times/stopwatch (Proposed by @lafriks )
* Restricting write access to timetracking based on the repo settings (Proposed by @lafriks )
* Fixed minor permissions bug.
* Adding CanUseTimetracker and IsTimetrackerEnabled in ctx.Repo
* Allow assignees and authors to track there time too.
* Fixed some build-time-errors + logical errors.
* Removing unused Get...ByID functions
* Moving IsTimetrackerEnabled from context.Repository to models.Repository
* Adding a seperate file for issue related repo functions
* Adding license headers
* Fixed GetUserByParams return 404
* Moving /users/:username/times to /repos/:username/:reponame/times/:username for security reasons
* Adding /repos/:username/times to get all tracked times of the repo
* Updating sdk-dependency
* Updating swagger.v1.json
* Adding warning if user has already a running stopwatch (auto-timetracker)
* Replacing GetTrackedTimesBy... with GetTrackedTimes(options FindTrackedTimesOptions)
* Changing code.gitea.io/sdk back to code.gitea.io/sdk
* Correcting spelling mistake
* Updating vendor.json
* Changing GET stopwatch/toggle to POST stopwatch/toggle
* Changing GET stopwatch/cancel to POST stopwatch/cancel
* Added migration for stopwatches/timetracking
* Fixed some access bugs for read-only users
* Added default allow only contributors to track time value to config
* Fixed migration by chaging x.Iterate to x.Find
* Resorted imports
* Moved Add Time Manually form to repo_form.go
* Removed "Seconds" field from Add Time Manually
* Resorted imports
* Improved permission checking
* Fixed some bugs
* Added integration test
* gofmt
* Adding integration test by @lafriks
* Added created_unix to comment fixtures
* Using last event instead of a fixed event
* Adding another integration test by @lafriks
* Fixing bug Timetracker enabled causing error 500 at sidebar.tpl
* Fixed a refactoring bug that resulted in hiding "HasUserStopwatch" warning.
* Returning TrackedTime instead of AddTimeOption at AddTime.
* Updating SDK from go-gitea/go-sdk#69
* Resetting Go-SDK back to default repository
* Fixing test-vendor by changing ini back to original repository
* Adding "tags" to swagger spec
* govendor sync
* Removed duplicate
* Formatting templates
* Adding IsTimetrackingEnabled checks to API
* Improving translations / english texts
* Improving documentation
* Updating swagger spec
* Fixing integration test caused be translation-changes
* Removed encoding issues in local_en-US.ini.
* "Added" copyright line
* Moved unit.IssuesConfig().EnableTimetracker into a != nil check
* Removed some other encoding issues in local_en-US.ini
* Improved javascript by checking if data-context exists
* Replaced manual comment creation with CreateComment
* Removed unnecessary code
* Improved error checking
* Small cosmetic changes
* Replaced int>string>duration parsing with int>duration parsing
* Fixed encoding issues
* Removed unused imports

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-09-12 09:48:13 +03:00
Antoine GIRARD 7c417bbb0d Only check at least one email gpg key (#2266)
* Only require one email (possibly not yet validated)

* Update message error and check validation of commit

* Add integrations tests

* Complete integration for import

* Add pre-check/optimization

* Add some test (not finished)

* Finish

* Fix fixtures

* Fix typo

* Don't guess key ID
2017-09-05 21:45:18 +08:00
Ethan Koenig b689bb6180 Webhooks for repo creation/deletion (#1663)
* Webhooks for repo creation/deletion

* add createHookTask

* Add handles for GetSlackPayload and GetDiscordPayload
2017-09-03 11:20:24 +03:00
Lunny Xiao ced50e0ec1 Implementation of discord webhook (#2402)
* implementation of discord webhook

* fix webhooks

* fix typo and unnecessary color values

* fix typo

* fix imports and revert changes to webhook_slack.go
2017-08-28 13:06:45 +08:00
Zsombor da230a2872 Add possibility to record branch or tag information in an issue (#780) 2017-08-24 15:30:27 +03:00
Lunny Xiao 0fd9289810 update translation from crowdin (#2368) 2017-08-23 23:17:25 +08:00
Sandro Santilli 2c3a229a3c Add OpenID configuration in install page (#2276) 2017-08-19 17:34:49 +02:00
Lauris BH 9df090e551 Add missing forks key for dashboard repository component (#2325)
Missing key that is used in #2285
2017-08-18 14:56:04 +08:00
Morlinest 951fb572a7 Fix and improve dashboard repo UI (#2285)
* Fix and improve dashboard repo UI

* Change order of scripts loading

* Remove "mirror" tab

* Remove single tab panel for "org user"

* Add localization strings

* Create vue component and change event for search

* Add "mirrors" filter
2017-08-17 09:31:34 +08:00
Bwko 8f171210b9 Revert "Add ability to fork your own repos (#761)" (#2193) 2017-07-26 15:17:38 +08:00
Lauris BH f33e6ae09e Remove unit types commits and settings (#2161)
* Remove unit types commits and settings

* Can not limit units in administrator teams

* Limit changing units only to teams with read and write access mode

* Small code optimization
2017-07-17 10:04:43 +08:00
Patrick G ceb3544697 Small grammar fixes (#2144) 2017-07-12 04:25:45 +02:00