-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgit_logs.txt
1697 lines (1140 loc) · 47.8 KB
/
git_logs.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
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
commit df674dcf6658ca5c5a00a27c15b34edc68fb65b6
Merge: 974aaa3 fee6072
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 17:24:05 2021 +0800
Merge branch 'workingbranchJake'
commit fee60720adb027e0185be13486a48884de5e7939
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 17:23:19 2021 +0800
final quiz fix
commit 3b3fb0ead2f84a550bcf666dd019775e91af4339
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 17:22:38 2021 +0800
final bug fixes
commit de393117e788784899a801c4e9c60ea08ee52800
Merge: 1f427a9 35dc223
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 17:05:32 2021 +0800
Merge branch 'working_Jordan'
commit 35dc2238ce16ee272aabb085c3483a528f6c4afa
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 17:05:16 2021 +0800
Update Lesson 3
fixed content
commit 1f427a90428614cf776daab5415771cda2820cfa
Merge: f948a0d 70b3c04
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 17:02:33 2021 +0800
minor style changes
commit f948a0dea2007e2605910d0f176bddaa085a7a84
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 17:01:34 2021 +0800
stylistic changes
commit 70b3c0463474fc992c0f43aeba7d71b3a7b3d8e7
Merge: a19a949 9651719
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 17:00:25 2021 +0800
Merge branch 'workingbranchJake'
commit 9651719524d86d17f8d59712db0e0b84cc1485c1
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 16:59:49 2021 +0800
validation checks complete
commit a19a9498b57b0a163eb5791426c917a54a5eb5b8
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 16:55:04 2021 +0800
footer links todo removed as well
commit 4ac9ffe0422206ecfd15debf16260c7a9ee02a6b
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 16:51:56 2021 +0800
Title Update
YT Reference Added As Well
commit 32bde875de9adb9513536b0b920dbc5167ab2819
Merge: 72500fb a77b234
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 16:36:45 2021 +0800
Merge branch 'working_Jordan'
commit 72500fb4d70439853219052c49acfa73191b0eed
Merge: 83c21d1 9a75e2c
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 16:35:12 2021 +0800
conflict fixes
commit a77b234d4be75eea00f1a945be7b867518abd1d3
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 16:33:57 2021 +0800
Referencing added to readme
commit 83c21d1bb9c1e038af2a6446384bb5b4e3af93fa
Merge: 423af77 697edce
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 16:33:30 2021 +0800
final bug fixes and changes
commit 9a75e2cf8fe23a27eba8f99b4b15b7c99ea83def
Merge: f7cf50e 61ba210
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 16:26:45 2021 +0800
Merge branch 'workingbranchJake'
commit 61ba210de4602fe99ee80b9484e3c284dad80417
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 16:26:12 2021 +0800
fixed 404 and 500 pages i messed up. added percentages for lesson home
commit dee927b460de46e58d1905a8a41bea85a028c931
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 15:53:07 2021 +0800
final update #1
commit be3e31809d5c1c5923a8e4067088d15ed216ff41
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 15:47:24 2021 +0800
fixed lesson 3, updated todo list
commit cc8763e460804256187aea159c93e574e7c77375
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 15:20:20 2021 +0800
removed test #3
commit 423af7786008148c935a8a962df98087fb71cd2a
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 15:19:16 2021 +0800
readme changes
commit 69a3bc8f77e2bd1e5fdba0fb85fc6cda5ee6e58a
Merge: 52c2bca 90ceaa7
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 15:11:46 2021 +0800
Merge branch 'main' into working_Jordan
commit 90ceaa7239a5432ae9d1e835ddc43f7db491ad07
Merge: 380c4a8 569201e
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 15:10:55 2021 +0800
Merge branch 'main' of https://github.com/Kanealex/pokertutorial into main
commit 380c4a85af7f3b1d2d95cca76549ee1dfe7d1867
Merge: b3cd180 8a2c706
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 15:10:48 2021 +0800
Merge branch 'workingbranchJake'
commit 569201efa9982d82a4dc2f63de830235bde2d8a1
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 15:06:15 2021 +0800
updated login
commit 9d793db71a8f0f78c3948211c8204967bf624ae6
Merge: 4efc533 65d9ea5
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 15:04:28 2021 +0800
Merge branch 'main' of https://github.com/Kanealex/pokertutorial into main
commit 8a2c706475635920731a61ed6625e70351b1e082
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 15:04:17 2021 +0800
commenting of all pages
commented everything :) :+1:
commit 52c2bcacc794b0254c37cd5ac816e2d941a54469
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 15:04:14 2021 +0800
selenium update #3
commit 4efc533506bb02a2b1c54e6a876b80904f048752
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 15:03:48 2021 +0800
changed sign in and register page
commit 65d9ea5a82b37d46bd30fec8cc348100a93482ca
Merge: 318ddc8 1986a3f
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 14:10:08 2021 +0800
Merge branch 'main' into working_Jordan
commit 318ddc857f0142e256e91ea588ad245c4226edbc
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 14:09:15 2021 +0800
added lesson login test
updated selenium
commit 5fc31833d890d836d17a2735fa5cacc10ab65453
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 13:55:27 2021 +0800
log file added
commit 18d8c54c4b0953b3cf5d290f8ad6d5cf4e664349
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 17 13:51:05 2021 +0800
quizzes style edits and functionality changes, background changes
commit 6fa930e110f477b771e065129e81bd6b558bd0c4
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 17 13:42:36 2021 +0800
update tests.py
commit 660793df11bde68df0615cd16e53da64e48e51ee
Merge: 398c1c9 3b13c65
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 12:22:33 2021 +0800
Merge branch 'workingbranchJake'
commit 3b13c6583806f0c1a20213712e69c838a07075a1
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 17 12:21:39 2021 +0800
Added some testing stuff
python unit tester
commit c162a728df2b5f79e84ddce4c68245f62c01db0e
Merge: fce697f 66ec20d
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Sun May 16 19:21:55 2021 +0800
Merge branch 'workingbranchJake'
commit fce697f11877137405bf69aef36ec51783eb3861
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Sun May 16 19:21:52 2021 +0800
Added many extra users and quiz data for them
commit 66ec20d712d4c00eccb7cf9c9b47c87f7ac8561b
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Sun May 16 19:21:01 2021 +0800
html, css and js validated, removed unecessary js and css files, updated TODO list
added all remaining tasks to TODO.txt, removed unecessary charts js and css, edited all html and css files to be compliant with the validators, Removed the locked lessons page and put the functionality of it onto the regular lessonshome page, other minor fixes
commit 20daaa2ebbadae5f9d7e6baa876cabc266b5fca9
Merge: 529d9c4 6ea6b8b
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Sun May 16 16:52:03 2021 +0800
Merge branch 'workingbranchJake'
commit 529d9c4104915cf96b5c6729486470d66767c11b
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Sun May 16 16:51:58 2021 +0800
Update pokerdb.db
commit 6ea6b8bed0593e1073512cade864c2b238d9e9ac
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Sun May 16 16:51:15 2021 +0800
Added many db entries. Quizzes are now locked until passing previous quizzes
Must get a passing grade in the previous quiz to unlock the next one. Added final quiz to the lesson page. Added lots of new users and their scores to the database
commit be6d16667558a1be9b4c9e7464367da8eb714722
Merge: 765fc61 7e20be8
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Sun May 16 14:59:26 2021 +0800
Merge branch 'main' into workingbranchJake
commit 765fc61c3e7d9b5d86fb4435e26976b19abb65cd
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Sun May 16 14:59:05 2021 +0800
Update pokerdb.db
new scores
commit 7e20be868de652520d9cf4549c35e21b7c87c8c0
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Sat May 15 17:37:47 2021 +0800
final quiz questions added
commit 79a2e1b0c260349306634922521ae91163323d09
Merge: 3170ea8 e9a4ca0
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Sat May 15 17:21:45 2021 +0800
final quiz work
commit e9a4ca09f499ee569e47d64a28279b5eb527726d
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Sat May 15 17:19:22 2021 +0800
final quiz shows correct or inncorrect
commit 3170ea858dc6e228632aca482cc0bb59614b85f3
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Sat May 15 16:43:33 2021 +0800
change to polar #2
sorry forgot to remove some things
commit 0e04814729aaff61fd61f7e010662714724a3cd4
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Sat May 15 16:39:09 2021 +0800
Added Total User to polarchart
Changed doughnut to polar
commit 3253a341c396920f9e62b4e24e431bb37e5733f3
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Sat May 15 16:13:59 2021 +0800
Added final quiz results to graphs
commit 3269a707eb7409cfc52df2c830eaffb35c83fc01
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Sat May 15 16:03:06 2021 +0800
Quiz Question Update
added poker related questions
also confirmed properly linked to graphs
commit 390b293cced0beeabc19e9f62752f004a87d55e3
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Sat May 15 15:45:38 2021 +0800
Stats Charts + Other Charts Updates
Fixed btstrap of charts and connected them to DB
Stats now has charts
commit 1960160b93a0917bb31f067b5552213f11af71cb
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Sat May 15 12:36:40 2021 +0800
Read Me Update + Minors
Push Before Writing the Testing
Updated Read Me to answer the proj reqs
Removed from user results after Your Results: (It looks cleaner)
Linked bar to {avgs}
commit e905d818e4dc8bd8c14582b046091f4468676e8d
Merge: b7bf43c 1abad9e
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Fri May 14 23:52:44 2021 +0800
final quiz work
commit 1abad9e13ea9888fd6a567961ff48208003a9108
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Fri May 14 23:51:11 2021 +0800
final quiz selection working
commit 1ac1c5ae7bbc299d4a762fe53207be965ac98681
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 22:33:18 2021 +0800
Update pokerdb.db
commit 334978096fc42d297636a2084500fd9fb738088e
Merge: db21ef7 b7bf43c
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 22:33:02 2021 +0800
Merge branch 'main' into workingbranchJake
commit b7bf43cfe20eafacd4784a23d0ec2b2fc719ae83
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 22:30:26 2021 +0800
Update pokerdb.db
commit db21ef75d9194e1004d2041466338b0b86d1a369
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 22:30:04 2021 +0800
final quiz
added final quiz to db and stats page
commit 3b41923666e4bbd6055b15e1a6202947a944c53c
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Fri May 14 22:23:29 2021 +0800
added final quiz to db
commit 3acde067c84cb20bf13a4b8ed33ffee6a31f3cbd
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Fri May 14 22:03:32 2021 +0800
db changes
commit d5b14f577df9df6090f75d8e029b0a0112c496e7
Merge: 6d7579d 55b92c9
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Fri May 14 22:00:00 2021 +0800
final quiz work
commit 55b92c9edf53fa863516528276fddda2bf93c817
Merge: fdd19b4 f199b15
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 21:58:36 2021 +0800
Merge branch 'workingbranchJake'
commit fdd19b44acaa5ac8db9ce794d46c9da9c9636fb5
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 21:58:32 2021 +0800
Update pokerdb.db
...
commit f199b15316f64122a76342baa52b6cd27d421e39
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 21:57:15 2021 +0800
Working charts with data from db
charts now pull data from database on creation.
commit 6d7579d90ead13f66ae4786f165d9038cf0ea3c2
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Fri May 14 21:56:45 2021 +0800
final quiz, js and html for final quiz works!
commit 5c5debf793cb6b66fc063f0393429064f677b0ec
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Fri May 14 19:38:38 2021 +0800
final quiz setup
commit f5ee7ebebb47fd81346a9530aa6e19fd1188c211
Merge: bf53f0e 4ddc3be
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 18:13:56 2021 +0800
Merge branch 'workingbranchJake'
commit bf53f0e148c2956da82dd2b3f737c8a0f74d82b1
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 18:13:53 2021 +0800
Update pokerdb.db
commit 4ddc3be49fa07ecd9796203d81484b78c06bc36c
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 18:13:18 2021 +0800
lesson3 fix
Fixed lesson3 quiz
commit 5db30348f2967ae1a32a324cbe8780e9b68a232f
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 17:42:41 2021 +0800
added database to gitignore
too many unnecessary commits from database changes
commit b01e70aba6d98262eaceac260e00e9b925e19a3e
Merge: 4d3656e 4f6821f
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 17:40:39 2021 +0800
Merge branch 'main' into workingbranchJake
commit 4d3656e6755cfb4b502b3f3e86be151de1467391
Merge: de7ac86 f49aba7
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 17:39:25 2021 +0800
Merge branch 'workingbranchJake' of https://github.com/Kanealex/pokertutorial into workingbranchJake
commit de7ac8648678d76fed6785ac2e674d531783e268
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 17:39:20 2021 +0800
Merge branch 'workingbranchJake'
commit 4f6821f2bb512461764e9a6fd98625f92b73ecab
Merge: 982619e f49aba7
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 14:34:23 2021 +0800
Merge branch 'workingbranchJake'
commit 982619ef700f0dce3afc4a809712fa5f4ed09e15
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 14:34:19 2021 +0800
Update pokerdb.db
still requires update for every commit FIX
commit f49aba7c18be9a0111c1ab4b3b350409a7b520e9
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 14:33:21 2021 +0800
Cleanup of code
Added pass or fail colours for quiz results. Edited other code
commit 5a0c1adfcef07942c2b3f1a7159a82120308bf17
Merge: b09ee90 d159370
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 11:58:15 2021 +0800
Merge branch 'workingbranchJake'
commit b09ee9001e97954607556fa5c086011fcb297ca1
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 11:58:10 2021 +0800
Update pokerdb.db
how do we fix this, dont want to double commit every time the db changes
commit d1593706424170982ad4b6abc75bdc9d175bcdc3
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 11:55:49 2021 +0800
Quiz formatting
added better looking buttons to the Quizzes
commit 53e96ae9fa8b478b85e2fb043b2eeb02a88db165
Merge: 5d6f3b6 050a850
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 11:22:55 2021 +0800
Merge branch 'workingbranchJake'
commit 5d6f3b6e8814dd11ef1e141ad31d5adf4a6c1b26
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 11:22:28 2021 +0800
Update pokerdb.db
commit 050a850938dd65d1bfbf1e6bbe35aaa7be82a06e
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 11:19:34 2021 +0800
Quiz now fully dynamic and modular for each lesson
very cool! Now every quiz can easily be edited from the JS, and only a single JS file is needed for all of the quizzes
commit 69c2d3bd929c85cb40cdb0292385686499061ebf
Merge: 6339ed2 686d66b
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 10:08:23 2021 +0800
Merge branch 'main' into workingbranchJake
commit 6339ed25fe8ad703ec82aef911af58d8f5960760
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Fri May 14 10:06:51 2021 +0800
fixing merge conflicts
commit 686d66bbeff7448e041df315a33e260c09273746
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 20:46:46 2021 +0800
fixing merge conflicts
commit 28107a35ddcdd848009e36b99f6c81f3c1799fda
Merge: 52f44fb 929a064
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 20:37:37 2021 +0800
merging jake and kanes work
commit 929a06479a812777b9cb529039dc834a7d1431a8
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 20:28:34 2021 +0800
lesson 3 gif and image additions
commit 52f44fb7b94d1df8ceac02a5e606b4bea092e86a
Merge: 2585490 d95ec60
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Thu May 13 20:23:15 2021 +0800
Merge branch 'workingbranchJake'
commit 25854908f810f529bfce5dda31161ca6aa51529d
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Thu May 13 20:23:04 2021 +0800
Update pokerdb.db
commit d95ec60422f0a984f9ff372733867181590f770e
Merge: d31a483 22051ea
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Thu May 13 20:22:22 2021 +0800
Merge branch 'main' into workingbranchJake
commit d31a483ed462621ffb4e60d139f00bde85f202e8
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Thu May 13 19:46:50 2021 +0800
better quiz for lesson 1
next try and make the JS more general to use for all 3 quizzes
commit e7cba48cc24fb96a13bb0b774c93a6670d34c3f9
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 18:30:45 2021 +0800
working flop/turn/river stills with gifs!
commit 784d8225b8693bc31ac7b6548242c2ad99b05338
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Thu May 13 17:05:52 2021 +0800
Working quiz database for question 1
successful form submission into the database to record quiz scores for the current user
commit 22051eae1357eb4723bfc6f21fa8475075421864
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 15:55:10 2021 +0800
lesson 2 complete revamp- now with clickable cards!!
commit 179c9de5ff801c3af47f27782b1c73bcbbbb2fa7
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 13:26:29 2021 +0800
home page work
commit b815bec1b2df59bebd4f1c03f9088c0f46013ad5
Merge: e93585a 7441848
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 11:23:29 2021 +0800
minor tweaks
commit e93585a2e49ddb95874f8e3756d4a19b527a162c
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 11:16:42 2021 +0800
minor bug tweaks
commit 74418480ddafe834fe3a94bc3ee85e57f03c282e
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Thu May 13 11:06:13 2021 +0800
moved css from lesson html to own css file
commit 2f89d3af401207b5ef15c510d95d361d63f25f1e
Merge: 7b590d2 c5f18ba
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Wed May 12 22:24:17 2021 +0800
Merge branch 'main' of https://github.com/Kanealex/pokertutorial
commit 7b590d2e44502c11ad7a4062479785cad2ae1f64
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Wed May 12 22:23:20 2021 +0800
lesson1 complete
commit c5f18ba514c7186efdf48f20163fdb8a3303639c
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Wed May 12 13:37:24 2021 +0800
Update routes.py
commit 47010527de2558800c4a875831e82e691e97ab49
Merge: 4dae85f 235b869
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Wed May 12 13:35:27 2021 +0800
Merge branch 'main' into workingbranchJake
commit 4dae85f169fe6f035232d88abe66fbd718f0af70
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Wed May 12 13:35:13 2021 +0800
Quiz submission attempt 1
commit 235b869ea18f251586b3327471891eee4e93bd5b
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Wed May 12 12:21:06 2021 +0800
card flipping fully functional
commit c9290509aa217903ef900b2e66c221633c503a7b
Merge: c384a1b d905609
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Tue May 11 21:44:31 2021 +0800
Merge branch 'main' into workingbranchJake
commit c384a1b56c9db6ec714943f886f794351463d658
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Tue May 11 21:43:50 2021 +0800
added flipper back for some reason
i hate this
commit d905609d45456c9811589fd58e05ba538dd2a62f
Merge: 5f5aee5 e6f4102
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Tue May 11 21:33:37 2021 +0800
Merge branch 'main' of https://github.com/Kanealex/pokertutorial into main
commit 5f5aee5b68997e8416d7ddd96d0c801ecda277e7
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Tue May 11 21:33:32 2021 +0800
flipping cards
commit e6f410209bc16138c7895d4967eed554064aa9bd
Merge: 934bcf4 e430dd9
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Tue May 11 21:29:00 2021 +0800
Merge branch 'working_Jordan'
commit e430dd9f9f9dc328b23e0cd9fd548f8180a11cf8
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Tue May 11 21:28:35 2021 +0800
Chart ACTUALLY WORKING
nice.
commit 934bcf4b093ff2a89b798d10559025d8feed4249
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Tue May 11 21:19:29 2021 +0800
fixed the ++ error
commit 0bae60dc1404b0f9983d152e0ea93f05137b9d18
Merge: 6eb0025 be7ac64
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Tue May 11 19:47:07 2021 +0800
Merge branch 'working_Jordan'
commit 6eb00256a1d65949dc3fec7f50f239879053a727
Merge: e05946a e1b3e61
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Tue May 11 19:46:16 2021 +0800
Merge branch 'main' of https://github.com/Kanealex/pokertutorial into main
commit be7ac645b6de3d62316eeb648f60c0fb6ef1eb5a
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Tue May 11 19:45:56 2021 +0800
"Working" Charts Update
.js not linked
commit e1b3e61f9e20fbf6978eea629f29253fef255252
Merge: 0c92e61 3ed2ad3
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Tue May 11 19:23:22 2021 +0800
Merge branch 'main' of https://github.com/Kanealex/pokertutorial into main
commit 3ed2ad3eeed0b8db742e69e2a17d05cd085c3f26
Merge: 7b099fc 214c3bd
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Tue May 11 19:20:39 2021 +0800
Merge branch 'workingbranchJake'
commit 214c3bd0ad4ce89f6f7021ec236e424d215953e4
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Tue May 11 19:20:12 2021 +0800
littls JS edits
commit e05946a6878906f3138c02c94d733332a2c8a0e8
Merge: 8704f29 7b099fc
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Tue May 11 18:57:39 2021 +0800
Merge branch 'main' of https://github.com/Kanealex/pokertutorial into main
commit 7b099fc070cc35344f880bf3c2ad33c1c66828f9
Merge: fa93bf8 9851d22
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Tue May 11 17:15:57 2021 +0800
Merge branch 'workingbranchJake'
commit 9851d22c5edef4c4e8db31f319ff45e4b05b34f7
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Tue May 11 17:15:17 2021 +0800
working quiz for lesson 1
commit 8704f29d141eeb246ffc595ecb34b444a9762362
Merge: fa93bf8 895ec54
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Tue May 11 16:35:30 2021 +0800
Merge branch 'working_Jordan'
commit 895ec54c591677cf385b9a509c2112ca2517dc83
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Tue May 11 16:35:05 2021 +0800
Chart Addition Start
Added cool chart. need to link to db results with an array?
commit 0c92e61e2114584df25237e14750fe4427be98e2
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Tue May 11 15:10:56 2021 +0800
minor css changes
commit fa93bf854612694ab36a7c09e807d62d4facadc0
Merge: 818c599 4013272
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Tue May 11 12:31:48 2021 +0800
more lessonshome work
commit 818c599be0d0c36f5aed8c2ca39beb2f9b7ab762
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Tue May 11 12:28:52 2021 +0800
lesson home work, colour changing options
commit 40132728b0697b3a2ecb36fc41e3fb00c327282f
Merge: 4d4ef0e 2ab9b78
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 10 21:11:29 2021 +0800
Merge branch 'workingbranchJake'
commit 2ab9b78b9dbd7fa774ad077a2b145baa058cd54d
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 10 21:10:44 2021 +0800
Mostly DB stuff
commit 4d4ef0e84cdefaf1ad1945b92052d8570001d445
Merge: ab7f007 4b9b82b
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 10 21:10:13 2021 +0800
Merge branch 'working_Jordan'
commit 4b9b82bfdd3191f110ee645e0f087c10b3ea8020
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 10 21:09:44 2021 +0800
comments
commit ab7f00774bf25a9fa4cc147f6143cc39bdea5ab3
Merge: 588e49e 6997ffe
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 10 21:07:48 2021 +0800
Merge branch 'workingbranch_kane' into main
commit 588e49ef199edd1baf7fcc66058741c03c1bfc6f
Merge: 210b320 8627bef
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 10 21:04:50 2021 +0800
landing page work
commit 6997ffeaf232c80c102525b1d54dd2a497e391f6
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 10 21:03:54 2021 +0800
confirmed landing page work
commit e0945e87788a9c8079ea035a1b9a0f4084875689
Merge: cc7d442 210b320
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 10 21:02:10 2021 +0800
merge with working
commit 210b320db951fdf8665b39f98f89e6830ba8b928
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 10 21:01:38 2021 +0800
landing page work
commit f80adf77f7fc6d33bae268040968432a5cffa5d3
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 10 21:01:02 2021 +0800
landing page work
commit 8627bef5f38c9afac7362646206331d70848f9ab
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 10 20:49:33 2021 +0800
lesson updates #itscontenttime
commit e574c167759b63f01c55bde6f263bccbcac76344
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 10 19:51:21 2021 +0800
update link begin learning
commit f19a7484e9c2d86455cbd48239fee05efae99843
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 10 19:51:05 2021 +0800
Update lessonshome.html
commit f86f0d81584af27f54af08df30cb41df974b9593
Merge: aa6fd0d 6934ab5
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 10 19:42:41 2021 +0800
Merge branch 'main' into working_Jordan
commit 6934ab5a56c7c9706a07d46abffb99163ce2a3af
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 10 19:41:33 2021 +0800
good looking quiz
update to quiz pages
commit aa6fd0dae42adba021583c0b9a20befe063856f6
Merge: 296da97 3211234
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 10 19:32:38 2021 +0800
Merge branch 'main' into working_Jordan
commit 296da974d91dc18e71cd3419b3e85d28e13b32a5
Author: JLhyun <79490049+JLhyun@users.noreply.github.com>
Date: Mon May 10 19:32:17 2021 +0800
removed small things
commit 32112340778a7fd7614a0b82eb912ba2b258039e
Merge: 461456d 8c9a43a
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 10 18:20:41 2021 +0800
Merge branch 'workingbranchJake'
commit 8c9a43a0bde18bb8062ac48bc0737950d497b10a
Author: JakeL1001 <jakelyell@iinet.net.au>
Date: Mon May 10 18:20:21 2021 +0800
MCQ update
commit 461456d2a63aa403f7ce3a6fa234eec535ebebee
Author: Kanealex <72069221+Kanealex@users.noreply.github.com>
Date: Mon May 10 18:19:28 2021 +0800