Commit Graph

6079 Commits

Author SHA1 Message Date
Jonas Franz
b3fd46726f Merge branch 'master' of https://github.com/go-gitea/gitea 2017-09-13 18:09:34 +02:00
Morlinest
35b473d8d3 Remove repository mirrors from "collaborative" list (#2497) 2017-09-13 19:02:37 +03:00
Jonas Franz
09f817c2c9 Hotfix for "Add time manually" (https://github.com/go-gitea/gitea/pull/2211#issuecomment-328780125)
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-09-13 18:01:44 +02:00
Bo-Yi Wu
3e89e89670 add codecov.io service. (#2493)
* add codecov.io service.

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

* update

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

* only PR or master branch (for coverage badge)

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

* update

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

* update init

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-09-13 20:57:55 +08:00
Lunny Xiao
9ef83a98e5 fix release (#2496) 2017-09-13 17:20:15 +08:00
Jon Davies
fb1ed5de94 Dockerfile: Updated alpine image to 3.6. (#2486)
Signed-off-by: Jonathan Davies <jpds@protonmail.com>
2017-09-13 14:37:42 +08:00
Lauris BH
377cd1ae38 Allow changing integration test database connection using env variables (#2484) 2017-09-13 14:03:20 +08:00
Lunny Xiao
005900baea Use created & updated instead BeforeInsert & BeforeUpdate (#2482)
* use created & updated instead BeforeInsert & BeforeUpdate

* fix vendor checksum

* only show generated SQL when development mode

* remove extra update column updated_unix

* remove trace config
2017-09-13 08:18:22 +03:00
Konrad Langenberg
b61b166f46 Fixed conflict with timetracking
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-12 22:20:57 +02:00
Lauris BH
4c2b1be3a4 Basic VSCode configuration for building and debugging (#2483)
* Basic VSCode configuration for building and debugging

* Fix building and debugging in Windows

* Move to contrib folder and add instructions
2017-09-12 20:27:44 +08:00
kolaente
67f66d6bb5 Resolved Conflicts
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-12 14:19:20 +02:00
Lauris BH
8c3a2e817b Add missing fixture to clean gpg_key table (#2494)
* Add missing fixture to clean gpg_key table

* Fix possible too fast request execution in timetracker start/stop test
2017-09-12 13:54:45 +03:00
techknowlogick
9bdbfbf6f3 Disable custom Git Hooks globally via configuration file (#2450)
* Create option to disable githooks globally via configuration file

* Update comment in app.ini to align with @ethantkoenig's suggestion

Signed-off-by: Matti Ranta <matti@mdranta.net>
2017-09-12 12:25:42 +03:00
Jonas Östanbäck
3fecf94086 Open external wiki in new window (#2489) 2017-09-12 10:29:35 +03: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
69dfe43ffc Fix some tests : make coverage -> test (#2492)
* Fix test : make coverage -> test

* Refactor integration tests to be able to run them in parallel

* Add custom local repository temp path
2017-09-12 13:51:12 +08:00
Jonas Östanbäck
eab4579e17 Fix fmt error in mailer (#2490) 2017-09-12 09:04:14 +08:00
Jonas Östanbäck
01d7189c2d Fix slice out of bounds error in mailer (#2479) 2017-09-11 14:33:28 +08:00
Albert
250f1236dc * Fix fileview rendering bug #2470 (#2477) 2017-09-10 22:21:26 +02:00
Thomas Boerger
fd85e25f5f Hotfix for integration testing (#2473)
* Hotfix for integration testing

* Comment sqlite tests because of database locking issues
2017-09-10 09:54:11 +08:00
Konrad Langenberg
50bc8435d1 Moved languagestrings to ini
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-09 14:38:51 +02:00
Konrad Langenberg
0c9203d12b Implemented repo settings check on autoclose
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-09 14:09:44 +02:00
Konrad Langenberg
2a87cd9a06 Fully implemented Repo setting to enable/disable Issue Dependencies
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-09 13:46:46 +02:00
Thomas Boerger
4b8fef143e Changes for latest DroneCI (#2362) 2017-09-07 19:22:15 +02:00
Lunny Xiao
95c408ffa5 hide branch on pull request view or create UI (#2454) 2017-09-06 15:02:51 +03:00
Antoine GIRARD
4f9a28e1f5 Make repo private to no interfere with other tests (#2467) 2017-09-06 00:33:33 +03:00
Konrad Langenberg
956697a0e9 removed TODO
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-05 19:14:07 +02:00
Konrad Langenberg
26b283f3c4 Fixed showing correct index in issue comment
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-05 19:10:15 +02:00
Konrad Langenberg
4d992e7c90 Fixed issue comment title bug
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-05 18:55:09 +02: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
Lunny Xiao
5f4210a9b0 add release notes of v1.1.4 (#2463) 2017-09-05 09:00:55 +03:00
Lauris BH
a569d3dedc Fix migration from pre-v15 to 1.2.0 (#2460) 2017-09-05 08:28:06 +08:00
Konrad Langenberg
ad0fcd4dc5 Beautify @JonasFranzDEV
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-04 23:32:34 +02:00
Konrad Langenberg
d9c67292b8 Fixed comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-04 22:39:37 +02:00
Konrad Langenberg
8c8a244c34 Started implementation of comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-04 22:30:22 +02:00
Lunny Xiao
32238e0ac9 Add changelog config file for generate changelog (#2461) 2017-09-04 13:07:57 +03:00
Lunny Xiao
caa61a2b99
bug fixed 2017-09-04 14:22:07 +08:00
kolaente
4cb857fe0d Implemented Basic Setting of Issue Dependencies
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-03 21:51:22 +02:00
kolaente
24514ba1c4 Started implementation of setting
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-03 19:49:51 +02: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
Sandro Santilli
79f7839633 Wrap most text to 80 columns (#2452) 2017-09-02 22:38:31 +03:00
Lunny Xiao
04ec79579c fix orgnization webhooks (#2422)
* fix org webhooks

* remove trace code
2017-08-30 13:36:52 +08:00
Lunny Xiao
5de94a67cf some refactors for issue and comments (#2419) 2017-08-30 07:31:33 +03:00
Sandro Santilli
edc817a1dc Wrap most paragraphs to 80 columns (#2396)
Reduces patches size and makes them more readable
2017-08-30 09:27:23 +08:00
Konrad Langenberg
a9607ed720 Implemented Dependencies for pull requests.
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-29 22:32:29 +02:00
Konrad Langenberg
875cd3ca58 Implemented not closing an issue via commit message if it has blocking dependencies
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-29 20:40:00 +02:00
Konrad Langenberg
5927e13e53 Implemented not closing an issue if it has blocking dependencies
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-29 20:28:18 +02:00
Konrad Langenberg
707551785f Improved Comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-29 18:26:59 +02:00
Konrad Langenberg
1583a20f18 Added method to prevent making an issue dependent on itself
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-29 17:16:54 +02:00
Konrad Langenberg
ab4d5b2126 Added delete Dependency function
+ Improved Event Comments

Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-29 17:10:40 +02:00