Commit Graph

86 Commits

Author SHA1 Message Date
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
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
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
Konrad Langenberg
ad0fcd4dc5 Beautify @JonasFranzDEV
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-04 23:32:34 +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
5de94a67cf some refactors for issue and comments (#2419) 2017-08-30 07:31:33 +03:00
Konrad Langenberg
707551785f Improved Comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-29 18:26:59 +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
Konrad Langenberg
cf7e99fc4c Added basic functionality:
* Add new dependecy
* Show dependencies

Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-27 20:23:16 +02:00
Ethan Koenig
a27863b6d1 Fix issue updated_unix bug (#2204) 2017-07-27 09:20:38 +08:00
Ethan Koenig
a52cd59727 Fix unchecked error bug (#2110) 2017-07-04 09:30:41 +08:00
Jonas Franz
441986a473 Fix "Dashboard shows deleted comments" (#1995) 2017-06-25 20:20:29 +02:00
Lunny Xiao
d71fad2ab7 Fix #2001 and fix issue comments hidden (#2016)
* revert #2001 and fix issue comments hidden

* fix #2001

* fix import

* improve comment type

* reduce unnecessary join

* fix comment on FindCommentsOptions
2017-06-21 09:00:44 +08:00
Lauris BH
6db387a21e Refactor session close as xorm already does everything needed internally (#2020) 2017-06-21 08:57:05 +08:00
Ethan Koenig
255adc40ae Don't show non-comments in comments API (#2001) 2017-06-18 17:06:17 +08:00
Ethan Koenig
8fc64741d9 Fix deleted milestone bug (#1942)
* Fix deleted milestone bug

* Use locale for ghost milestone name

* Fix pointer bug
2017-06-17 12:51:28 +08:00
Ethan Koenig
0c332f0480 Fix activity feed (#1779)
* Fix activity feed

Preserve actions after user/repo name change

* Add missing comment

* Fix migration, and remove fields completely

* Tests
2017-05-26 09:38:18 +08:00
Jonas Franz
03912ce014 Adding #issuecomment to the URL in E-Mail notifications (#1674)
* Added comment's hashtag to url for mail notifications.

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

* Added comment's hashtag to url for mail notifications.
Added explanation to return statement.

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

* Added comment's hashtag to url for mail notifications.
Added explanation to return statement + documentation.

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

* Added comment's hashtag to url for mail notifications.

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

* Replacing in-line link generation with HTMLURL. (+gofmt)

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

* Replaced action-based model with nil-based model. (+gofmt)

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

* Replaced mailIssueActionToParticipants with mailIssueCommentToParticipants.

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

* Updating comment for mailIssueCommentToParticipants

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-05-25 10:38:56 +08:00
Lunny Xiao
8a0be5e9f0 Bug fixed for deleted label in issue comment (#904)
* bug fixed for deleted label in issue comment

* fix indent
2017-02-11 20:56:57 +08:00
Lunny Xiao
cf0f451c37 Add delete branch track on pull request comments (#888)
* add delete branch track on pull request comments

* don't change vendor
2017-02-11 12:00:29 +08:00