Commit Graph

71 Commits

Author SHA1 Message Date
kolaente
4d28a82632
Implemented issue search via api when adding new dependencies 2018-03-08 00:17:35 +01:00
kolaente
e4a642681f Added lazy load for issue list 2018-02-27 18:53:32 +01:00
kolaente
9313332fd4 Cleanup + fmt 2018-02-27 18:34:17 +01:00
kolaente
32db1b36f5
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	models/migrations/migrations.go
#	models/migrations/v57.go
2018-02-19 08:33:31 +01:00
Lauris BH
ae30315a62
Fix escaping changed title in comments (#3530)
* Fix escaping changed title in comments

* Fix escaping of wiki page titile

Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>
2018-02-18 22:06:37 +02:00
kolaente
4277014aed
Fixed indention 2018-01-13 12:48:20 +01:00
kolaente
86be828148
Added more specific locale 2018-01-06 23:04:43 +01:00
kolaente
8bc0947cbd
Added more specific locale 2018-01-06 23:02:04 +01:00
kolaente
37dc550bc8
Merge branch 'master' of https://github.com/go-gitea/gitea
# Conflicts:
#	docs/content/doc/advanced/config-cheat-sheet.en-us.md
#	models/migrations/migrations.go
#	models/migrations/v54.go
#	routers/repo/pull.go
2018-01-06 22:41:44 +01: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
kolaente
4855f832d2
Fixed indent 2017-12-29 22:23:41 +01:00
kolaente
97140246f1
Renamed "CanUseDependencies" to "CanCreateDependencies" to be more precise 2017-12-29 14:46:07 +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
kolaente
db4f578e04
Finished implementing setting for dependencies 2017-11-28 00:33:51 +01:00
Konrad
fc35252f68
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-26 18:41:38 +01:00
Ethan Koenig
2cb6c51158 Fix over-escaped characters (#2956) 2017-11-22 15:09:48 +08:00
Lauris BH
a6f337046f Update go-ini dependency and remove semicolon hack in translations (#2913) 2017-11-15 11:34:42 +08:00
Konrad Langenberg
6109fcf49a
Simplified check for open dependencies 2017-11-14 21:41:49 +01:00
Konrad
f38b3b4ce5
Merge branch 'master' of https://github.com/go-gitea/gitea 2017-11-13 18:12:06 +01:00
Lauris BH
134958fd9f
Fix localization texts that contain semicolon (#2900) 2017-11-13 09:56:10 +02:00
Konrad Langenberg
993a3c0b86
Fixed indention 2017-11-01 20:42:24 +01:00
Konrad Langenberg
c0bc5e8321
Fixed indetion 2017-11-01 20:38:55 +01:00
Konrad
f188031b44
Rebased sidebar template to remove unrelated changes 2017-11-01 11:03:59 +01:00
Konrad Langenberg
0bbc695915
Fixed a bug where a border in the issue dependency list was on the wrong place
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-31 08:17:23 +01:00
Konrad Langenberg
14aa1d2052
When adding a dependency, the current issue is not shown in the list anymore.
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-31 08:02:36 +01:00
Konrad Langenberg
2a02c097c5 Added check to only show dependencies if the user is logged in
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-28 18:10:51 +02:00
Konrad Langenberg
c5e35e93ef Fixed indention
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-10 23:10:13 +02: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
62efeba087 Simplified UI
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-04 22:54:40 +02:00
Konrad Langenberg
5e22614248 Optimized Issue Dependency Routes
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-10-03 15:03:57 +02:00
Konrad Langenberg
43caa93454 Moved add dependency input to the sidebar
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-27 17:26:58 +02:00
Konrad Langenberg
107b0cbe6e Implemented searchable issue list for new dependency selection
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-27 14:36:43 +02:00
Konrad Langenberg
29aafb3ef8 Implemented custom type DependencyType
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-24 17:31:47 +02:00
Konrad Langenberg
2c5a743df8 Renamed Comment
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-24 17:15:33 +02:00
Konrad Langenberg
c1ea3f588d Simplified listing all blocking & blocked by issues in one query
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-23 16:08:20 +02:00
Konrad Langenberg
fe4bcc02f3 fixed display issue with comments
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-23 15:01:47 +02:00
Konrad Langenberg
c1ee648998 fixed template issue, resolved conflicts
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:53:28 +02:00
Konrad Langenberg
00aea1ad6f Fixed conflict with timetracking
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:14:02 +02:00
Konrad Langenberg
1710ea49a0 Moved languagestrings to ini
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:14:01 +02:00
Konrad Langenberg
6e5c686457 Fully implemented Repo setting to enable/disable Issue Dependencies
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
f3c40e8aea Added create new issue method
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-17 21:13:47 +02:00
Konrad Langenberg
8bd99fe32e Init:
* Added models
* Added UI
* Added Routes

Signed-off-by: kolaente <k@knt.li>
2017-09-17 21:13:43 +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
Konrad Langenberg
b61b166f46 Fixed conflict with timetracking
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-12 22:20:57 +02:00