Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch v1.4 #311

Merged
merged 6 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/UserGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Welcome back to ProjectPRO. Simply head over to our Features section to gain ins
- Simply go to your terminal and type `java -version`. ![here](images/UG/QuickStart1.png)

2. Download the latest ProjectPRO.jar from [here](https://github.com/AY2324S1-CS2103T-T10-3/tp/releases).
- ![here](images/UG/QUICKSTART2.png)
- ![here](images/UG/QUICKSTART_2.1.png)

3. Move the JAR file to a folder where you want to store your project details. For example, create a folder named ProjectPRO and place it on your desktop.
- For Mac Users:
Expand Down Expand Up @@ -630,7 +630,7 @@ It is <strong>not case-sensitive</strong>.</p>
</div>
<p style="font-size:13px; color: #000; margin: 8px 0;">
<code style="color: #555; background-color: #FB9A9A; padding: 2px; border-radius: 2px;">FREE_TIME</code>
must not clash with the other inputted/existing time slots of the contact. E.g. If time slot <code style="color: #555; background-color: #FB9A9A; padding: 2px; border-radius: 2px;">Mon 1200 - Mon 1300</code> has been added, then<code style="color: #555; background-color: #FB9A9A; padding: 2px; border-radius: 2px;">Mon 1300 - Mon 1400</code> can not be added.
must not clash with the other inputted/existing time slots of the contact. E.g. If time slot <code style="color: #555; background-color: #FB9A9A; padding: 2px; border-radius: 2px;">Mon 1200 - Mon 1300</code> has been added, then <code style="color: #555; background-color: #FB9A9A; padding: 2px; border-radius: 2px;">Mon 1300 - Mon 1400</code> can not be added.
</div>

**Example(s):**
Expand Down Expand Up @@ -914,7 +914,7 @@ You can view the link to our User Guide.
![](images/features/Generalcommand_help.png)

<div align="center">
<p style="font-size: 13px; font-style: italic;">You are now able to click on the User Guide link for further guidance.</p>
<p style="font-size: 13px; font-style: italic;">You are now able to copy the URL of the User Guide.</p>
</div>


Expand Down
12 changes: 6 additions & 6 deletions docs/_markbind/layouts/default.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
* [Quick Start]({{ baseUrl }}/UserGuide.html#quick-start)
* [Features]({{ baseUrl }}/UserGuide.html#features)
* [Developer Guide]({{ baseUrl }}/DeveloperGuide.html) :expanded:
* [Acknowledgements]({{ baseUrl }}/DeveloperGuide.html#1.3. Acknowledgement)
* [Setting Up]({{ baseUrl }}/DeveloperGuide.html#1.2. Setting up, getting started)
* [Design]({{ baseUrl }}/DeveloperGuide.html#2. Design)
* [Acknowledgements]({{ baseUrl }}/DeveloperGuide.html#1.3.-Acknowledgement)
* [Setting Up]({{ baseUrl }}/DeveloperGuide.html#1.2.-Setting up, getting started)
* [Design]({{ baseUrl }}/DeveloperGuide.html#2.-Design)
* [Implementation]({{ baseUrl }}/DeveloperGuide.html#Implementation)
* [Documentation, logging, testing, configuration, dev-ops]({{ baseUrl }}/DeveloperGuide.html#5. Documentation, logging, testing, configuration, dev-ops)
* [Appendix: Requirements]({{ baseUrl }}/DeveloperGuide.html#6. Appendix: Requirements)
* [Appendix: Instructions for manual testing]({{ baseUrl }}/DeveloperGuide.html#7. Appendix: Instructions for manual testing)
* [Documentation, logging, testing, configuration, dev-ops]({{ baseUrl }}/DeveloperGuide.html#5.-Documentation, logging, testing, configuration, dev-ops)
* [Appendix: Requirements]({{ baseUrl }}/DeveloperGuide.html#6.-Appendix: Requirements)
* [Appendix: Instructions for manual testing]({{ baseUrl }}/DeveloperGuide.html#7.-Appendix: Instructions for manual testing)
* [About Us]({{ baseUrl }}/AboutUs.html)
</site-nav>
</div>
Expand Down
Binary file added docs/images/UG/QUICKSTART_2.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading