Commit Graph

106 Commits

Author SHA1 Message Date
kolaente
c0cd0c3710
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	options/locale/locale_en-US.ini
2018-04-29 11:25:56 +02:00
kolaente
fd8d6405c8 Fix only updated_unix when adding a comment (#3855) 2018-04-29 12:48:14 +08:00
kolaente
6af8ef7cef
Simplified comment creation of issue dependencies 2018-04-20 22:56:53 +02:00
kolaente
b00e209e3e
semantics 2018-04-17 18:50:22 +02:00
kolaente
7528664a97
More consitency when defining returned variables 2018-04-14 13:54:04 +02:00
kolaente
4d15f28e04
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v56.go
2018-01-08 19:08:13 +01:00
Lunny Xiao
835b890329 fix bug when a user delete but assigned on issue (#3318) 2018-01-07 11:13:10 +02:00
kolaente
661bd7c1c4
gofmt 2018-01-01 14:40:14 +01:00
kolaente
9eedb3fcf8
Fixed check for issue is nil before getting issue details 2018-01-01 14:32:03 +01:00
kolaente
172b1f054a
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/migrations/v51.go
2017-12-19 19:07:30 +01:00
Lunny Xiao
f2e20c81b6 Refactor struct's time to remove unnecessary memory usage (#3142)
* refactor struct's time to remove unnecessary memory usage

* use AsTimePtr simple code

* fix tests

* fix time compare

* fix template on gpg

* use AddDuration instead of Add
2017-12-11 06:37:04 +02:00
kolaente
fae44666ec
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v50.go
2017-12-04 10:48:37 +01:00
Lauris BH
5dc37b187c
Add reactions to issues/PR and comments (#2856) 2017-12-04 01:14:26 +02:00
Konrad
9e9d8b9b71
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-06 21:25:46 +01:00
Lauris BH
240609432b Issue content should not be updated when closing with comment (#2833) 2017-11-03 17:23:17 +08:00
Morlinest
95637e046f Fix order of comments (#2835) 2017-11-03 11:11:42 +08:00
Konrad
2dca487e0b
gofmt 2017-11-01 11:45:13 +01:00
Konrad
5a9f2735f9
Removed unrelated changes 2017-11-01 11:17:53 +01:00
Konrad
81dfd9e15e Merge branch 'master' of https://github.com/go-gitea/gitea 2017-10-10 22:57:04 +02:00
Ethan Koenig
aa962deec0 Replace deprecated Id method with ID (#2655) 2017-10-05 07:43:04 +03:00
Konrad Langenberg
752406c40c Reimplemented usage of Comment Depenendent Issue (in struct) in comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-04 23:37:39 +02:00
Konrad Langenberg
d7a2ffcc69 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/v44.go
2017-10-04 23:15:30 +02:00
Konrad Langenberg
de45d094fa Removed unused DependentIssue in Comment struct
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-04 23:10:10 +02:00
Lunny Xiao
a8717e5e3a Use AfterLoad instead of AfterSet on Structs (#2628)
* use AfterLoad instead of AfterSet on Structs

* fix the comments on AfterLoad

* fix the comments on action AfterLoad
2017-10-01 19:52:35 +03:00
Konrad Langenberg
4dd4fad251 Removed unessesary comment
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-01 18:00:31 +02:00
Konrad Langenberg
b8d0fc2683 Fixed a bug with comments not showing correctly
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-27 17:49:56 +02:00
Konrad Langenberg
8debb0a272 fixed typo
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-23 15:24:43 +02:00
Konrad Langenberg
d9aea3d646 fixed typo
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-23 15:24:03 +02:00
Jonas Franz
39cf3f7c6b Improving documentation to fix lint.
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-09-17 21:35:20 +02:00
Jonas Franz
fe6c1a9ae2 Fixing build process by syncing govendor dependencies and gofmt.
Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-09-17 21:26:37 +02:00
Jonas Franz
6898e46bcb Merge branch 'master' into resolved-conflicts 2017-09-17 21:18:47 +02:00
Konrad Langenberg
c0d03825d1 Fixed showing correct index in issue comment
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:13:59 +02:00
Konrad Langenberg
743d0cfd49 Beautify @JonasFranzDEV
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:13:59 +02:00
Konrad Langenberg
916d7f01e0 Improved Comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:13:54 +02:00
Konrad Langenberg
ab17606372 Added delete Dependency function
+ Improved Event Comments

Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:13:54 +02:00
Konrad Langenberg
b89a9e9d2e Added basic functionality:
* Add new dependecy
* Show dependencies

Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:13:51 +02:00
Konrad Langenberg
14b5d369c9 Implemented repo settings check on autoclose
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:04:03 +02:00
Konrad Langenberg
4e295d60cd Fixed showing correct index in issue comment
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:03:48 +02:00
Konrad Langenberg
49309a33d2 Fixed issue comment title bug
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:03:30 +02:00
Konrad Langenberg
538c3f04f3 Beautify @JonasFranzDEV
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:03:30 +02:00
Konrad Langenberg
2c95447bdf Started implementation of comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:03:08 +02:00
Konrad Langenberg
475c539fee Improved Comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:00:54 +02:00
Konrad Langenberg
6859c47397 Added delete Dependency function
+ Improved Event Comments

Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:00:05 +02:00
Konrad Langenberg
b6ecf50342 Added basic functionality:
* Add new dependecy
* Show dependencies

Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 20:58:16 +02:00
Konrad Langenberg
74a0df7a3b Merged with upstream/master, resolved conflicts
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 20:38:30 +02:00
Ethan Koenig
b0f7457d9e Improve issue search (#2387)
* Improve issue indexer

* Fix new issue sqlite bug

* Different test indexer paths for each db

* Add integration indexer paths to make clean
2017-09-16 23:16:21 +03:00
Lunny Xiao
52e11b24bf Restructure markup & markdown to prepare for multiple markup language… (#2411)
* restructure markup & markdown to prepare for multiple markup languages support

* adjust some functions between markdown and markup

* fix tests

* improve the comments
2017-09-16 20:17:57 +03: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
kolaente
67f66d6bb5 Resolved Conflicts
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-12 14:19:20 +02: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