Browse code Merge branch 'master' into ShopRest # Conflicts: # src/main/java/org/ntlab/nemophila/resources/shops/ShopsRest.java 2023/12/21 Fix FriendManager ShopManagerTest ShopPostRest ShopRest accountspostrest addDate fixParameter frinedsRest id master postcount shopsRest shopsRestFix
commit e14286c44e10e1ca2d6f37b3ee7f9419cfd828d2 2 parents 11ca846 + c02d5fd yugo-asano authored on 11 May 2023

Showing 15 changed files

• src/main/java/org/ntlab/nemophila/models/accounts/Account.java
• src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java
• src/main/java/org/ntlab/nemophila/models/accounts/FriendManager.java
• src/main/java/org/ntlab/nemophila/models/accounts/Post.java
• src/main/java/org/ntlab/nemophila/models/shops/Shop.java
• src/main/java/org/ntlab/nemophila/models/shops/ShopManager.java
• src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostRest.java
• src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java
• src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java
• src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java
• src/main/java/org/ntlab/nemophila/resources/accounts/FriendsRest.java
• src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java
• src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java
• src/main/java/org/ntlab/nemophila/resources/shops/ShopsRest.java
• src/test/java/org/ntlab/nemophila/NemophilaApplicationTests.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/accounts/Account.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/accounts/FriendManager.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/accounts/Post.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/shops/Shop.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/models/shops/ShopManager.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostRest.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/FriendsRest.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java 0 → 100644

Ignore Space Show notes View src/main/java/org/ntlab/nemophila/resources/shops/ShopsRest.java

Ignore Space Show notes View src/test/java/org/ntlab/nemophila/NemophilaApplicationTests.java

Show line notes below