Betterzon

Paddy/Betterzon

Fork 0

mirror of https://github.com/Mueller-Patrick/Betterzon.git synced 2026-05-06 19:57:58 +00:00

Commit Graph

Select branches

Hide Pull Requests

develop

master

#1

#10

#100

#101

#102

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

1b57ebfb53 Merge pull request #102 from Mueller-Patrick/develop master Patrick 2021-11-11 12:05:52 +01:00
ddebe78f15 Updating README links because of the switch to a new domain develop Patrick 2021-11-11 12:03:06 +01:00
086e0d41b3 Updating blog post exports Paddy 2021-06-28 17:24:35 +02:00
2bc97503de Adding Blog PDF export and function points file Paddy 2021-06-27 12:37:44 +02:00
8049fd9987 Adding some more cucumber tests Paddy 2021-06-26 22:31:08 +02:00
b839994de0 Merge pull request #101 from Mueller-Patrick/develop Patrick 2021-06-26 14:43:54 +02:00
91716b8147 Merge remote-tracking branch 'origin/develop' into develop Paddy 2021-06-26 14:38:18 +02:00
5be6d9bd4f Update README.md Patrick 2021-06-26 14:37:06 +02:00
6e0f1e7659 Reformatting a bunch of files Paddy 2021-06-26 14:36:26 +02:00
4a7ef6d637 Adjusting some frontend tests Paddy 2021-06-26 14:33:58 +02:00
c3c0fa73b9 Merge pull request #100 from Mueller-Patrick/develop Patrick 2021-06-18 10:29:55 +02:00
b1db97af87 Some fancy changes Paddy 2021-06-18 10:28:25 +02:00
730e1aada0 Merge pull request #99 from Mueller-Patrick/develop Patrick 2021-06-18 09:29:52 +02:00
deec125242 Merge pull request #98 from Mueller-Patrick/BETTERZON-152 Patrick 2021-06-18 09:28:19 +02:00
d8638cab4b wip: last changes 2 illumizoldyck 2021-06-18 09:24:16 +02:00
cfda636f07 Merge remote-tracking branch 'origin/develop' into BETTERZON-152 illumizoldyck 2021-06-18 09:10:52 +02:00
61a0125229 wip: last changes 1 illumizoldyck 2021-06-18 09:10:47 +02:00
0bc02ee9ea Fixing currency sign Paddy 2021-06-17 23:33:53 +02:00
7ac73204df Fixing typo Paddy 2021-06-17 23:04:47 +02:00
5c02314180 Merge pull request #97 from Mueller-Patrick/develop Patrick 2021-06-17 22:58:11 +02:00
52e38461a4 Merge pull request #96 from Mueller-Patrick/BETTERZON-140 Patrick 2021-06-17 22:56:47 +02:00
45b5e04442 Merge branch 'develop' into BETTERZON-140 Patrick 2021-06-17 22:55:30 +02:00
a792c43e24 wip: german -> english illumizoldyck 2021-06-17 22:52:09 +02:00
78e2de6545 Update README.md Patrick 2021-06-17 19:06:18 +02:00
a6a5b58e25 wip: profile illumizoldyck 2021-06-17 17:52:27 +02:00
012de346e8 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 illumizoldyck 2021-06-17 17:19:07 +02:00
f28b301a28 wip: profile illumizoldyck 2021-06-17 17:18:36 +02:00
af85f8ff7b Merge pull request #95 from Mueller-Patrick/develop Patrick 2021-06-17 17:16:52 +02:00
45acbfd9a2 BETTERZON-151: Adding option to delete price alarm (#94) Patrick 2021-06-17 17:15:06 +02:00
fe2c064e30 wip: hot-deals vendors illumizoldyck 2021-06-17 10:55:30 +02:00
9821c004ec wip: profile component illumizoldyck 2021-06-17 10:30:40 +02:00
b748b9492a wip: profile component illumizoldyck 2021-06-17 09:58:49 +02:00
969ac6feaf wip: profile component illumizoldyck 2021-06-17 09:55:40 +02:00
be534551ba wip: hot deals widget loadig data illumizoldyck 2021-06-16 15:25:12 +02:00
c88efc5484 WIP: problems with best deals. illumizoldyck 2021-06-16 09:59:57 +02:00
8eba80f7d4 WIP: proile component created. illumizoldyck 2021-06-16 09:59:25 +02:00
6f33186d7e Merge pull request #93 from Mueller-Patrick/develop Patrick 2021-06-16 09:40:10 +02:00
841502f9d1 BETTERZON-150: Fixing best deals API endpoint logic (#92) Patrick 2021-06-16 09:20:40 +02:00
7f43d27a79 Repaired API Tests (#90) henningxtro 2021-06-15 23:34:31 +02:00
d83fcdf693 BETTERZON-147, BETTERZON-148: Adding feature files (#89) Patrick 2021-06-15 15:58:54 +02:00
ce92abdb40 Doku (#88) henningxtro 2021-06-15 13:05:33 +02:00
ce083d8abb Merge pull request #87 from Mueller-Patrick/develop Patrick 2021-06-15 12:10:28 +02:00
0cd1213c40 BETTERZON-146: Session handling rewrite HOTFIX 2 Paddy 2021-06-15 12:09:04 +02:00
d9ad99cb72 Merge pull request #86 from Mueller-Patrick/develop Patrick 2021-06-15 11:51:53 +02:00
1fd115c2a2 BETTERZON-146: Session handling rewrite HOTFIX Paddy 2021-06-15 11:50:36 +02:00
92de923fad Merge remote-tracking branch 'origin/develop' into BETTERZON-140 illumizoldyck 2021-06-15 11:37:16 +02:00
bc437363e5 Merge pull request #85 from Mueller-Patrick/develop Patrick 2021-06-15 11:35:04 +02:00
0118ac6861 Merge pull request #84 from Mueller-Patrick/BETTERZON-140 Patrick 2021-06-15 11:34:00 +02:00
83f6018f7e Merge remote-tracking branch 'origin/develop' into BETTERZON-140 illumizoldyck 2021-06-15 11:33:36 +02:00
bf56d2b509 BETTERZON-146: Changing session handling from cookies to localStorage Paddy 2021-06-15 11:32:48 +02:00
ad091954c1 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 Paddy 2021-06-15 10:39:15 +02:00
b062e14c9a auth with cookies. illumizoldyck 2021-06-15 10:38:54 +02:00
f1dcaef351 Merge pull request #83 from Mueller-Patrick/BETTERZON-145 Patrick 2021-06-15 10:38:52 +02:00
391a4b5e4b BETTERZON-145: Adding better error when trying to get session details without cookie Paddy 2021-06-15 10:37:14 +02:00
cf300cb1b7 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 illumizoldyck 2021-06-15 10:24:51 +02:00
c35097a9a2 Merge pull request #82 from Mueller-Patrick/BETTERZON-144 Patrick 2021-06-15 10:24:20 +02:00
62795fd3f8 Merge remote-tracking branch 'origin/develop' into BETTERZON-140 illumizoldyck 2021-06-15 10:24:02 +02:00
4a0ba40da6 Merge branch 'develop' into BETTERZON-144 Patrick 2021-06-15 10:20:17 +02:00
f4d1e93a7f BETTERZON-144: Adding service method to get session / user info Paddy 2021-06-15 10:19:48 +02:00
aae931099b Merge pull request #81 from Mueller-Patrick/develop Patrick 2021-06-14 20:57:18 +02:00
3dbcc6707c Merge pull request #80 from Mueller-Patrick/BETTERZON-143 Patrick 2021-06-14 20:56:08 +02:00
1bb05a1baf BETTERZON-143: Fixing API endpoints that didn't return a json Paddy 2021-06-14 20:54:54 +02:00
6eaf7aca82 Adding SQL script Paddy 2021-06-14 15:54:57 +02:00
9512002081 Revert "Adjusting frontend and backend package names" Paddy 2021-06-14 14:49:24 +02:00
e00330656e Adjusting frontend and backend package names Paddy 2021-06-14 14:40:41 +02:00
daef6ec208 BETTERZON-141: Fixing user updating query Paddy 2021-06-13 14:16:09 +02:00
f2adb1e375 BETTERZON-141: Fixing service class - Because Patrick was stupid Paddy 2021-06-13 13:09:51 +02:00
68e9d75e2d wip: register api illumizoldyck 2021-06-13 12:49:15 +02:00
099f6f1c51 Merge pull request #79 from Mueller-Patrick/BETTERZON-141 Patrick 2021-06-11 12:23:19 +02:00
a80e86b4ea BETTERZON-141: Adding more service methods for prices and products Paddy 2021-06-11 12:20:10 +02:00
dcb9edd562 Adding License Patrick 2021-06-10 14:31:10 +02:00
5e450ea0c2 Merge pull request #78 from Mueller-Patrick/develop Patrick 2021-06-07 16:51:02 +02:00
d2d3bcac8c Merge pull request #77 from Mueller-Patrick/BETTERZON-120 Patrick 2021-06-07 16:48:44 +02:00
3eea4f7f72 Merge branch 'develop' into BETTERZON-120 Patrick 2021-06-07 16:47:35 +02:00
c8cbc53c91 kunden component is done. illumizoldyck 2021-06-07 09:59:07 +02:00
b291c0b828 greeting component is done. illumizoldyck 2021-06-07 09:58:51 +02:00
6c7b28b4cb footer component adjusted. illumizoldyck 2021-06-07 09:58:36 +02:00
14b943b64a hot-deals component is done. illumizoldyck 2021-06-07 09:58:10 +02:00
7a547a6a72 basic components adjusted. illumizoldyck 2021-06-07 09:57:28 +02:00
53fcb86295 basic components adjusted. illumizoldyck 2021-06-07 09:55:21 +02:00
709a41bcdb about us component is done. illumizoldyck 2021-06-07 09:54:48 +02:00
f30942443f top-bar adjusted. illumizoldyck 2021-06-07 09:53:39 +02:00
54e68479f6 auth. components done. illumizoldyck 2021-06-07 09:53:03 +02:00
1fa69c334b Merging develop Paddy 2021-06-06 22:53:24 +02:00
e760247866 Merge pull request #76 from Mueller-Patrick/BETTERZON-139 Patrick 2021-06-06 22:41:31 +02:00
f3f1cba9ea BETTERZON-139: Fixing Codacy Error Prone Issues Paddy 2021-06-06 22:38:28 +02:00
3be39fad76 Api tests (#75) henningxtro 2021-05-30 16:32:15 +02:00
5d3e48a3c8 Update README.md Patrick 2021-05-30 16:25:33 +02:00
13f0242fc2 Merge pull request #73 from Mueller-Patrick/develop Patrick 2021-05-30 12:13:08 +02:00
5a4ea9a134 Merge remote-tracking branch 'origin/master' into develop Paddy 2021-05-30 12:11:47 +02:00
d362c68fac BETTERZON-126: Correcting HTTP status codes sent by API (#72) Patrick 2021-05-30 12:07:08 +02:00
25b6b43e9f BETTERZON-124: Adding service function for crawling status API (#71) Patrick 2021-05-29 13:57:19 +02:00
63362fbe67 BETTERZON-125: Adding service functions for manufacturer API (#70) Patrick 2021-05-29 13:51:07 +02:00
6bb1c8f66b BETTERZON-123: Adding service functions for categories API (#69) Patrick 2021-05-29 13:43:50 +02:00
7dc76649fc BETTERZON-121: Adding service functions for contact persons API (#68) Patrick 2021-05-29 13:28:54 +02:00
9ef37cee03 Merge remote-tracking branch 'origin/develop' into BETTERZON-120 illumizoldyck 2021-05-29 11:03:06 +02:00
7f9e6e5197 BETTERZON-120: wip: auth components created. illumizoldyck 2021-05-29 11:01:32 +02:00
6e8c52857f Master deployment (#67) Patrick 2021-05-29 10:58:27 +02:00
1a65783690 BETTERZON-118: Adding service functions for managing favorite shops (#66) Patrick 2021-05-26 21:30:53 +02:00

1 2 3 4 5