-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathlog.txt
541 lines (541 loc) · 56 KB
/
log.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
* 6ec4c38 - (HEAD -> main, origin/main, origin/Will_dev, origin/HEAD, Will_dev) fixed Umar updates. (7 days ago) <Gavin Austin>
* dd8dd91 - Merge pull request #72 from Reason0x6/Will_dev (7 days ago) <Reason6>
|\
| * 9887be3 - Merge branch 'main' into Will_dev (7 days ago) <William Paterson>
| |\
| |/
|/|
* | 4a9e765 - Changes by isabella (7 days ago) <Gavin Austin>
* | 276d396 - Merge pull request #71 from Reason0x6/Will_dev (7 days ago) <Reason6>
|\ \
| | * c59e127 - Group invites can now be accepted (7 days ago) <William Paterson>
| |/
| * faa8d02 - Added some comments to GroupsController (7 days ago) <William Paterson>
| * 3be3cb4 - Moved groups to a separate controller (7 days ago) <William Paterson>
|/
* 0c8eeb3 - Merge pull request #70 from Reason0x6/Will_dev (7 days ago) <Reason6>
|\
| * e00d271 - Fixed error page issue (7 days ago) <William Paterson>
| * 8049454 - Fixed merge issue with group add. (7 days ago) <William Paterson>
| * 10bd0d2 - Merge branch 'main' into Will_dev (7 days ago) <William Paterson>
| |\
| |/
|/|
* | 2663d1e - Merge pull request #69 from Reason0x6/Bella_dev (7 days ago) <Reason6>
|\ \
| * | 85de44e - (origin/Bella_dev, Bella_dev) CC Validation update, moved CC Form to Fragments/Forms (8 days ago) <coderuntheworld>
| * | cb95a1c - Merge branch 'main' into Bella_dev (8 days ago) <coderuntheworld>
| |\ \
| |/ /
|/| |
| * | 4c1b99c - CC Validation (8 days ago) <coderuntheworld>
| | * 00f4d9a - Fixed some merge issues. Mostly related to group functionality being overwritten. (7 days ago) <William Paterson>
| | * 376ae88 - Merge branch 'main' into Will_dev (7 days ago) <William Paterson>
| | |\
| |_|/
|/| |
* | | 24d1234 - Merge pull request #68 from Reason0x6/Bella_dev (8 days ago) <Reason6>
|\| |
| * | f6b0fb7 - Checkout update (8 days ago) <coderuntheworld>
| * | ff22edc - Merge branch 'main' into Bella_dev (8 days ago) <coderuntheworld>
| |\ \
| |/ /
|/| |
* | | f66be7f - Merge pull request #66 from Reason0x6/Toby_dev (8 days ago) <Reason6>
|\ \ \
| * | | dafa490 - (origin/Toby_dev, Toby_dev) Advanced search multi-stop flights added (Not tested) (9 days ago) <Toby Churches>
| * | | 10d2d33 - Merge branch 'main' into Toby_dev (9 days ago) <Toby Churches>
| |\ \ \
| * \ \ \ cdb2614 - Merge branch 'main' into Toby_dev (3 weeks ago) <Toby Churches>
| |\ \ \ \
| * \ \ \ \ 8502227 - Merge branch 'main' into Toby_dev (3 weeks ago) <Toby Churches>
| |\ \ \ \ \
| * \ \ \ \ \ 5315682 - Merge branch 'main' into Toby_dev (3 weeks ago) <Toby Churches>
| |\ \ \ \ \ \
| * | | | | | | 55d15c8 - Advanced search multi-stop flights added (Not tested) (3 weeks ago) <Toby Churches>
* | | | | | | | 7f675e1 - Merge pull request #67 from Reason0x6/Gavin_dev (8 days ago) <Reason6>
|\ \ \ \ \ \ \ \
| |_|_|_|_|/ / /
|/| | | | | | |
| * | | | | | | c690bd2 - (origin/Gavin_dev, Gavin_dev) add to cart logic (8 days ago) <Gavin Austin>
| | | | | | * | e5cf347 - Merge branch 'Gavin_dev' into Bella_dev (8 days ago) <coderuntheworld>
| | | | | | |\ \
| | |_|_|_|_|/ /
| |/| | | | | |
| * | | | | | | a2afdfb - add to cart logic (8 days ago) <Gavin Austin>
| | | | | | * | 91dee23 - Merge branch 'Gavin_dev' into Bella_dev (8 days ago) <coderuntheworld>
| | | | | | |\ \
| | |_|_|_|_|/ /
| |/| | | | | |
| * | | | | | | ef44bc0 - add to cart logic (8 days ago) <Gavin Austin>
|/ / / / / / /
| | | | | * | 51fd360 - Checkout update (8 days ago) <coderuntheworld>
| | | | | * | f4ff312 - Buy Now changed to Add to Cart (8 days ago) <coderuntheworld>
| | | | | * | ec3692e - Formatting (8 days ago) <coderuntheworld>
| | | | | * | 4dcf86c - Merge remote-tracking branch 'origin/Bella_dev' into Bella_dev (10 days ago) <coderuntheworld>
| | | | | |\ \
| | | | | | * \ c87b564 - Merge branch 'main' into Bella_dev (10 days ago) <Gavin Austin>
| | | | | | |\ \
| |_|_|_|_|_|/ /
|/| | | | | | |
* | | | | | | | 28bc938 - Merge pull request #65 from Reason0x6/Will_dev (10 days ago) <Reason6>
|\ \ \ \ \ \ \ \
| | | | | | * \ \ c1310fd - Formatting (10 days ago) <coderuntheworld>
| | | | | | |\ \ \
| | | | | | | |/ /
| | | | | | |/| |
| | | | | | * | | 85ccb0d - Updating Icons because g's a bi*ch (10 days ago) <coderuntheworld>
| | | | | | * | | 82d3234 - Updating Icons because g's a bi*ch (10 days ago) <coderuntheworld>
| |_|_|_|_|/ / /
|/| | | | | | |
| | | | | | | * 6addee8 - Check that post request to /invite_list is a user that is already in group. This is to ensure that bad actors outside of group can not add random members to a group. (7 days ago) <William Paterson>
| | | | | | | * 56ae0ed - When inviting user to group checks if a user is already in group (7 days ago) <William Paterson>
| | | | | | | * 684b520 - Added suggested flight getter/setter (7 days ago) <William Paterson>
| | | | | | | * 486aad0 - Now loads invite list and can add to it. Emails added must be an existing user in system. (8 days ago) <William Paterson>
| | | | | | | * 6d992da - Fixed error page path (10 days ago) <William Paterson>
| | |_|_|_|_|/
| |/| | | | |
| * | | | | | 4bdc74e - Merge branch 'main' into Will_dev (10 days ago) <Gavin Austin>
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | /
| | |_|_|_|/
| |/| | | |
* | | | | | 76cc68d - Merge pull request #64 from Reason0x6/Bella_dev (10 days ago) <Reason6>
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | |
| * | | | | 3a944f0 - Cart, Checkout and Booking Confirmation: UI updated. Shopping Cart img added to navbar. Navbar not showing up properly on Checkout anf Confirmation pages. (11 days ago) <coderuntheworld>
| * | | | | 7c80d2a - Added Notification Bell (11 days ago) <coderuntheworld>
| * | | | | 5f00c3d - Added Notification Bell (11 days ago) <coderuntheworld>
| * | | | | 699f575 - Updated formatting in Cart and Plane (11 days ago) <coderuntheworld>
| * | | | | bebbd34 - Merge remote-tracking branch 'origin/Gavin_dev' into Bella_dev (11 days ago) <coderuntheworld>
| |\ \ \ \ \
| | * | | | | da57373 - fixed template mapping (11 days ago) <Gavin Austin>
| * | | | | | 5efa01e - Update to User Session (11 days ago) <coderuntheworld>
| * | | | | | 6c7039d - Merge remote-tracking branch 'origin/Gavin_dev' into Bella_dev (11 days ago) <coderuntheworld>
| |\| | | | |
| | * | | | | e669760 - fixed template mapping (11 days ago) <Gavin Austin>
| | * | | | | b9f72ee - fixed template mapping (11 days ago) <Gavin Austin>
| * | | | | | ac4cff3 - Update to User Session (11 days ago) <coderuntheworld>
| |/ / / / /
| * | | | | e5ead99 - fixed template mapping (11 days ago) <Gavin Austin>
| * | | | | b2a689e - Moved template locations (11 days ago) <Gavin Austin>
| * | | | | f2c9935 - Added Cart, Checkout and Confirmation mapping to IndexController (11 days ago) <coderuntheworld>
| * | | | | fdea2a2 - Added Cart, Checkout and Booking mapping to IndexController (11 days ago) <coderuntheworld>
| * | | | | c2cfd5c - Updated UserSession (11 days ago) <coderuntheworld>
| * | | | | fe809f9 - Updated UserSession (11 days ago) <coderuntheworld>
| * | | | | 9b861e3 - Created HTML files, class diagram (11 days ago) <coderuntheworld>
| * | | | | 7ea825d - Created HTML files, class diagram (11 days ago) <coderuntheworld>
|/ / / / /
| * | | | 3e34e3c - Block users that have not been invited to group (11 days ago) <William Paterson>
| * | | | 39678b6 - Fixed a few issues with html (11 days ago) <William Paterson>
| * | | | 34be2f6 - Can now create a group from account page (11 days ago) <William Paterson>
| * | | | 4fd5820 - Fixed error with 404 page (11 days ago) <William Paterson>
| * | | | 7935b34 - Displays no groups found on account page (11 days ago) <William Paterson>
| * | | | 87752f3 - Can see group members on group page (11 days ago) <William Paterson>
| * | | | 61c569e - Groups show on account page (11 days ago) <William Paterson>
| * | | | 55ea406 - Can add a group at localhost:8080/group/add?groupName=name (11 days ago) <William Paterson>
| * | | | bafb5b1 - Updated UserGroupServices @Service and UserGroup @Document (11 days ago) <William Paterson>
| * | | | 36b5bb2 - Added /groupStatic url for group design reference (11 days ago) <William Paterson>
|/ / / /
* | | | 5308af7 - Merge pull request #61 from Reason0x6/Umarch196-patch-6 (3 weeks ago) <Reason6>
|\ \ \ \
| * | | | 7c27ae2 - Update IndexController.java (3 weeks ago) <Umarch196>
* | | | | 5244521 - Merge pull request #60 from Reason0x6/Umarch196-patch-5 (3 weeks ago) <Reason6>
|\ \ \ \ \
| * | | | | 0df3ef6 - Update Header.html (3 weeks ago) <Umarch196>
| |/ / / /
* | | | | c8e4ba0 - Merge pull request #62 from Reason0x6/Umarch196-patch-7 (3 weeks ago) <Reason6>
|\ \ \ \ \
| * | | | | d6e19b7 - Add files via upload (3 weeks ago) <Umarch196>
* | | | | | 879f152 - Merge pull request #63 from Reason0x6/Gavin_dev (3 weeks ago) <Reason6>
|\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| * | | | | 70241a8 - rego display button (3 weeks ago) <Gavin Austin>
* | | | | | 3ff5a93 - Merge pull request #58 from Reason0x6/Gavin_dev (3 weeks ago) <Reason6>
|\| | | | |
| |/ / / /
|/| | | |
| * | | | e0404b4 - booked flights now shown (3 weeks ago) <Reason6>
| * | | | d145077 - Merge branch 'main' into Gavin_dev (3 weeks ago) <Reason6>
| |\ \ \ \
| |/ / / /
|/| | | |
* | | | | d644428 - Merge pull request #57 from Reason0x6/Will_dev (3 weeks ago) <Reason6>
|\ \ \ \ \
| * \ \ \ \ 9fd6172 - Merge branch 'main' into Will_dev (3 weeks ago) <William Paterson>
| |\ \ \ \ \
| |/ / / / /
|/| | | | |
| * | | | | db78bf7 - Removed some more prints (3 weeks ago) <William Paterson>
| * | | | | 7efffd4 - Removed some prints (3 weeks ago) <William Paterson>
| * | | | | 23518d6 - Moved recommendation location form to Forms.html (3 weeks ago) <William Paterson>
| * | | | | 966cfbc - Dropdown recommendation location list now saves state between updates (3 weeks ago) <William Paterson>
| * | | | | f848bab - Recommendation location now updates recommendation list (3 weeks ago) <William Paterson>
| * | | | | ad70ce4 - Returns recommendation location to controller (3 weeks ago) <William Paterson>
| * | | | | dadeba7 - Added dropdown for recommendation location (3 weeks ago) <William Paterson>
| | * | | | 95ce7c7 - Merge branch 'main' into Gavin_dev (3 weeks ago) <Reason6>
| | |\ \ \ \
| |_|/ / / /
|/| | | | |
* | | | | | 128ccde - Merge pull request #56 from Reason0x6/Will_dev (3 weeks ago) <Reason6>
|\| | | | |
| * | | | | a1a3461 - Merge branch 'main' into Will_dev (3 weeks ago) <William Paterson>
| |\ \ \ \ \
| |/ / / / /
|/| | | | |
| * | | | | cd7391a - Fixed issue with $ne. Does not work with $regex. (3 weeks ago) <William Paterson>
| | * | | | 385883a - Merge branch 'main' into Gavin_dev (3 weeks ago) <Reason6>
| | |\ \ \ \
| |_|/ / / /
|/| | | | |
* | | | | | 221cf26 - Merge pull request #55 from Reason0x6/Will_dev (3 weeks ago) <Reason6>
|\| | | | |
| * | | | | 0adb444 - Fixed typo (3 weeks ago) <William Paterson>
| * | | | | 74142dc - Search now ignores case (3 weeks ago) <William Paterson>
|/ / / / /
* | | | | 15088bd - Merge pull request #54 from Reason0x6/Gavin_dev (3 weeks ago) <Reason6>
|\ \ \ \ \
| * | | | | e6ee744 - one click button (3 weeks ago) <Gavin Austin>
* | | | | | 61e56fe - Merge pull request #53 from Reason0x6/Gavin_dev (3 weeks ago) <Reason6>
|\| | | | |
| |_|_|_|/
|/| | | |
| * | | | 890c01a - Flight view page (3 weeks ago) <Gavin Austin>
|/ / / /
* | | | d5296a9 - Merge pull request #52 from Reason0x6/Gavin_dev (3 weeks ago) <Reason6>
|\ \ \ \
| * \ \ \ cb07749 - Merge branch 'main' into Gavin_dev (3 weeks ago) <Reason6>
| |\ \ \ \
| |/ / / /
|/| | | |
| | * | | 35ec6f5 - Merge branch 'main' into Gavin_dev (3 weeks ago) <Reason6>
| |/| | |
| |/ / /
|/| | |
* | | | 2445e6e - Merge pull request #51 from Reason0x6/Gavin_dev (3 weeks ago) <Reason6>
|\ \ \ \
* \ \ \ \ c234776 - Merge pull request #50 from Reason0x6/Umarch196-patch-1 (3 weeks ago) <Reason6>
|\ \ \ \ \
| |_|_|_|/
|/| | | |
| * | | | 2026b3a - Update Header.html (3 weeks ago) <Umarch196>
|/ / / /
* | | | 786269f - Merge pull request #49 from Reason0x6/Toby_dev (3 weeks ago) <Reason6>
|\ \ \ \
| | |_|/
| |/| |
| * | | cf24374 - Included request objects (3 weeks ago) <Toby Churches>
| * | | 03fce7a - Running on local - Test (3 weeks ago) <Toby Churches>
| * | | 640352a - imports added (3 weeks ago) <Toby Churches>
| * | | a38191f - Merge branch 'main' into Toby_dev (3 weeks ago) <Toby Churches>
| |\ \ \
| |/ / /
|/| | |
| * | | 1dbdd68 - Stopover flight basic search working for 1 or 2 stopovers (3 weeks ago) <Toby Churches>
| | | * 5f94cbf - departure time fixed (3 weeks ago) <Reason6>
| | | * 06ab4fe - groups page added (3 weeks ago) <Reason6>
| | |/
| | * ddd12de - Styled Advanced search (3 weeks ago) <Reason6>
| |/
|/|
* | 7bcdf77 - Merge pull request #46 from Reason0x6/Bella_dev (3 weeks ago) <Reason6>
|\ \
| * | 990b12f - Created BookingRepo and BookingServices (3 weeks ago) <coderuntheworld>
| * | ec9f6bc - Merge branch 'main' into Bella_dev (3 weeks ago) <coderuntheworld>
| |\ \
| * | | 3dab891 - Created BookingRepo and BookingServices (3 weeks ago) <coderuntheworld>
| * | | 365a712 - Merge branch 'main' into Bella_dev (3 weeks ago) <coderuntheworld>
| |\ \ \
| | | |/
| | |/|
| * | | 35310e1 - Merge branch 'main' into Bella_dev (4 weeks ago) <coderuntheworld>
| |\ \ \
| * \ \ \ 3422788 - Merge branch 'main' into Bella_dev (4 weeks ago) <coderuntheworld>
| |\ \ \ \
| * \ \ \ \ 044ec09 - Merge branch 'main' into Bella_dev (4 weeks ago) <coderuntheworld>
| |\ \ \ \ \
| * \ \ \ \ \ 4b47712 - Merge branch 'main' into Bella_dev (4 weeks ago) <coderuntheworld>
| |\ \ \ \ \ \
| * | | | | | | 3f4882b - Formatting fixes (4 weeks ago) <coderuntheworld>
| * | | | | | | 45bdffd - Formatting fixes (4 weeks ago) <coderuntheworld>
* | | | | | | | 43ad357 - Update README.md (3 weeks ago) <Reason6>
* | | | | | | | 2c85df0 - Update README.md (3 weeks ago) <Reason6>
| |_|_|_|_|_|/
|/| | | | | |
* | | | | | | 55e31ef - Merge pull request #45 from Reason0x6/Gavin_dev (3 weeks ago) <Reason6>
|\ \ \ \ \ \ \
| * | | | | | | 388c3a1 - fixed broken merges (3 weeks ago) <Reason6>
|/ / / / / / /
* | | | | | | 1ece1c7 - Update Footer.html (3 weeks ago) <Reason6>
* | | | | | | 2320be5 - dynamic JS script linking (3 weeks ago) <Reason6>
| |_|_|_|_|/
|/| | | | |
* | | | | | 0c6b69d - Merge pull request #44 from Reason0x6/Gavin_dev (3 weeks ago) <Reason6>
|\ \ \ \ \ \
| * \ \ \ \ \ 1fd934f - Merge branch 'main' into Gavin_dev (3 weeks ago) <Reason6>
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
* | | | | | | 57d8c1a - Merge pull request #42 from Reason0x6/Toby_dev (3 weeks ago) <Reason6>
|\ \ \ \ \ \ \
| * | | | | | | 527ea6c - Advanced Search Added and working. A few features wont filter anything as the other components need to be developed (3 weeks ago) <Toby Churches>
| * | | | | | | caea387 - Merge branch 'main' into Toby_dev (3 weeks ago) <Toby Churches>
| |\ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | |
* | | | | | | | 79426b0 - Merge pull request #41 from Reason0x6/Toby_dev (3 weeks ago) <Reason6>
|\ \ \ \ \ \ \ \
| | * | | | | | | ebfa86c - Js error (3 weeks ago) <Toby Churches>
| |/ / / / / / /
| * / / / / / / 0663bae - Flexi date and flexi destination added. Bug where flights on the upper date limit fixed (3 weeks ago) <Toby Churches>
|/ / / / / / /
* | | | | | | 28232f6 - Merge pull request #40 from Reason0x6/Will_dev (3 weeks ago) <Reason6>
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ cb4a856 - Merge branch 'main' into Will_dev (4 weeks ago) <William Paterson>
| |\ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | |
* | | | | | | | 6693f35 - Merge pull request #39 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\ \ \ \ \ \ \ \
| | * | | | | | | 5ebbf1d - Recommendation now uses a sort query rather than sorting in controller (4 weeks ago) <William Paterson>
| |/ / / / / / /
|/| | | | | | |
| | * | | | | | f3d7b1b - Personalised page fix + recommendations now return 4 flights (3 weeks ago) <Reason6>
| | * | | | | | 97fc747 - Account page (3 weeks ago) <Gavin Austin>
| |/ / / / / /
| * / / / / / ebc6faf - index rec styling (4 weeks ago) <Gavin Austin>
|/ / / / / /
* | | | | | 67f97b4 - Merge pull request #38 from Reason0x6/Will_dev (4 weeks ago) <Reason6>
|\ \ \ \ \ \
| * | | | | | 0126dcf - Recommendation will now find 3 flights from locations that are less popular but actually have flights (4 weeks ago) <William Paterson>
|/ / / / / /
* | | | | | c542e82 - Merge pull request #37 from Reason0x6/Will_dev (4 weeks ago) <Reason6>
|\ \ \ \ \ \
| * \ \ \ \ \ 2e66a5c - Merge branch 'main' into Will_dev (4 weeks ago) <William Paterson>
| |\ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
* | | | | | | abcbe5e - Merge pull request #36 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\ \ \ \ \ \ \
| * | | | | | | c6916fe - basic search now has check boxes for no destination and exact date searches (4 weeks ago) <Gavin Austin>
|/ / / / / / /
| * | | | | | 9790438 - Now checks if a current location actually exists in database (4 weeks ago) <William Paterson>
| * | | | | | 448b4ec - Merge remote-tracking branch 'origin/Will_dev' into Will_dev (4 weeks ago) <SuzzwalShrestha>
| |\ \ \ \ \ \
| | * \ \ \ \ \ 93e7a11 - Merge remote-tracking branch 'origin/Will_dev' into Will_dev (4 weeks ago) <William Paterson>
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ f9d0bd1 - Merge branch 'main' into Will_dev (4 weeks ago) <William Paterson>
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | |
| * | | | | | | | 411dfce - Recommendation Prototype Done, Intensive test has not been completed Personalized reco not completed yet. (4 weeks ago) <SuzzwalShrestha>
| | |/ / / / / /
| |/| | | | | |
| * | | | | | | 614385e - Merge branch 'main' into Will_dev (4 weeks ago) <SuzzwalShrestha>
| |\ \ \ \ \ \ \
| |/ / / / / / /
|/| / / / / / /
| |/ / / / / /
* | | | | | | 024d929 - Merge pull request #35 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\ \ \ \ \ \ \
| |_|_|_|_|_|/
|/| | | | | |
| * | | | | | 06c9d68 - Flight addition page shows (4 weeks ago) <Gavin Austin>
| | * | | | | 468657e - Fixed issue in recommendations from setOrigin and setDestination being around the wrong way (4 weeks ago) <William Paterson>
| | * | | | | 3524d03 - Updated search to use new set methods (4 weeks ago) <William Paterson>
| | * | | | | f314603 - Merge branch 'main' into Will_dev (4 weeks ago) <William Paterson>
| | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
* | | | | | | 2146dfe - Merge pull request #34 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | | | |
| * | | | | | 0a52691 - shorthand or full name search (4 weeks ago) <Reason6>
| | * | | | | b81f930 - Recommendations are now found for the 3 most popular locations (4 weeks ago) <William Paterson>
| | * | | | | 093d6dd - Merge branch 'main' into Will_dev (4 weeks ago) <William Paterson>
| | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
* | | | | | | 55ee50b - Merge pull request #33 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | | | |
| * | | | | | 9d2a84d - basic search now fliters by date (4 weeks ago) <Reason6>
| | * | | | | 3a6e33e - Merge branch 'main' into Will_dev (4 weeks ago) <William Paterson>
| | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
* | | | | | | b1cd33a - Merge pull request #32 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | | | |
| |_|_|_|_|/
|/| | | | |
| * | | | | 1529327 - Location service and date checkng search started (4 weeks ago) <Reason6>
|/ / / / /
| * / / / 1686c50 - Created get recommendation mockup (4 weeks ago) <William Paterson>
|/ / / /
* | | | 2ed91b4 - removed clumsy int to string converstion (4 weeks ago) <Reason6>
* | | | 051f82a - Merge pull request #31 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\ \ \ \
| * | | | 65b0a3c - Merge conflict resolve (4 weeks ago) <Reason6>
|/ / / /
* | | | 71fd520 - Merge pull request #30 from Reason0x6/Toby_dev (4 weeks ago) <Reason6>
|\ \ \ \
| * | | | 9af2d45 - Merged with main, FlightId changed to a string (4 weeks ago) <Toby Churches>
| * | | | b17ec87 - Merge branch 'main' into Toby_dev (4 weeks ago) <Toby Churches>
| |\ \ \ \
| |/ / / /
|/| | | |
* | | | | 9772d25 - Merge pull request #29 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\ \ \ \ \
| * | | | | 6e27822 - user register form & duplicate email detection (4 weeks ago) <Reason6>
| * | | | | 234a0a9 - user register form & duplicate email detection (4 weeks ago) <Reason6>
* | | | | | 7fa56a2 - Merge pull request #27 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | | |
| |_|_|_|/
|/| | | |
| * | | | a926a67 - User Session stored when logged in (4 weeks ago) <Reason6>
| * | | | 0f140f3 - User Session stored when logged in (4 weeks ago) <Reason6>
| * | | | de3d817 - User Session stored when logged in (4 weeks ago) <Reason6>
| * | | | 0ca9b9d - Flight search fix (4 weeks ago) <Gavin Austin>
| | * | | a58c8ba - Contructors added (4 weeks ago) <Toby Churches>
| | * | | 890644e - Not working (4 weeks ago) <Toby Churches>
| | * | | 348397b - Merge branch 'main' into Toby_dev (4 weeks ago) <Toby Churches>
| | |\ \ \
| |_|/ / /
|/| | | |
* | | | | e9d5d50 - Merge pull request #25 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | |
| * | | | e3b3d01 - Flight search fix (4 weeks ago) <Gavin Austin>
| | * | | 642ac5d - Merge branch 'main' into Toby_dev (4 weeks ago) <Toby Churches>
| | |\ \ \
| |_|/ / /
|/| | | |
* | | | | 83eb12c - Merge pull request #24 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | |
| |_|_|/
|/| | |
| * | | 103cb5a - user logged in checked (4 weeks ago) <Gavin Austin>
* | | | ce6d375 - Merge pull request #23 from Reason0x6/add-code-of-conduct-1 (4 weeks ago) <Reason6>
|\ \ \ \
| * | | | 496522a - (origin/add-code-of-conduct-1) Create CODE_OF_CONDUCT.md (4 weeks ago) <Reason6>
|/ / / /
* | | | 128670e - Sorry for the spam.... Merge pull request #22 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | |
| * | | 551a82f - basic search uses dates not flight types (4 weeks ago) <Reason6>
| * | | d063424 - Sign in reattempt prompt text (4 weeks ago) <Reason6>
* | | | ce99917 - Merge pull request #21 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | |
| |_|/
|/| |
| * | 2afdc32 - Flight Search page additions (4 weeks ago) <Reason6>
* | | 68c5506 - Merge pull request #20 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| |
| * | ffb87f1 - Flight Searches (4 weeks ago) <Reason6>
| * | 6c51855 - /Flight/Add URI Added. Object Creation now has its own controller (4 weeks ago) <Reason6>
| * | 4159065 - Merge branch 'Gavin_dev' of https://github.com/Reason0x6/FlightPub into Gavin_dev (4 weeks ago) <Reason6>
| |\ \
| * | | dd949fb - created folder for Fragmentations (4 weeks ago) <Reason6>
| | | * 9c68e39 - Model Objects Added (4 weeks ago) <Toby Churches>
| | | * 1ccf5bd - Merge branch 'main' into Toby_dev (4 weeks ago) <Toby Churches>
| | | |\
| |_|_|/
|/| | |
* | | | cf74873 - Merge pull request #19 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\ \ \ \
| | |/ /
| |/| |
| * | | 7239fea - user logged in checked (4 weeks ago) <Gavin Austin>
|/ / /
| | * 09f6ff7 - Model Objects Added (4 weeks ago) <Toby Churches>
| |/
|/|
* | f38e6bf - Merge pull request #17 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\ \
| * | 99fb81a - SHA-512 password hashing -> base64 (4 weeks ago) <Gavin Austin>
* | | 6eb36bd - Merge pull request #16 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| |
| * | bc460a4 - Search styling (4 weeks ago) <Gavin Austin>
* | | 7647050 - Merge pull request #15 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| |
| * | 7f857f0 - search displays on search page now for reference (4 weeks ago) <Gavin Austin>
* | | 8a84f92 - Update CODEOWNERS (4 weeks ago) <Reason6>
* | | 2e8c82d - Merge pull request #13 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| |
| * | c47df1e - search displays on search page now for reference (4 weeks ago) <Gavin Austin>
| * | 77f2ca4 - Merge branch 'main' into Gavin_dev (4 weeks ago) <Gavin Austin>
| |\ \
* | | | 93fa784 - Update CODEOWNERS (4 weeks ago) <Reason6>
* | | | ac810ea - Create CODEOWNERS (4 weeks ago) <Reason6>
* | | | 5739143 - Merge pull request #12 from Reason0x6/Toby_dev (4 weeks ago) <Toby Churches>
|\ \ \ \
| * | | | fbe598f - Added beans (4 weeks ago) <Toby Churches>
| * | | | 4b2567f - Merge branch 'main' into Toby_dev (4 weeks ago) <Toby Churches>
| |\ \ \ \
| |/ / / /
|/| | | |
* | | | | 26689f9 - Merge pull request #11 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\ \ \ \ \
| | |/ / /
| |/| | |
| * | | | 20cc847 - new dependancy and search obj (4 weeks ago) <Gavin Austin>
* | | | | d765639 - Update 404.html (4 weeks ago) <Reason6>
| | * | | 7578e81 - Merge branch 'main' into Toby_dev (4 weeks ago) <Toby Churches>
| | |\ \ \
| |_|/ / /
|/| | | |
* | | | | 98eaed8 - Merge pull request #10 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | |
| * | | | f803959 - Created Fragments Folder (4 weeks ago) <Gavin Austin>
* | | | | f8673d7 - Merge pull request #9 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | |
| * | | | 4c36870 - Created Fragments Folder (4 weeks ago) <Gavin Austin>
* | | | | 2cee6f1 - Merge pull request #8 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| | | |
| |_|/ /
|/| | |
| * | | 6382851 - Login Page Added... 'Hub' Perged (4 weeks ago) <Gavin Austin>
| | * | 7819b69 - Header modified to link to the index controller (4 weeks ago) <Toby Churches>
| |/ /
|/| |
* | | 6a9a0d2 - Merge pull request #7 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\| |
| * | 03a4675 - email added to uri param (4 weeks ago) <Gavin Austin>
|/ /
* | c85d1f7 - Update README.md (4 weeks ago) <Reason6>
* | 90c87a7 - Merge pull request #6 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\|
| * 8cf0d5a - Group model and services (4 weeks ago) <Reason6>
| * 5d1457d - Basic group start (4 weeks ago) <Reason6>
* | 40430e8 - Merge pull request #5 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\|
| * 47394b6 - fractialise (4 weeks ago) <Reason6>
| * 4231718 - html page fragmentation (4 weeks ago) <Reason6>
* | 0f99a50 - Merge pull request #4 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\|
| * 3f6246b - Update IndexController.java (4 weeks ago) <Reason6>
| * 2d3ad50 - added an adduser URI (4 weeks ago) <Reason6>
* | b478abf - Merge pull request #3 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\|
| * 4317b32 - pwd included (4 weeks ago) <Reason6>
* | b7a05b0 - Update maven.yml (4 weeks ago) <Reason6>
* | a9fe9dc - Merge pull request #2 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\|
| * 2a5f3ce - pull request check test (4 weeks ago) <Reason6>
* | a5200ed - Update maven.yml (4 weeks ago) <Reason6>
* | 20a1bd7 - maven deploy test (4 weeks ago) <Reason6>
* | dd5467b - Merge pull request #1 from Reason0x6/Gavin_dev (4 weeks ago) <Reason6>
|\|
| * b83d294 - renamed indexcontroller (4 weeks ago) <Reason6>
|/
* f6ca5a5 - Dynamic linking of css to html page (4 weeks ago) <Reason6>
* c82e784 - html serving (4 weeks ago) <Reason6>
* fbfa41f - Update Mapping (4 weeks ago) <Reason6>
* 39d608d - Controller Mapping (4 weeks ago) <Reason6>
* e0ee956 - Rearrange File structs (4 weeks ago) <Reason6>
* bcff5f0 - commit (4 weeks ago) <Reason6>
* fd330ee - Update application.properties (5 weeks ago) <Reason6>
* 7af3226 - Update MdbSpringBootApplication.java (5 weeks ago) <Gavin Austin>
* adc2089 - Update README.md (5 weeks ago) <Reason6>
* 37a746b - Update MdbSpringBootApplication.java (5 weeks ago) <Reason6>
* cedba18 - Update application.properties (5 weeks ago) <Gavin Austin>
* cf942d5 - Initial commit (5 weeks ago) <Reason6>