Commit Graph

200 Commits

Author SHA1 Message Date
Konrad Langenberg
30fe97a55e 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/v46.go
#	models/repo.go
#	public/js/index.js
2017-10-30 21:17:36 +01:00
Ethan Koenig
513375c429 Make URL scheme unambiguous (#2408)
* Make URL scheme unambiguous

Redirect old routes to new routes

* Fix redirects to new URL scheme, and update template

* Fix branches/_new endpoints, and update integration test
2017-10-30 10:04:25 +08: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
Lunny Xiao
219ca5cadb
some fixes 2017-10-25 13:26:14 +08:00
Lauris BH
c1b0c9e7c4 Fix PR, milestone and label functionality if issue unit is disabled (#2710)
* Fix PR, milestone and label functionality if issue unit is disabled or not assigned to user

* Fix multi-actions in PR page

* Change error message

* Fix comment update and delete functionality in PR
2017-10-16 10:55:43 +03: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
8b4a48c4bc 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/v42.go
2017-09-24 13:20:34 +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
Jonas Franz
b4b0280e33 Ctrl + Enter to submit forms (#2540)
* Hotfix for "Add time manually" (https://github.com/go-gitea/gitea/pull/2211#issuecomment-328780125)

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

* Submit forms if Ctrl+Enter is pressed inside a textarea

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

* Adding separate class for Ctrl+Enter-Submit
Checking if alt key is pressed too

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

* Changing .ctrlenter to .js-quick-submit

Signed-off-by: Jonas Franz <info@jonasfranz.software>
2017-09-22 14:17:31 +08: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
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
50bc8435d1 Moved languagestrings to ini
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-09 14:38:51 +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
Lunny Xiao
95c408ffa5 hide branch on pull request view or create UI (#2454) 2017-09-06 15:02:51 +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
ad0fcd4dc5 Beautify @JonasFranzDEV
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-09-04 23:32:34 +02: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
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
0a1e57a995 Added UI to delete a dependency
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-27 21:30:28 +02:00
Konrad Langenberg
3c1afe4e75 UI improvements
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-27 20:45:08 +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
Konrad Langenberg
0a4925fb17 Added create new issue method
Signed-off-by: Konrad <konrad@kola-entertainments.de>
2017-08-26 22:37:52 +02:00
Konrad Langenberg
9298795186 Init:
* Added models
* Added UI
* Added Routes

Signed-off-by: kolaente <k@knt.li>
2017-08-26 18:58:35 +02:00
Zsombor
da230a2872 Add possibility to record branch or tag information in an issue (#780) 2017-08-24 15:30:27 +03:00
Ethan Koenig
8fcda0442e Fix search by issue type (#1914)
* Fix search by issue type
2017-06-15 05:09:03 +02:00
Lunny Xiao
e31c02d4bf fix bug on issue view when not login (#1624)
* fix bug on issue view when not login

* hide issue watch when not login

* update the tests

* fix test on issue
2017-04-29 13:52:25 +08:00
Andrey Nering
4b284f814c UI and translation improvements 2017-03-30 19:10:30 -03:00
Andrey Nering
e4a33ed4d0 Add octicons to watch/unwatch buttons 2017-03-29 21:08:46 -03:00
Andrey Nering
b674460748 Add watch button on issue 2017-03-29 20:31:47 -03:00