Paddy/Betterzon
1
0
Fork 0
mirror of https://github.com/Mueller-Patrick/Betterzon.git synced 2026-05-06 19:57:58 +00:00
Code Issues Projects Releases Wiki Activity
291 Commits 2 Branches 0 Tags
b839994de0ef0d93085de671e9181647760a246e
Commit Graph

291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick b839994de0 Merge pull request #101 from Mueller-Patrick/develop 
Deployment
 2021-06-26 14:43:54 +02:00
Paddy 91716b8147 Merge remote-tracking branch 'origin/develop' into develop 2021-06-26 14:38:18 +02:00
Patrick 5be6d9bd4f Update README.md 2021-06-26 14:37:06 +02:00
Paddy 6e0f1e7659 Reformatting a bunch of files 2021-06-26 14:36:26 +02:00
Paddy 4a7ef6d637 Adjusting some frontend tests 2021-06-26 14:33:58 +02:00
Patrick c3c0fa73b9 Merge pull request #100 from Mueller-Patrick/develop 
Some fancy changes
 2021-06-18 10:29:55 +02:00
Paddy b1db97af87 Some fancy changes 2021-06-18 10:28:25 +02:00
Patrick 730e1aada0 Merge pull request #99 from Mueller-Patrick/develop 
Deployment
 2021-06-18 09:29:52 +02:00
Patrick deec125242 Merge pull request #98 from Mueller-Patrick/BETTERZON-152 
BETTERZON-152
 2021-06-18 09:28:19 +02:00
illumizoldyck d8638cab4b wip: last changes 2 2021-06-18 09:24:16 +02:00
illumizoldyck cfda636f07 Merge remote-tracking branch 'origin/develop' into BETTERZON-152 2021-06-18 09:10:52 +02:00
illumizoldyck 61a0125229 wip: last changes 1 2021-06-18 09:10:47 +02:00
Paddy 0bc02ee9ea Fixing currency sign 2021-06-17 23:33:53 +02:00
Paddy 7ac73204df Fixing typo 2021-06-17 23:04:47 +02:00
Patrick 5c02314180 Merge pull request #97 from Mueller-Patrick/develop 
Frontend changes deployment
 2021-06-17 22:58:11 +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
illumizoldyck 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
illumizoldyck a6a5b58e25 wip: profile 2021-06-17 17:52:27 +02:00
illumizoldyck 012de346e8 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-17 17:19:07 +02:00
illumizoldyck f28b301a28 wip: profile 2021-06-17 17:18:36 +02:00
Patrick af85f8ff7b Merge pull request #95 from Mueller-Patrick/develop 
BETTERZON-151: Adding option to delete price alarm (#94)
 2021-06-17 17:16:52 +02:00
Patrick 45acbfd9a2 BETTERZON-151: Adding option to delete price alarm (#94) 2021-06-17 17:15:06 +02:00
illumizoldyck fe2c064e30 wip: hot-deals vendors 2021-06-17 10:55:30 +02:00
illumizoldyck 9821c004ec wip: profile component 2021-06-17 10:30:40 +02:00
illumizoldyck b748b9492a wip: profile component 2021-06-17 09:58:49 +02:00
illumizoldyck 969ac6feaf wip: profile component 2021-06-17 09:55:40 +02:00
illumizoldyck be534551ba wip: hot deals widget loadig data 2021-06-16 15:25:12 +02:00
illumizoldyck c88efc5484 WIP: problems with best deals. 2021-06-16 09:59:57 +02:00
illumizoldyck 8eba80f7d4 WIP: proile component created. 2021-06-16 09:59:25 +02:00
Patrick 6f33186d7e Merge pull request #93 from Mueller-Patrick/develop 
Master Deployment
 2021-06-16 09:40:10 +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 ce083d8abb Merge pull request #87 from Mueller-Patrick/develop 
BETTERZON-146: Session handling rewrite HOTFIX 2
 2021-06-15 12:10:28 +02:00
Paddy 0cd1213c40 BETTERZON-146: Session handling rewrite HOTFIX 2 2021-06-15 12:09:04 +02:00
Patrick d9ad99cb72 Merge pull request #86 from Mueller-Patrick/develop 
Hotfix Deploy
 2021-06-15 11:51:53 +02:00
Paddy 1fd115c2a2 BETTERZON-146: Session handling rewrite HOTFIX 2021-06-15 11:50:36 +02:00
illumizoldyck 92de923fad Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-15 11:37:16 +02:00
Patrick bc437363e5 Merge pull request #85 from Mueller-Patrick/develop 
Master deployment
 2021-06-15 11:35:04 +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
illumizoldyck 83f6018f7e Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-15 11:33:36 +02:00
Paddy bf56d2b509 BETTERZON-146: Changing session handling from cookies to localStorage 2021-06-15 11:32:48 +02:00
Paddy ad091954c1 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 2021-06-15 10:39:15 +02:00
illumizoldyck 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
Paddy 391a4b5e4b BETTERZON-145: Adding better error when trying to get session details without cookie 2021-06-15 10:37:14 +02:00