Commit Graph

121 Commits

Author SHA1 Message Date
kolaente
f01fdf60c3
fmt 2018-06-20 12:22:07 +02:00
kolaente
10308a02c1
removed unused DependentIssue element 2018-06-17 16:36:40 +02:00
kolaente
12602c21b0
Merge branch 'master' into master 2018-06-13 10:26:30 +02:00
Lunny Xiao
da898d4066 fix delete comment bug (#4216) 2018-06-11 18:54:30 -04:00
kolaente
05aaee267c
Removed unnecessary setting dependent issue in comment creation 2018-06-08 12:53:17 +02:00
kolaente
8c1f627c75
Merged with gitea-master 2018-06-06 14:23:30 +02: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
kolaente
236ad85b95
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/issue_comment.go
2018-05-18 23:16:50 +02:00
kolaente
6733682a7a
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/issue_comment.go
2018-05-18 23:16:41 +02: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
kolaente
83b883104a
fmt 2018-05-09 20:18:16 +02:00
kolaente
288cd40402
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/issue_comment.go
#	models/migrations/migrations.go
#	models/migrations/v64.go
2018-05-09 18:34:09 +02:00
kolaente
95f2e2b57b Multiple assignees (#3705) 2018-05-09 19:29:04 +03:00
kolaente
16533e9e2e
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/issue.go
#	models/issue_comment.go
#	options/locale/locale_en-US.ini
#	public/js/index.js
#	templates/repo/issue/view_content/comments.tmpl
#	templates/repo/issue/view_content/sidebar.tmpl
2018-05-01 21:51:05 +02: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
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