Skip to content

Dev to Master#36

Merged
pandyagunjan merged 120 commits intomasterfrom
dev
Jan 19, 2021
Merged

Dev to Master#36
pandyagunjan merged 120 commits intomasterfrom
dev

Conversation

@pandyagunjan
Copy link
Owner

No description provided.

pandyagunjan and others added 30 commits December 16, 2020 17:14
# Conflicts:
#	src/main/java/runner/controllers/AccountController.java
#	src/main/java/runner/controllers/UserController.java
#	src/main/java/runner/entities/Account.java
#	src/main/java/runner/entities/User.java
#	src/main/java/runner/services/AccountServices.java
#	src/main/java/runner/services/UserServices.java
#	src/main/resources/application.properties
#	target/classes/application.properties
#	target/classes/runner/controllers/AccountController.class
#	target/classes/runner/controllers/UserController.class
#	target/classes/runner/entities/Account.class
#	target/classes/runner/entities/Login.class
#	target/classes/runner/entities/TransactionHistory.class
#	target/classes/runner/entities/User.class
#	target/classes/runner/services/AccountServices.class
#	target/classes/runner/services/UserServices.class
zekai and others added 29 commits January 5, 2021 15:56
# Conflicts:
#	target/classes/runner/services/TransactionServices.class
#	target/test-classes/runner/services/AccountServiceTest.class
Finished AccountServices Tests...for now...
Completed majority of Account Controller testing
…count as existing user, added logout action for accounts
Ability to deposit money from source at creation of new user or an ac…
fixed some CORS stuff, don't apply filter to public accessible pages …
# Conflicts:
#	target/classes/runner/controllers/CustomerController.class
removed some conditional statements for CRUD on customer to update pr…
changed transactions to list for order display on front end
@pandyagunjan pandyagunjan merged commit b64763b into master Jan 19, 2021
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.

3 participants