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

Tweak GUI CSS #123

Merged
merged 58 commits into from
Apr 2, 2020
Merged

Tweak GUI CSS #123

merged 58 commits into from
Apr 2, 2020

Conversation

AaronCQL
Copy link

@AaronCQL AaronCQL commented Apr 1, 2020

No description provided.

Dban1 and others added 30 commits March 23, 2020 15:22
Updated ParserUtil and Schedule class
Fixed ScheduleCommand and parser
Added and edited some json files
# Conflicts:
#	src/main/java/seedu/address/logic/parser/AddressBookParser.java
- fixed unchecked/unsafe operations
# Conflicts:
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/logic/parser/AddCommandParser.java
#	src/main/java/seedu/address/logic/parser/AddressBookParser.java
#	src/main/java/seedu/address/logic/parser/CliSyntax.java
#	src/main/java/seedu/address/logic/parser/ParserUtil.java
#	src/main/java/seedu/address/model/client/Client.java
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
#	src/main/java/seedu/address/storage/JsonAdaptedClient.java
#	src/test/java/seedu/address/storage/JsonAdaptedClientTest.java
#	src/test/java/seedu/address/testutil/ClientBuilder.java
@AaronCQL AaronCQL merged commit f835cad into master Apr 2, 2020
@ziyingli ziyingli deleted the css-gui branch April 2, 2020 07:02
@AaronCQL AaronCQL self-assigned this Apr 11, 2020
@AaronCQL
Copy link
Author

AaronCQL commented Apr 11, 2020

Merged into #127, and eventually merged into master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants