Skip to content

Commit

Permalink
Merge branch 'develop' into feature/them_bones
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderWatzinger committed Feb 14, 2025
2 parents 540d3cb + 7b53a2c commit f261a59
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 30 deletions.
Binary file modified openatlas/static/manual/.doctrees/environment.pickle
Binary file not shown.
Binary file modified openatlas/static/manual/.doctrees/examples/report_issue.doctree
Binary file not shown.
28 changes: 11 additions & 17 deletions openatlas/static/manual/examples/report_issue.html
Original file line number Diff line number Diff line change
Expand Up @@ -164,42 +164,36 @@ <h3>Fill out the form<a class="headerlink" href="#fill-out-the-form" title="Perm
screenshot of the issue (can be added at the end of the form via the Browse
button) can facilitate our work. Other optional form fields:</p>
<ul class="simple">
<li><p>Project - provides a list of projects. You can pick from the drop down
<li><p><strong>Project</strong> - provides a list of projects. You can pick from the drop down
list in which project the issue happened</p></li>
<li><p>Tracker - there are four different types of issues you can report:</p>
<li><p><strong>Tracker</strong> - there are four different types of issues you can report:</p>
<ul>
<li><p>Bug: Report an error</p></li>
<li><p>Features: Request a new feature such as a new function</p></li>
<li><p>Question: Use to ask a question</p></li>
<li><dl class="simple">
<dt>Administration: Use for administrative tasks such as server upgrades or</dt><dd><p>planning an event</p>
</dd>
</dl>
</li>
<li><p>Administration: Use for administrative tasks such as server upgrades or
planning an event</p></li>
</ul>
</li>
<li><p>Status - please leave status on new if it is not yours to work on</p>
<li><p><strong>Status</strong> - please leave status on new if it is not yours to work on</p>
<ul>
<li><p>New: A new issue</p></li>
<li><p>Acknowledged: The issue has been recognized and accepted</p></li>
<li><p>Assigned: Someone was assigned to work on it</p></li>
<li><p>In progress: Someone is actively working on the issue</p></li>
<li><dl class="simple">
<dt>Resolved: The issue has been dealt with but is not fully resolved yet -</dt><dd><p>some more testing, etc. might be needed</p>
</dd>
</dl>
</li>
<li><p>Resolved: The issue has been dealt with but is not fully resolved yet -
some more testing, etc. might be needed</p></li>
<li><p>Closed: The issue has been resolved</p></li>
<li><p>Rejected: The issue was rejected and an explanation was given</p></li>
<li><p>Duplicate: The issue was already reported</p></li>
</ul>
</li>
<li><p>Priority - not in use within the OpenAtlas Redmine. The priority of issues
<li><p><strong>Priority</strong> - not in use within the OpenAtlas Redmine. The priority of issues
is determined through their placement in the roadmap</p></li>
<li><p>Assignee - please only choose yourself as assignee or leave it blank</p></li>
<li><p>Target version - please leave blank. It is only needed for internal
<li><p><strong>Assignee</strong> - please only choose yourself as assignee or leave it blank</p></li>
<li><p><strong>Target version</strong> - please leave blank. It is only needed for internal
project planning</p></li>
<li><p>Found in version: Only available for bugs, you can fill in the version
<li><p><strong>Found in version</strong> - Only available for bugs, you can fill in the version
number of your instance (can be found in the upper right corner of your
OpenAtlas instance page)</p></li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion openatlas/static/manual/searchindex.js

Large diffs are not rendered by default.

21 changes: 9 additions & 12 deletions sphinx/source/examples/report_issue.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ occurred). This will bring you to the overview page. On the top left you can
find a **+ Button**. Hover over it with the mouse and select
**New issue** which brings you to an empty form.


Fill out the form
*****************
**Don't be alarmed**, reporting bugs in Redmine is easy and uncomplicated even
Expand All @@ -80,34 +79,34 @@ All other fields are optional for you to fill out. But keep in mind that a
screenshot of the issue (can be added at the end of the form via the Browse
button) can facilitate our work. Other optional form fields:

* Project - provides a list of projects. You can pick from the drop down
* **Project** - provides a list of projects. You can pick from the drop down
list in which project the issue happened
* Tracker - there are four different types of issues you can report:
* **Tracker** - there are four different types of issues you can report:

* Bug: Report an error
* Features: Request a new feature such as a new function
* Question: Use to ask a question
* Administration: Use for administrative tasks such as server upgrades or
planning an event
planning an event

* Status - please leave status on new if it is not yours to work on
* **Status** - please leave status on new if it is not yours to work on

* New: A new issue
* Acknowledged: The issue has been recognized and accepted
* Assigned: Someone was assigned to work on it
* In progress: Someone is actively working on the issue
* Resolved: The issue has been dealt with but is not fully resolved yet -
some more testing, etc. might be needed
some more testing, etc. might be needed
* Closed: The issue has been resolved
* Rejected: The issue was rejected and an explanation was given
* Duplicate: The issue was already reported

* Priority - not in use within the OpenAtlas Redmine. The priority of issues
* **Priority** - not in use within the OpenAtlas Redmine. The priority of issues
is determined through their placement in the roadmap
* Assignee - please only choose yourself as assignee or leave it blank
* Target version - please leave blank. It is only needed for internal
* **Assignee** - please only choose yourself as assignee or leave it blank
* **Target version** - please leave blank. It is only needed for internal
project planning
* Found in version: Only available for bugs, you can fill in the version
* **Found in version** - Only available for bugs, you can fill in the version
number of your instance (can be found in the upper right corner of your
OpenAtlas instance page)

Expand All @@ -118,5 +117,3 @@ Planned future releases with corresponding issues can be viewed on the
`OpenAtlas roadmap <https://redmine.openatlas.eu/projects/uni/roadmap>`_.
Please note that the development of OpenAtlas is a fluid process and
planned releases of new features might change.


0 comments on commit f261a59

Please sign in to comment.