Code

code#1

Code

Open

urteju wants to merge 199 commits intoFood-Ordering-and-Delivery-Application-urtejuiamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2:Food-Ordering-and-Delivery-Application-urtejufrom mainiamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2:mainCopy head branch name to clipboard

+28,904-95

Commits

Commits on Jun 30, 2023

• first commit

  Ravi-Byahut

  committed
  26eee07

• Merge branch 'Food-Ordering-and-Delivery-Application-raj-ad1tya' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2 into Food-Ordering-and-Delivery-Application-Ravi-Byahut

  Ravi-Byahut

  committed
  3f09343

• api 1, 4 & 5 done

  raj-ad1tya

  committed
  ac9bb1a

• adding classpath

  raj-ad1tya

  committed
  23412c7

• reverting

  raj-ad1tya

  committed
  1770f5c

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  raj-ad1tya

  committed
  7a45f56

• Merge branch 'Food-Ordering-and-Delivery-Application-raj-ad1tya'

  raj-ad1tya

  committed
  2dc1694

• api 16 done

  raj-ad1tya

  committed
  8a4c3b6

• minor issue fixed

  raj-ad1tya

  committed
  b14c1fa

Commits on Jul 1, 2023

• Api 6,7 done

  Ravi-Byahut

  committed
  a45319b

• Api 6,7

  Ravi-Byahut

  committed
  3338104

Commits on Jul 2, 2023

• added endpoints 17 and 18 update menu item and retrieve all menu

  vishal8940

  committed
  509319f

• fixed minor issue

  Ravi-Byahut

  committed
  73cae0e

• Merge remote-tracking branch 'origin/Food-Ordering-and-Delivery-Application-Ravi-Byahut'

  Show description for b6a6bd5
  vishal8940

  committed
  b6a6bd5

• added endpoints 17 and 18 update menu item and retrieve all menu

  vishal8940

  committed
  824c5d9

• first commit

  urteju

  committed
  76101b6

• first

  urteju

  committed
  c0f4614

• Login

  urteju

  committed
  3d5f4b1

• changes

  urteju

  committed
  452738b

• modified login controller

  urteju

  committed
  93c69ad

• modified Login files

  urteju

  committed
  281429d

• modifications in login

  urteju

  committed
  4143877

• modified login

  urteju

  committed
  1dfddc8

• Not neccesary

  Ravi-Byahut

  committed
  edb9aa8

• Added"/"

  Ravi-Byahut

  committed
  b285a7c

• updating from main

  Ravi-Byahut

  committed
  75fa842

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Ravi-Byahut

  committed
  113877b

• fixed api name in menu item

  Ravi-Byahut

  committed
  e1ee910

Commits on Jul 3, 2023

• my commit

  Bharath-6

  committed
  a03bf34

• api 19 completed

  urteju

  committed
  a03fc52

• api 19 completed

  urteju

  committed
  be6306c

• merging code

  Himaja323

  committed
  f023804

• api 10 completed

  Himaja323

  committed
  deff43f

• First commit for frontend

  Ravi-Byahut

  committed
  2479464

• fixed minor issue

  Ravi-Byahut

  committed
  af05039

• Not neccesary

  Ravi-Byahut

  committed
  bd86b5f

• Added"/"

  Ravi-Byahut

  committed
  a645289

• Merge remote-tracking

  Ravi-Byahut

  committed
  380ddbe

• latest file

  Ravi-Byahut

  committed
  cde1d99

• update one

  Ravi-Byahut

  committed
  10621a5

Commits on Jul 5, 2023

• merg to main

  Rangaraji

  committed
  dd6a3f2

• Merge branch 'main'

  Rangaraji

  committed
  d667c51

• api 11,12,13

  Rangaraji

  committed
  ebb8483

• api 8 and 9 done

  Bharath-6

  committed
  1b9ee03

• api 14 is completed

  Krishna170402

  committed
  e0587b5

• api 15 is completed

  urteju

  committed
  018dfc0

• modified restaurant repository

  urteju

  committed
  8adf58b

Commits on Jul 6, 2023

• latest

  Ravi-Byahut

  committed
  c2a82a8

• test-case_success

  Ravi-Byahut

  committed
  523baac

Commits on Jul 7, 2023

• Merge branch 'Food-Ordering-and-Delivery-Application-raj-ad1tya'

  raj-ad1tya

  committed
  87dfcee

Commits on Jul 8, 2023

• login and logout modified to response entity

  urteju

  committed
  7e7945e

• updated restaurant by id

  Bharath-6

  committed
  dfb42eb

• updated user profile get and put mapping

  urteju

  committed
  164fa36

• updated customer controller to response entity

  urteju

  committed
  d0ff819

• updated customer service for getting user details

  Ravi-Byahut

  committed
  e3815de

• imported annotation

  Ravi-Byahut

  committed
  a63ad61

• changes done

  Krishna170402

  committed
  ad2d827

• updated order status response

  Himaja323

  committed
  98c925b

Commits on Jul 9, 2023

• modified login controller

  urteju

  committed
  475ab3f

• updated order status response

  Himaja323

  committed
  ce0f0c7

• updated order status response

  Himaja323

  committed
  563eb9c

• committed

  Krishna170402

  committed
  73e1f83

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Krishna170402

  committed
  e093baf

• restaurant controller updated

  Bharath-6

  committed
  e3a6b84

• committed

  Krishna170402

  committed
  157700e

• Merge branch 'main' of

  Krishna170402

  committed
  9565d49

• commited

  Krishna170402

  committed
  a99e972

• committed

  Krishna170402

  committed
  8be2127

• updated the restaurant controller

  Bharath-6

  committed
  7970fb6

• restaurant controller updated

  Bharath-6

  committed
  78b6445

• restaurant updated

  Bharath-6

  committed
  c344503

• made changes

  Bharath-6

  committed
  a576f04

Commits on Jul 10, 2023

• header, userlogin, dashboard was updated

  urteju

  committed
  ec75852

Commits on Jul 11, 2023

• Merge branch 'Project-Workspace-urteju'

  Ravi-Byahut

  committed
  74720a2

• about,contactus -updated,header-modified

  urteju

  committed
  98fdfa8

• some changes in frontend

  Ravi-Byahut

  committed
  eeec6da

• Merge branch 'Project-Workspace-urteju' of

  Ravi-Byahut

  committed
  5fc2ebb

• modified colours in header,userlogin

  urteju

  committed
  55ea2d4

• userlogin integration completed

  urteju

  committed
  58ca363

• usersignup code uploaded, login-css modified

  urteju

  committed
  5ec88d6

Commits on Jul 12, 2023

• intregation code uploaded for usersignup

  urteju

  committed
  79299ef

• updated login controller

  urteju

  committed
  4a379cf

• imported map and hash in login controller

  urteju

  committed
  c7aa467

• theme selection done

  Ravi-Byahut

  committed
  82b206d

• Merge branch 'Project-Workspace-urteju

  Ravi-Byahut

  committed
  11be64b

• commit

  Krishna170402

  committed
  f288ea2

Commits on Jul 13, 2023

• contact-integarted restaurant login,signup updated

  urteju

  committed
  ce49593

Commits on Jul 14, 2023

• adminpanel,login,signup frontend&integration done

  urteju

  committed
  a30a787

• admin panel,login,signup with integration done

  urteju

  committed
  07b30fd

• some changes

  Ravi-Byahut

  committed
  f696a93

• Merge branch 'Project-Workspace-urteju'

  Ravi-Byahut

  committed
  f8b2bf4

• Committed and pushed

  Krishna170402

  committed
  42695fe

• Merge branch 'Project-Workspace-urteju' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2 into Project-Workspace-urteju

  Krishna170402

  committed
  674db73

Commits on Jul 15, 2023

• theme got selected

  Ravi-Byahut

  committed
  8fa0a7a

• deleted unwanted files

  urteju

  committed
  bb1a934

• Merge branch 'Project-Workspace-Ravi-Byahut'

  urteju

  committed
  1b323b8

• theme was updated and input boxes was modifies

  urteju

  committed
  cedf975

• adminpanel modified

  urteju

  committed
  facc582

• minor update

  Ravi-Byahut

  committed
  998777b

• Merge branch 'Project-Workspace-urteju' of

  Ravi-Byahut

  committed
  4e16c1d

Commits on Jul 18, 2023

• Updating path for api 4

  raj-ad1tya

  committed
  dc88604

• Merge remote-tracking branch 'origin/Project-Workspace-Ravi-Byahut'

  raj-ad1tya

  committed
  be9538b

• added menu component

  raj-ad1tya

  committed
  022aa87

• minor change to css

  raj-ad1tya

  committed
  869e56e

Commits on Jul 19, 2023

• Added refined code

  vishal8940

  committed
  cff83f4

• Merge remote-tracking branch 'origin/main'

  Show description for e24d0ee
  vishal8940

  committed
  e24d0ee

• Completed payment

  vishal8940

  committed
  f0bf953

Commits on Jul 20, 2023

• menu component and service changes

  raj-ad1tya

  committed
  507372d

• added address entity

  raj-ad1tya

  committed
  ff51037

Commits on Jul 21, 2023

• header modified

  urteju

  committed
  88836f2

• imported order component

  Ravi-Byahut

  committed
  90ab856

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Ravi-Byahut

  committed
  9579076

Commits on Jul 22, 2023

• updated auth gaurd and service,css

  urteju

  committed
  233deb6

• uupdated usersignup html and ts

  urteju

  committed
  810dfdb

• user ts file modified

  urteju

  committed
  af30702

• header and routing modified

  urteju

  committed
  551a127

• imported javax.persistence.*;

  Ravi-Byahut

  committed
  c04c99b

• updated cart and menu

  Ravi-Byahut

  committed
  16665fd

Commits on Jul 23, 2023

• updated header and restaurant

  urteju

  committed
  0a9a57c

• Adding css

  Rangaraji

  committed
  42cde8b

• restaurant.java modified

  urteju

  committed
  5facbc1

• global colors modified

  urteju

  committed
  64849e2

Commits on Jul 24, 2023

• home updated

  Bharath-6

  committed
  f309ed7

• updating list

  Rangaraji

  committed
  f092c00

• updated

  Bharath-6

  committed
  68e585b

• final cart updated

  Ravi-Byahut

  committed
  6592fd5

• global style added

  raj-ad1tya

  committed
  e5a0a05

• springapp files updated&foodapp updated totally

  urteju

  committed
  035da00

• fetch menu from json if api unavailable

  raj-ad1tya

  committed
  5a124d5

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  raj-ad1tya

  committed
  099a93d

• added header to menu page

  raj-ad1tya

  committed
  c370ca6

• login, customer backend updated

  urteju

  committed
  0942098

• header updated

  urteju

  committed
  514c213

• checkout component added

  vishal8940

  committed
  f0bfd78

• Merge branch 'main' into Food-Ordering-and-Delivery-Application-vishal8940

  vishal8940

  committed
  409e2ff

• backend and header ,global styles updated

  urteju

  committed
  69b3b41

• header updated for checkout

  urteju

  committed
  6b19261

• food service updte

  Bharath-6

  committed
  4811ee3

• Updated Delivery

  Himaja323

  committed
  1ee7cef

• updated order tracking

  Himaja323

  committed
  d75a8aa

Commits on Jul 25, 2023

• added discounted price in checkout component

  Ravi-Byahut

  committed
  aaef6a3

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Ravi-Byahut

  committed
  224c655

• colours,logo udated

  urteju

  committed
  2226cc6

• css

  Rangaraji

  committed
  a037ef9

• now searching for food is working

  Bharath-6

  committed
  43b8625

• updated the search component

  Bharath-6

  committed
  0f2b71b

• updated order-tracking

  Himaja323

  committed
  6e4ba33

• restaurant details page

  Rangaraji

  committed
  8a2b61b

• ordertracking updated

  Himaja323

  committed
  1988081

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Himaja323

  committed
  710e693

• modified payment

  vishal8940

  committed
  57d58d4

• committed

  Krishna170402

  committed
  9c7dba9

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Krishna170402

  committed
  29a7120

• commit

  Krishna170402

  committed
  8da15c1

• commit

  Himaja323

  committed
  4ae1567

• commit

  Krishna170402

  committed
  06562a8

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Krishna170402

  committed
  68beb65

• deleted order tracking and update details

  Himaja323

  committed
  9dff45b

• deledted krishna backend code,now test case succes

  Himaja323

  committed
  d5cf205

• menu component updated

  raj-ad1tya

  committed
  432a4c5

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  raj-ad1tya

  committed
  4e1d7c9

• corrected header and routing for menu component

  raj-ad1tya

  committed
  3b6d5c7

Commits on Jul 26, 2023

• adminsignup css updated

  urteju

  committed
  5e2f2f1

• restaurant additional data

  Rangaraji

  committed
  6f1295f

• updated ordertracking

  Himaja323

  committed
  15089f4

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Himaja323

  committed
  19ce28a

• updated header to ordertracking

  Himaja323

  committed
  7325205

• restaurant dashboard,signup,home images

  urteju

  committed
  874caa3

• update restaurantdetails

  Rangaraji

  committed
  46704e4

• restaurant list updated

  Bharath-6

  committed
  08a481a

Commits on Jul 27, 2023

• image

  Rangaraji

  committed
  b9e80d5

• image update

  Rangaraji

  committed
  07de0d7

• restaurant backend updated and home and resta da

  Bharath-6

  committed
  26052bf

• commit

  Ravi-Byahut

  committed
  a1e2503

• order Status

  Ravi-Byahut

  committed
  9bc2503

• Implementing BCrypt password encoding

  raj-ad1tya

  committed
  ee1cc9e

• corrected global styles.css

  raj-ad1tya

  committed
  508dd23

• header updated

  urteju

  committed
  a0e8690

• added selected restaurant in service file

  raj-ad1tya

  committed
  0e43fdb

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  raj-ad1tya

  committed
  1a93d60

• restaurants data updated

  urteju

  committed
  14497ad

• css link

  Rangaraji

  committed
  ab3b356

• updated adminsignup,index,style,routing,menu,order

  urteju

  committed
  5b25e75

• description added for menu items

  raj-ad1tya

  committed
  280393d

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  raj-ad1tya

  committed
  041689c

• updated res 1,4,8 pic

  Bharath-6

  committed
  2b2b56c

• restaurant image 1 updated

  Bharath-6

  committed
  25e98f0

• restaurant image

  Rangaraji

  committed
  10bc206

• updated signup

  urteju

  committed
  b4f8301

Commits on Jul 28, 2023

• css updated in home

  Bharath-6

  committed
  77db411

• menu images uploaded

  Bharath-6

  committed
  96f8748

• Corrected

  Show description for a692201
  raj-ad1tya

  committed
  a692201

• offers added to menu page

  raj-ad1tya

  committed
  68cf2b4

• updated menu component

  raj-ad1tya

  committed
  acfc998

Commits on Jul 30, 2023

• Final commit

  Krishna170402

  committed
  052b8d4

• updated header

  Himaja323

  committed
  d988ebf

• Merge branch 'main' of https://github.com/iamneo-production/f06afc04-fde3-46d9-926c-b91a568f8aa2

  Krishna170402

  committed
  b4bc5ad

• updated theme

  Himaja323

  committed
  8c661e7

Commits on Apr 11, 2024

• Update README.md

  Bharath-6

  authored
  39534da