Paddy/Betterzon
1
0
Fork 0
mirror of https://github.com/Mueller-Patrick/Betterzon.git synced 2024-11-14 02:23:58 +00:00
Code Issues Projects Releases Wiki Activity
273 Commits 2 Branches 0 Tags 16 MiB
d8638cab4b
Commit Graph

273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jegor
d8638cab4b wip: last changes 2 2021-06-18 09:24:16 +02:00
Jegor
cfda636f07 Merge remote-tracking branch 'origin/develop' into BETTERZON-152 2021-06-18 09:10:52 +02:00
Jegor
61a0125229 wip: last changes 1 2021-06-18 09:10:47 +02:00
Patrick Müller
0bc02ee9ea Fixing currency sign 2021-06-17 23:33:53 +02:00
Patrick Müller
7ac73204df Fixing typo 2021-06-17 23:04:47 +02:00
Patrick
52e38461a4
Merge pull request #96 from Mueller-Patrick/BETTERZON-140 
BETTERZON-140: Frontend improvements
 2021-06-17 22:56:47 +02:00
Patrick
45b5e04442
Merge branch 'develop' into BETTERZON-140 2021-06-17 22:55:30 +02:00
Jegor
a792c43e24 wip: german -> english 2021-06-17 22:52:09 +02:00
Patrick
78e2de6545
Update README.md 2021-06-17 19:06:18 +02:00
Jegor
a6a5b58e25 wip: profile 2021-06-17 17:52:27 +02:00
Jegor
012de346e8 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-17 17:19:07 +02:00
Jegor
f28b301a28 wip: profile 2021-06-17 17:18:36 +02:00
Patrick
45acbfd9a2
BETTERZON-151: Adding option to delete price alarm (#94) 2021-06-17 17:15:06 +02:00
Jegor
fe2c064e30 wip: hot-deals vendors 2021-06-17 10:55:30 +02:00
Jegor
9821c004ec wip: profile component 2021-06-17 10:30:40 +02:00
Jegor
b748b9492a wip: profile component 2021-06-17 09:58:49 +02:00
Jegor
969ac6feaf wip: profile component 2021-06-17 09:55:40 +02:00
Jegor
be534551ba wip: hot deals widget loadig data 2021-06-16 15:25:12 +02:00
Jegor
c88efc5484 WIP: problems with best deals. 2021-06-16 09:59:57 +02:00
Jegor
8eba80f7d4 WIP: proile component created. 2021-06-16 09:59:25 +02:00
Patrick
841502f9d1
BETTERZON-150: Fixing best deals API endpoint logic (#92) 2021-06-16 09:20:40 +02:00
Nico
c90949de47
🚑 Fixed Copyright for you :) (#91) 2021-06-16 00:10:17 +02:00
henningxtro
7f43d27a79
Repaired API Tests (#90) 2021-06-15 23:34:31 +02:00
Patrick
d83fcdf693
BETTERZON-147, BETTERZON-148: Adding feature files (#89) 2021-06-15 15:58:54 +02:00
henningxtro
ce92abdb40
Doku (#88) 
* Added AC-ManageVendorShop.drawio

* Update AC-ManageVendorShop.drawio

* Added AC-ManageVendorShop.png

* Added AC_VendorShop.drawio

* Added Deployment_View.drawio

* Update Deployment_View.drawio

* Added AC_FavoriteShopList.drawio

* Added Deployment_View.png

* Added AC_FavoriteShopList.png

* Added ERM.png

* Adding architectural view

* Updated Use-Case-Diagram

Co-authored-by: Patrick <50352812+Mueller-Patrick@users.noreply.github.com>
Co-authored-by: Patrick Müller <patrick@mueller-patrick.tech>
 2021-06-15 13:05:33 +02:00
Patrick Müller
0cd1213c40 BETTERZON-146: Session handling rewrite HOTFIX 2 2021-06-15 12:09:04 +02:00
Patrick Müller
1fd115c2a2 BETTERZON-146: Session handling rewrite HOTFIX 2021-06-15 11:50:36 +02:00
Jegor
92de923fad Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-15 11:37:16 +02:00
Patrick
0118ac6861
Merge pull request #84 from Mueller-Patrick/BETTERZON-140 
BETTERZON-140: Product Details Part 1
 2021-06-15 11:34:00 +02:00
Jegor
83f6018f7e Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-15 11:33:36 +02:00
Patrick Müller
bf56d2b509 BETTERZON-146: Changing session handling from cookies to localStorage 2021-06-15 11:32:48 +02:00
Patrick Müller
ad091954c1 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-15 10:39:15 +02:00
Jegor
b062e14c9a auth with cookies. 2021-06-15 10:38:54 +02:00
Patrick
f1dcaef351
Merge pull request #83 from Mueller-Patrick/BETTERZON-145 
BETTERZON-145: Adding better error when trying to get session details…
 2021-06-15 10:38:52 +02:00
Patrick Müller
391a4b5e4b BETTERZON-145: Adding better error when trying to get session details without cookie 2021-06-15 10:37:14 +02:00
Jegor
cf300cb1b7 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-15 10:24:51 +02:00
Patrick
c35097a9a2
Merge pull request #82 from Mueller-Patrick/BETTERZON-144 
BETTERZON-144: Adding service method to get session / user info
 2021-06-15 10:24:20 +02:00
Jegor
62795fd3f8 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-15 10:24:02 +02:00
Patrick
4a0ba40da6
Merge branch 'develop' into BETTERZON-144 2021-06-15 10:20:17 +02:00
Patrick Müller
f4d1e93a7f BETTERZON-144: Adding service method to get session / user info 2021-06-15 10:19:48 +02:00
Patrick
3dbcc6707c
Merge pull request #80 from Mueller-Patrick/BETTERZON-143 
BETTERZON-143: Fixing API endpoints that didn't return a json
 2021-06-14 20:56:08 +02:00
Patrick Müller
1bb05a1baf BETTERZON-143: Fixing API endpoints that didn't return a json 2021-06-14 20:54:54 +02:00
Patrick Müller
6eaf7aca82 Adding SQL script 2021-06-14 15:54:57 +02:00
Patrick Müller
9512002081 Revert "Adjusting frontend and backend package names" 
This reverts commit e0033065
 2021-06-14 14:49:24 +02:00
Patrick Müller
e00330656e Adjusting frontend and backend package names 2021-06-14 14:40:41 +02:00
Patrick Müller
daef6ec208 BETTERZON-141: Fixing user updating query 2021-06-13 14:16:09 +02:00
Patrick Müller
f2adb1e375 BETTERZON-141: Fixing service class 
- Because Patrick was stupid
 2021-06-13 13:09:51 +02:00
Jegor
68e9d75e2d wip: register api 2021-06-13 12:49:15 +02:00
Patrick
099f6f1c51
Merge pull request #79 from Mueller-Patrick/BETTERZON-141 
BETTERZON-141: Adding more service methods for prices and products
 2021-06-11 12:23:19 +02:00
Patrick Müller
a80e86b4ea BETTERZON-141: Adding more service methods for prices and products 2021-06-11 12:20:10 +02:00