-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathcommit_log.txt
5678 lines (5676 loc) · 207 KB
/
commit_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
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 a4e1b4e88977344a4b8f1ea3a295b3e35ca32fdd (HEAD -> main, origin/main, origin/HEAD)
|\ Merge: 60e1d57 b0264c2
| | Author: Martin Evans Laptop <[email protected]>
| | Date: Mon May 22 10:29:11 2023 +0800
| |
| | Merge branch 'main' of https://github.com/SodaVolcano/CITS3403_Web_Project
| |
| * commit b0264c23c41664661ec2933230fb888fcc6c7f62
| |\ Merge: 458b514 9a86df2
| | | Author: SodaVolcano <[email protected]>
| | | Date: Mon May 22 09:54:41 2023 +0800
| | |
| | | changed background to svg
| | |
| | * commit 9a86df23e5ce568110c9410229cb5420c95abff4
| | |\ Merge: 7555494 d6ae791
| | | | Author: Cohen Rafiq <[email protected]>
| | | | Date: Mon May 22 09:53:07 2023 +0800
| | | |
| | | | Merge pull request #79 from SodaVolcano/tinchi/idkman
| | | |
| | | | Tinchi/idkman
| | | |
| | | * commit d6ae791cd9ff1e67bcbd0551345b7a30de85a960 (origin/tinchi/idkman)
| | | |\ Merge: 0af072f 7555494
| | | |/ Author: Cohen Rafiq <[email protected]>
| | |/| Date: Mon May 22 09:52:13 2023 +0800
| | | |
| | | | Merge branch 'main' into tinchi/idkman
| | | |
| | | * commit 0af072fa8f51c61cda619d808e3f0370eec90e63
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sun May 21 22:16:44 2023 +0800
| | | |
| | | | ts
| | | |
| | | * commit a8fbe17c8bf410a728830a61cd3de7b5279762f3
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sun May 21 22:14:53 2023 +0800
| | | |
| | | | added background, init to first conversation reverse chronological order
| | | |
| * | | commit 458b51440a2b12d4b26463ce054ccf904094de73
| |/ / Author: SodaVolcano <[email protected]>
| | | Date: Mon May 22 09:54:30 2023 +0800
| | |
| | | changed background
| | |
* | | commit 60e1d574e9c9619f1684bfc4b1f9ab05d4aaa1d1
|/ / Author: Martin Evans Laptop <[email protected]>
| | Date: Mon May 22 10:29:00 2023 +0800
| |
| | changed to try catch
| |
* | commit 7555494851da653238a0f129bb3ebac742cff59e
|\ \ Merge: b2b7a71 3b76bba
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun May 21 22:47:09 2023 +0800
| | |
| | | Merge branch 'main' of https://github.com/SodaVolcano/CITS3403_Web_Project
| | |
| * | commit 3b76bbab569a63840d921e0bcdb83848b0cfaf01
| | | Author: Tin Chi Pang <[email protected]>
| | | Date: Sun May 21 22:28:18 2023 +0800
| | |
| | | Update README.md
| | |
* | | commit b2b7a71eaf39749e606b454be382f22bbc6e2dea
|/ / Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 22:47:05 2023 +0800
| |
| | validation changes
| |
* | commit febdd64f14533a3b3b7fcadf1a7f0d8cfc800d6c
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 22:17:14 2023 +0800
| |
| | added chat background
| |
* | commit bad8913531218b6d2004c9e0147b70e294d7cff7
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 22:07:59 2023 +0800
| |
| | removed run command
| |
* | commit c5e049fb860cd4ee63d10ed48614e7cc038b97b0
|\| Merge: f87cee2 e08ed22
| | Author: Tin Chi Pang <[email protected]>
| | Date: Sun May 21 22:03:26 2023 +0800
| |
| | Merge pull request #78 from SodaVolcano/tinchi/idkman
| |
| | automated db init
| |
| * commit e08ed229d18e35ad26468ed198de1600a429d2c1 (tinchi/idkman)
| | Author: SodaVolcano <[email protected]>
| | Date: Sun May 21 21:52:18 2023 +0800
| |
| | idk
| |
* | commit f87cee231918e430219419857f7354441a09fc3c
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 21:17:52 2023 +0800
| |
| | display converastions on new chat
| |
* | commit 89d8cc73867097af9e19038c9040b21ef1c74b4d
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 21:15:46 2023 +0800
| |
| | switch conversation on first
| |
* | commit f259a221c6ec15794f973c82138057785b9b0769
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 21:08:54 2023 +0800
| |
| | fixed gpt response
| |
* | commit 7199fc8e4beeeead994456c3103997fb67939b34
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 21:08:26 2023 +0800
| |
| | added random mode if gpt is broken
| |
* | commit 6ed2d80c17870bc56a30a997fe6efcbe5ccd736c
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 21:00:19 2023 +0800
| |
| | another unknown var
| |
* | commit 725de7803dee40312151068dc42417dc7d06bc9c
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 20:59:13 2023 +0800
| |
| | removed fake req
| |
* | commit b9f457f86869b590205c33296685499af97cb848
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 20:56:34 2023 +0800
| |
| | upodated requirements
| |
* | commit 8a6df5f939ea776221eca8ba042282c80b06443f
|/ Author: Martin-EvansUWA <[email protected]>
| Date: Sun May 21 20:48:30 2023 +0800
|
| added random change
|
* commit d57e15d7cadec96eeb01ce1f3dff544d5aa5fc7e
| Author: SodaVolcano <[email protected]>
| Date: Sun May 21 20:29:02 2023 +0800
|
| deleted files and folders
|
* commit b12ec341b29e3c5f1b25646180965eefc54e6761
|\ Merge: 2c28f9f f21f8ea
| | Author: Tin Chi Pang <[email protected]>
| | Date: Sun May 21 19:58:27 2023 +0800
| |
| | Merge pull request #74 from SodaVolcano/tinchi-fix/textarea
| |
| | fixed size of textarea
| |
| * commit f21f8ea4adecd280ecbed730d093720742fd40bc (origin/tinchi-fix/textarea, tinchi-fix/textarea)
| | Author: SodaVolcano <[email protected]>
| | Date: Sun May 21 19:56:56 2023 +0800
| |
| | fixed size of textarea
| |
* | commit 2c28f9fe2fa3321b5a4e1053b3668c166f26521c
|\ \ Merge: 33ce35d 65e1290
| |/ Author: Tin Chi Pang <[email protected]>
|/| Date: Sun May 21 19:56:25 2023 +0800
| |
| | Merge pull request #73 from SodaVolcano/cohen-fix/more-stuff
| |
| | fixed hamburger js
| |
| * commit 65e12909762804ff969b16f248153117b8db0017 (origin/cohen-fix/more-stuff)
| | Author: 23348918 <[email protected]>
| | Date: Sun May 21 16:16:07 2023 +0800
| |
| | fixed hamburger js
| |
* | commit 33ce35d8004c987a050cf95c7a53818f61beeae8
|\ \ Merge: f0239f5 002ee63
| |/ Author: Tin Chi Pang <[email protected]>
|/| Date: Sun May 21 18:46:14 2023 +0800
| |
| | Merge pull request #72 from SodaVolcano/martin/gpt
| |
| | Martin/gpt
| |
| * commit 002ee63cebe6608aa12abbf6bb1e132def599fb1 (origin/martin/gpt)
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 15:59:41 2023 +0800
| |
| | readme
| |
| * commit 7598f99b32953d6b9b84b1e068cf323c61007686
| |\ Merge: de152a5 21c25bd
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun May 21 15:58:44 2023 +0800
| | |
| | | Merge branch 'martin/gpt' of https://github.com/SodaVolcano/CITS3403_Web_Project into martin/gpt
| | |
| | * commit 21c25bdb279f9cdf52a603d01eaf6e442a73d98d
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun May 21 07:51:03 2023 +0000
| | |
| | | Automated changes
| | |
| * | commit de152a54cbe3f3b33776e1d2c6a485132214ebd7
| |/ Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 15:52:59 2023 +0800
| |
| | added gpt test
| |
| * commit 830d74c5cf9ec4fcfb3f79cb06beb92aa17d0a33
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 15:50:23 2023 +0800
| |
| | first gpt commit
| |
| | * commit 193c1beed425c188fb6bed43e8d3a791847ac191 (origin/martin/selenium)
| |/ Author: Martin-EvansUWA <[email protected]>
|/| Date: Sun May 21 16:33:23 2023 +0800
| |
| | removed sel py files
| |
* | commit f0239f55ca224ca5119763280af205f0fb7bc695
|\ \ Merge: 9ffcf25 6070773
| |/ Author: Martin-EvansUWA <[email protected]>
|/| Date: Sun May 21 15:54:42 2023 +0800
| |
| | Merge pull request #71 from SodaVolcano/cohen-fix/login-signup
| |
| | fixed login sign up (hopefully)
| |
| * commit 60707737d2834d62cad49b7860c1fd58578eb870 (origin/cohen-fix/login-signup)
| | Author: 23348918 <[email protected]>
| | Date: Sun May 21 15:18:41 2023 +0800
| |
| | fixed login sign up (hopefully)
| |
* | commit 9ffcf254c61ece28c5802d926b8536b45ab61608
|\ \ Merge: a09bf35 566b885
| | | Author: Cohen Rafiq <[email protected]>
| | | Date: Sun May 21 15:04:03 2023 +0800
| | |
| | | Merge pull request #70 from SodaVolcano/martin/conversation-order
| | |
| | | Martin/conversation order
| | |
| * | commit 566b885a5a08573b41f153d8ba5320902d6e1945 (origin/martin/conversation-order)
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun May 21 14:49:42 2023 +0800
| | |
| | | bot display
| | |
| * | commit a3277f96f544d9827d4bdb48b3886e27cc102885
| |\ \ Merge: 4d68e2b 9658278
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sun May 21 14:34:07 2023 +0800
| | | |
| | | | Merge branch 'martin/conversation-order' of https://github.com/SodaVolcano/CITS3403_Web_Project into martin/conversation-order
| | | |
| | * | commit 9658278c4e25e4f046f09914c45ada216bce6172
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sun May 21 06:25:09 2023 +0000
| | | |
| | | | Automated changes
| | | |
| * | | commit 4d68e2b296895e4ebd8b747c17069b0686cd7527
| |/ / Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun May 21 14:33:46 2023 +0800
| | |
| | | chronological order of conversations
| | |
| * | commit f5b7a7c5371a7550c1ac9864be9c2f0d8d201545
|/ / Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 14:24:30 2023 +0800
| |
| | fixed message display
| |
* | commit a09bf35b5df92b3c0da9a7290cd36110347e47df
|\ \ Merge: 756f800 783c040
| |/ Author: Martin-EvansUWA <[email protected]>
|/| Date: Sun May 21 13:58:54 2023 +0800
| |
| | Merge pull request #54 from SodaVolcano/cohen-fix/reload-issue
| |
| | Cohen fix/reload issue
| |
| * commit 783c040de1a6a334af86d58028e5eae97b5c8560 (origin/cohen-fix/reload-issue)
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 05:51:43 2023 +0000
| |
| | Automated changes
| |
| * commit e9b7116064b2c50bb55c10144413232d642ed590
| | Author: Martin-EvansUWA <[email protected]>
| | Date: Sun May 21 13:51:08 2023 +0800
| |
| | deleted scroll.css
| |
| * commit 94a3d804c6fe0433fecad1062c2a7d24a130dd69
| |\ Merge: ff81add 0ca1a23
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun May 21 13:50:55 2023 +0800
| | |
| | | Merge branch 'main' into cohen-fix/reload-issue
| | |
| | * commit 0ca1a235fcf0496374be15693dad1f8a558bdb32
| |/ Author: Martin-EvansUWA <[email protected]>
|/| Date: Sun May 21 12:23:42 2023 +0800
| |
| | more tests
| |
* | commit 756f800dfd89b151e2a9bb493c06e9a6e8a46db1 (origin/martin/moredbtests)
|\ \ Merge: d371f68 04107c0
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun May 21 11:30:56 2023 +0800
| | |
| | | Merge pull request #69 from SodaVolcano/cohen-feat/website-looks
| | |
| | | Cohen feat/website looks
| | |
| * | commit 04107c0b0793c51cf7dd9016efaad3524a1685c9 (origin/cohen-feat/website-looks)
| | | Author: 23348918 <[email protected]>
| | | Date: Sat May 20 22:10:22 2023 +0800
| | |
| | | fixed fonts
| | |
| * | commit d6de16168d02241039d20b89b0c628d8de116be2
| |\ \ Merge: 28ef0df a37768c
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sat May 20 21:41:07 2023 +0800
| | | |
| | | | Merge branch 'cohen-feat/website-looks' of github.com:SodaVolcano/CITS3403_Web_Project into cohen-feat/website-looks
| | | |
| | * | commit a37768c764c104fc2267f4bd37ddfec7b3f08581
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sat May 20 12:09:59 2023 +0000
| | | |
| | | | Automated changes
| | | |
| * | | commit 28ef0df381801274d38d3b64d69f520ef46a0276
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sat May 20 21:37:52 2023 +0800
| | | |
| | | | start chatting redirects to login if anonymous, added colour to social media hover
| | | |
| * | | commit c03b280b4d45fc5cede12bfb246934509ff7a542
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sat May 20 21:26:19 2023 +0800
| | | |
| | | | fixed hamburger and stopped transition for size change
| | | |
| * | | commit 76e19bc1bc268872db8a8faccf99a8c29a73c84d
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sat May 20 21:02:05 2023 +0800
| | | |
| | | | changed some byline and reviews
| | | |
| * | | commit db4edc439d95df80b1cd75bcf592aea47865a8f2
| |/ / Author: 23348918 <[email protected]>
| | | Date: Sat May 20 20:36:00 2023 +0800
| | |
| | | added new bylines
| | |
| * | commit df9b7e965456503ad35e4d3a4d3769cf84dd3a26
| | | Author: 23348918 <[email protected]>
| | | Date: Sat May 20 20:08:03 2023 +0800
| | |
| | | padded 0s to id
| | |
| * | commit b854cdb100f1fc4fbedfba20b9b0e285a24317d3
| | | Author: 23348918 <[email protected]>
| | | Date: Sat May 20 19:54:48 2023 +0800
| | |
| | | added logo to chat, other changes
| | |
| * | commit 072c97cecfbd7ed09823c5ce18ef8cdb5b45c7e5
| | | Author: 23348918 <[email protected]>
| | | Date: Sat May 20 18:19:55 2023 +0800
| | |
| | | added reviews and changed some images
| | |
* | | commit d371f680efd050cb08ea46b8bfefc0fd241ad92a
|\ \ \ Merge: a521221 46b677d
| |/ / Author: Cohen Rafiq <[email protected]>
|/| | Date: Sun May 21 09:51:29 2023 +0800
| | |
| | | Merge pull request #67 from SodaVolcano/unittest
| | |
| | | dbtests.py
| | |
| * | commit 46b677d082affeb8f12ed9686de84895ac3c2b00 (origin/unittest)
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sat May 20 12:31:25 2023 +0000
| | |
| | | Automated changes
| | |
| * | commit 5a99ca42460228266df14f02999326097e600134
|/ / Author: Martin-EvansUWA <[email protected]>
| | Date: Sat May 20 20:30:49 2023 +0800
| |
| | dbtests.py
| |
* | commit a5212215751c92969b13e07dc2abf00553c13d4a
|\ \ Merge: 9dd78a6 5fdfe36
| | | Author: Cohen Rafiq <[email protected]>
| | | Date: Sat May 20 15:32:26 2023 +0800
| | |
| | | Merge pull request #66 from SodaVolcano/martin/login-fix
| | |
| | | login fixes, new chat dispalys chat
| | |
| * | commit 5fdfe366226561c204deb5e00767b75c25f3341d (origin/martin/login-fix)
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sat May 20 05:54:19 2023 +0000
| | |
| | | Automated changes
| | |
| * | commit 1a9b9fdb75b0023b66d5092c27aa7d146de8f63b
|/ / Author: Martin-EvansUWA <[email protected]>
| | Date: Sat May 20 13:53:43 2023 +0800
| |
| | login fixes, new chat dispalys chat
| |
* | commit 9dd78a637d98f4d379e994b290392d2bbedc512b
|\ \ Merge: a326705 5ed4066
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sat May 20 13:08:02 2023 +0800
| | |
| | | Merge pull request #61 from SodaVolcano/cohen-feat/chat-styling
| | |
| | | Cohen feat/chat styling
| | |
| * | commit 5ed406603acc962333b75f7539299060c12a1a26 (origin/cohen-feat/chat-styling)
| | | Author: 23348918 <[email protected]>
| | | Date: Fri May 12 10:52:56 2023 +0800
| | |
| | | changed format
| | |
| * | commit f718e6afb5c0bfa40db78519c1c24fb872286f36
| | | Author: 23348918 <[email protected]>
| | | Date: Thu May 11 17:28:01 2023 +0800
| | |
| | | general styling
| | |
| * | commit 57c113245e836108a19a189b86c570244e056530
| | | Author: 23348918 <[email protected]>
| | | Date: Thu May 11 13:33:32 2023 +0800
| | |
| | | added robot icons
| | |
| * | commit e4d2ab1871764aa4d9f83dcd02f3365283ab4ca4
| | | Author: 23348918 <[email protected]>
| | | Date: Thu May 11 11:51:11 2023 +0800
| | |
| | | allow selected to be styled
| | |
| * | commit 0e25945fd98f895a882552f6714a8fa24f1407aa
| | | Author: 23348918 <[email protected]>
| | | Date: Thu May 11 10:10:44 2023 +0800
| | |
| | | cleaned reDisplayMessage
| | |
| * | commit ab181de67305256bca7bfea5023e6d72f7940192
|/| | Merge: a326705 93bb09a
| | | Author: 23348918 <[email protected]>
| | | Date: Thu May 11 10:06:24 2023 +0800
| | |
| | | Merge branch 'martin/initconversation' into cohen-feat/chat-styling
| | |
| * | commit 93bb09a4d7dc6e6aae7fdc1db09721b89ea3ec4a (origin/martin/initconversation, origin/cohen-feat/tests)
| | | Author: 23348918 <[email protected]>
| | | Date: Thu May 11 09:51:28 2023 +0800
| | |
| | | fixed empty bubble and rewriting
| | |
| * | commit 7d837ead5c80a917e9b62bc37b24555bd8c9e371
| | | Author: 23348918 <[email protected]>
| | | Date: Thu May 11 09:34:05 2023 +0800
| | |
| | | fixed message typing
| | |
| | * commit ff81add3711521b7cdbe3db23c7637047fea0dda
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sat May 20 13:12:56 2023 +0800
| | |
| | | fixed jinja error in basehtml
| | |
| | * commit 085ca637067e8983858e5ee543de30888ad9fbc7
| | |\ Merge: c6269d4 a326705
| |_|/ Author: Cohen Rafiq <[email protected]>
|/| | Date: Thu May 11 09:02:20 2023 +0800
| | |
| | | Merge branch 'main' into cohen-fix/reload-issue
| | |
* | | commit a326705dddfc637bd045fc99c7c4b13d30817149
|\ \ \ Merge: 85a3e3f ccf1438
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Wed May 10 12:50:08 2023 +0800
| | | |
| | | | Merge pull request #52 from SodaVolcano/cohen-feat/basic-styling
| | | |
| | | | Cohen feat/basic styling
| | | |
| * | | commit ccf14383f05d7e4c8dcdabcf343a17ea140159c0 (origin/cohen-feat/basic-styling)
| | | | Author: 23348918 <[email protected]>
| | | | Date: Wed May 10 12:46:40 2023 +0800
| | | |
| | | | remove text small screen
| | | |
| * | | commit 4c7449568fd6fb33c98e76ad71bfc70761b98655
| | | | Author: 23348918 <[email protected]>
| | | | Date: Wed May 10 12:40:53 2023 +0800
| | | |
| | | | merge fix
| | | |
| * | | commit 81b4e2e10b1cee67c752ca8e78e3e1c60c8edf19
| |\ \ \ Merge: 7f01266 85a3e3f
| |/ / / Author: 23348918 <[email protected]>
|/| | | Date: Wed May 10 12:11:57 2023 +0800
| | | |
| | | | delete about
| | | |
* | | | commit 85a3e3f4385acac9126e7d8729a004613ada0a7d
|\ \ \ \ Merge: b07eaff fd0b578
| | |/ / Author: Cohen Rafiq <[email protected]>
| |/| | Date: Wed May 10 12:02:20 2023 +0800
| | | |
| | | | Merge pull request #53 from SodaVolcano/martin/initconversation
| | | |
| | | | Martin/initconversation
| | | |
| * | | commit fd0b578056657b7185bcbd6a0511cefecb98adf2
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Tue May 9 07:19:21 2023 +0000
| | | |
| | | | Automated changes
| | | |
| * | | commit ad438692d35857bf6475e5e558e7cadfc6b9553a
| | | | Author: Martin Evans Laptop <[email protected]>
| | | | Date: Tue May 9 15:18:31 2023 +0800
| | | |
| | | | stopped messages appearing in alternate conversation
| | | |
| * | | commit 77a335fcab05b7a660547b81aa2f6d10f9276d58 (martin/initconversation)
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sat May 6 20:38:08 2023 +0800
| | | |
| | | | reset timer as well
| | | |
| * | | commit 8f747cca3a80685046ac7f20e08678e38c951cf4
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sat May 6 20:36:53 2023 +0800
| | | |
| | | | added send q before change
| | | |
| * | | commit 3b74bb148543eabf333cec9779c72c55719dd1d6
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sat May 6 20:31:56 2023 +0800
| | | |
| | | | epoch
| | | |
| * | | commit 7db163d3fc73b8d01b96b5cf1f67a4040f78c49c
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sat May 6 20:30:44 2023 +0800
| | | |
| | | | removed epoch
| | | |
| * | | commit 1487f7baa2741e166f9f5ada344857b6ab503ec5
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sat May 6 20:26:03 2023 +0800
| | | |
| | | | fixed db query search on replace db
| | | |
| * | | commit 0ebe17e06c59881b3fbc8f33002c36709d5250bf
| |\ \ \ Merge: dfcaddc f8cac4e
| | | | | Author: SodaVolcano <[email protected]>
| | | | | Date: Sat May 6 20:04:55 2023 +0800
| | | | |
| | | | | .
| | | | |
| | * | | commit f8cac4e32f3bc0f67d399e55310b4d2fc6c03358
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sat May 6 20:00:54 2023 +0800
| | | | |
| | | | | removed excess line
| | | | |
| * | | | commit dfcaddc693576d493a9ae5d0ad8c09c8668a3106
| |/ / / Author: SodaVolcano <[email protected]>
| | | | Date: Sat May 6 20:03:59 2023 +0800
| | | |
| | | | minor fixes
| | | |
| * | | commit 51f3805edae7b567f8d2cafda009952b9d5f7d1a
| |\ \ \ Merge: 4e811a6 875b4c8
| | | | | Author: Tin Chi Pang <[email protected]>
| | | | | Date: Sat May 6 19:59:27 2023 +0800
| | | | |
| | | | | Merge pull request #51 from SodaVolcano/tinchi-fix/chat-double-line
| | | | |
| | | | | Tinchi fix/chat double line
| | | | |
| | * | | commit 875b4c891c4f46bfc6957e8d78206a1e5aa52b60 (origin/tinchi-fix/chat-double-line, tinchi-fix/chat-double-line)
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sat May 6 19:52:06 2023 +0800
| | | | |
| | | | | merge init
| | | | |
| | * | | commit 3e8c236f6cfe425591a7f67ea4fd8e71cd9f2695
| | |\ \ \ Merge: 906563e 4e811a6
| | |/ / / Author: Martin-EvansUWA <[email protected]>
| |/| | | Date: Sat May 6 19:48:39 2023 +0800
| | | | |
| | | | | Merge pull request #50 from SodaVolcano/martin/initconversation
| | | | |
| | | | | Martin/initconversation
| | | | |
| * | | | commit 4e811a6751bc96db41964066779ce3c4df3862d2
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sat May 6 11:48:24 2023 +0000
| | | | |
| | | | | Automated changes
| | | | |
| * | | | commit 699ff8e297e0fada9c412686f7a956f42a0e5694
| |\| | | Merge: 6ade7ee 906563e
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sat May 6 19:47:53 2023 +0800
| | | | |
| | | | | Merge branch 'tinchi-fix/chat-double-line' into martin/initconversation
| | | | |
| | * | | commit 906563eec07586ef40cd302b74a3475d83a8c7ff
| | | | | Author: SodaVolcano <[email protected]>
| | | | | Date: Wed May 3 05:47:16 2023 +0000
| | | | |
| | | | | Automated changes
| | | | |
| | * | | commit acd0dc9863541e87029c0210b6b06f87bb9fef6d
| | | | | Author: SodaVolcano <[email protected]>
| | | | | Date: Wed May 3 13:46:39 2023 +0800
| | | | |
| | | | | fixed some type hinting problems in python
| | | | |
| | * | | commit ddaeae36cdc7ef9c3a1edb43fc048be9a655c0cf
| | | | | Author: SodaVolcano <[email protected]>
| | | | | Date: Tue May 2 18:08:17 2023 +0800
| | | | |
| | | | | temporarily added margin in HTML cause login/signup is annoying me, REMOVE LATER
| | | | |
| * | | | commit 6ade7ee0ac6cd38c87d35452ec8a7e66e29349a9
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sat May 6 19:13:20 2023 +0800
| | | | |
| | | | | adjusted ts file
| | | | |
| * | | | commit 6d06f38a701bf1ae14b25239ff0defc028c9fb76
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sat May 6 17:12:18 2023 +0800
| | | | |
| | | | | db init readme
| | | | |
| * | | | commit 7fe6aa1d81000a27098c8610efea3699674a3e98
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sat May 6 17:06:05 2023 +0800
| | | | |
| | | | | true clear switch
| | | | |
| * | | | commit 5df49962a92e6a45b7d21c5d3b76f900cef70b60
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sat May 6 16:48:58 2023 +0800
| | | | |
| | | | | debugging, removed about and html error
| | | | |
| * | | | commit fee94c7aa03508b7122ba23115963d9dbcff6eeb
| |\ \ \ \ Merge: 6ef376c b07eaff
| |/ / / / Author: Martin-EvansUWA <[email protected]>
|/| | | | Date: Sat May 6 16:25:22 2023 +0800
| | | | |
| | | | | Merge branch 'main' into martin/initconversation
| | | | |
* | | | | commit b07eaff5b05325461400081854d49c9121d9de16
| |/ / / Author: Tin Chi Pang <[email protected]>
|/| | | Date: Sun Apr 30 17:31:37 2023 +0800
| | | |
| | | | added python version
| | | |
| * | | commit 6ef376cededa6e8c07c06291a2852ed81b5888d6
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sat May 6 16:11:20 2023 +0800
| | | |
| | | | reboot chatbot
| | | |
| * | | commit f7b124a7ae7bde559e3d614de473ba53d786a545
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sat May 6 16:07:50 2023 +0800
| | | |
| | | | switch conversaiton
| | | |
| * | | commit 52814efa1bf4913759300826e40855f4fc63c714
| |\ \ \ Merge: f8e5e1f d7e8570
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sun Apr 30 18:09:13 2023 +0800
| | | | |
| | | | | Merge branch 'martin/initconversation' of https://github.com/SodaVolcano/CITS3403_Web_Project into martin/initconversation
| | | | |
| | * | | commit d7e857026ea4a3f325ea6a5acb9dceed51eb6aae
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sun Apr 30 10:07:36 2023 +0000
| | | | |
| | | | | Automated changes
| | | | |
| * | | | commit f8e5e1f6756ba8c4e0723a34eb5eeda3fb13c889
| |/ / / Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sun Apr 30 18:09:09 2023 +0800
| | | |
| | | | adjustment to get request
| | | |
| * | | commit c573e0aafa60eaf56337c39562d082666086e836
| |\ \ \ Merge: 81bbf3a 01d4e55
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sun Apr 30 18:06:59 2023 +0800
| | | | |
| | | | | Merge branch 'martin/initconversation' of https://github.com/SodaVolcano/CITS3403_Web_Project into martin/initconversation
| | | | |
| | * | | commit 01d4e55bbf7c41d5ad532462d35fef78c9cff06c
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sun Apr 30 09:37:50 2023 +0000
| | | | |
| | | | | Automated changes
| | | | |
| * | | | commit 81bbf3a1a087a9b1776d98b6d00cbd2ae98ee795
| |/ / / Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sun Apr 30 18:06:55 2023 +0800
| | | |
| | | | get conversation and replace
| | | |
| * | | commit 51635130a345adfeff30bdb99ced82ebf42ef975
| |\ \ \ Merge: fbcde8d 825f5db
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sun Apr 30 17:37:16 2023 +0800
| | | | |
| | | | | Merge branch 'martin/initconversation' of https://github.com/SodaVolcano/CITS3403_Web_Project into martin/initconversation
| | | | |
| | * | | commit 825f5db8aa55b80c67a14ee5c4b54524a946a103
| | | | | Author: Martin-EvansUWA <[email protected]>
| | | | | Date: Sun Apr 30 09:21:34 2023 +0000
| | | | |
| | | | | Automated changes
| | | | |
| * | | | commit fbcde8d0e672e10fcdab5648dde821c2868f957d
| |/ / / Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sun Apr 30 17:37:12 2023 +0800
| | | |
| | | | added conversation list basic
| | | |
| * | | commit 97bc15a94befd41f3b560957ade8728ff1bb1f36
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sun Apr 30 17:20:57 2023 +0800
| | | |
| | | | get conversations
| | | |
| | * | commit 7f0126645bfb8c36f093b4ce6395c27561a9003b
| | | | Author: 23348918 <[email protected]>
| | | | Date: Tue May 9 14:51:40 2023 +0800
| | | |
| | | | login signup finished
| | | |
| | * | commit 49dc7f2b982c2edb6dee42fd35d256574c6c6d2e
| | | | Author: 23348918 <[email protected]>
| | | | Date: Wed May 3 05:21:34 2023 +0800
| | | |
| | | | finish login signup
| | | |
| | * | commit 4edabeb1041014c1382f543672964dc7d4ed0ecf
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sun Apr 30 16:00:52 2023 +0800
| | | |
| | | | adjusting login box
| | | |
| | * | commit 71d826933d8052e13845a483020436487e2bf416
| | | | Author: 23348918 <[email protected]>
| | | | Date: Sun Apr 30 14:16:25 2023 +0800
| | | |
| | | | started login styling
| | | |
| | | * commit c6269d45a064c61c035a93cd2bd1f7a1c4ce30de
| | | | Author: 23348918 <[email protected]>
| | | | Date: Wed May 10 04:10:40 2023 +0000
| | | |
| | | | Automated changes
| | | |
| | | * commit 56e8bcf7e96f2b41a838200070a9183bc739a520
| | | | Author: 23348918 <[email protected]>
| | | | Date: Wed May 10 12:09:58 2023 +0800
| | | |
| | | | something
| | | |
| | | * commit 258c6b5ca7db7b74b339599a55f2d0ff71f2e28f
| | | | Author: 23348918 <[email protected]>
| | | | Date: Wed May 10 10:31:41 2023 +0800
| | | |
| | | | fixed page shift actually this time (hopefully)
| | | |
| | | * commit 590f626afaac450333930864d62f450b67d7d6d7
| | | | Author: 23348918 <[email protected]>
| | | | Date: Wed May 10 09:38:20 2023 +0800
| | | |
| | | | fixed page shift
| | | |
| | | * commit b4114d75c73a2a1d6d103c39d8a722a4c9b6e2a8
| | | | Author: 23348918 <[email protected]>
| | | | Date: Tue May 9 17:05:00 2023 +0800
| | | |
| | | | changed type bar, fixed small screen
| | | |
| | | * commit 7e4a1c1b32d8e5d38a36137e4c8b3f8c85a5a0aa
| |_|/ Author: 23348918 <[email protected]>
|/| | Date: Sun Apr 30 16:42:27 2023 +0800
| | |
| | | fix error
| | |
* | | commit 1da472f1ee5839fd9b8ee55b461bbb18bdcc3ea4
| | | Author: Tin Chi Pang <[email protected]>
| | | Date: Sun Apr 30 15:58:17 2023 +0800
| | |
| | | added design choices in README
| | |
* | | commit f022a4701cc3b4d4c8a06ca961d0538a6731afe5
|\ \ \ Merge: d658b88 04c61ab
| |/ / Author: Tin Chi Pang <[email protected]>
|/| | Date: Sun Apr 30 15:49:31 2023 +0800
| | |
| | | Merge pull request #36 from SodaVolcano/cohen-feat/type-effect
| | |
| | | Cohen feat/type effect
| | |
| * | commit 04c61ab068f6bcabcc14f7f132736897d76a761c
| |\ \ Merge: 324cfc6 d658b88
| |/ / Author: Cohen Rafiq <[email protected]>
|/| | Date: Sun Apr 30 15:39:14 2023 +0800
| | |
| | | Merge branch 'main' into cohen-feat/type-effect
| | |
* | | commit d658b886737e68656f4e993e916ed4967dcb6690
|\ \ \ Merge: 31aea95 c543532
| | | | Author: Cohen Rafiq <[email protected]>
| | | | Date: Sun Apr 30 15:33:29 2023 +0800
| | | |
| | | | Merge pull request #37 from SodaVolcano/Messages
| | | |
| | | | Messages
| | | |
| * | | commit c54353275a3e378829c55417be159f8ffacc4512
| |\ \ \ Merge: 90271f6 31aea95
| |/ / / Author: Martin-EvansUWA <[email protected]>
|/| | | Date: Sun Apr 30 15:23:48 2023 +0800
| | | |
| | | | Merge branch 'main' into Messages
| | | |
* | | | commit 31aea950c967abcdd6927e782d6c9400c85038f1
|\ \ \ \ Merge: 233b73b c394534
| |_|_|/ Author: Cohen Rafiq <[email protected]>
|/| | | Date: Fri Apr 28 15:09:27 2023 +0800
| | | |
| | | | Merge pull request #33 from SodaVolcano/tinchi-fix/css
| | | |
| | | | Tinchi fix/css
| | | |
| * | | commit c394534407dae4431eda7e65f30c238023cab13a (origin/tinchi-fix/css)
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Fri Apr 28 11:10:19 2023 +0800
| | | |
| | | | remvoed hamburger from child templates what the fuck
| | | |
| * | | commit b86103ac07067218ecfc6fef5ff1f063da1ed6a1
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Fri Apr 28 11:08:09 2023 +0800
| | | |
| | | | moved hamburger to inside <header>
| | | |
| * | | commit bc2bee7886b44f350061985a555de84475f65ae4
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Fri Apr 28 11:01:24 2023 +0800
| | | |
| | | | moved hamburger to base.html
| | | |
| * | | commit b08291055ccc52ecf45784c211d833977893ad5b
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Fri Apr 28 10:58:59 2023 +0800
| | | |
| | | | defered executon of hamburger.js
| | | |
| * | | commit 136fd2ef7c2b572cd97d119055b715e8ad305a00
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Fri Apr 28 10:53:50 2023 +0800
| | | |
| | | | resize textarea when submit text
| | | |
| * | | commit aef28bebbdbf861b0da572bb4a6bff368f4fb39e
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Fri Apr 28 10:46:14 2023 +0800
| | | |
| | | | removed defer
| | | |
| * | | commit 9331f8a1972a50b1b3d059d86ec87fafb50a1cb2
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Fri Apr 28 10:41:44 2023 +0800
| | | |
| | | | forgot to add files Ithink?
| | | |
| * | | commit e76ed32978ef95799993c9b6d1f7f3cce293c472
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Thu Apr 27 10:59:10 2023 +0800
| | | |
| | | | added fixes
| | | |
| * | | commit afe4d255c5d51cd2dc876bbc4a7959c64538db77
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Mon Apr 24 20:53:30 2023 +0800
| | | |
| | | | minor changes for homepage e CSS
| | | |
| * | | commit df14080b07f235fe738dc3c131bcd2fa8af177b4
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Mon Apr 24 18:51:01 2023 +0800
| | | |
| | | | updated URLs in templates
| | | |
| * | | commit 3ec937189b4868b77546a8a6548a7492d2605599
| | | | Author: SodaVolcano <[email protected]>
| | | | Date: Mon Apr 24 18:20:23 2023 +0800
| | | |
| | | | cleaned up HTML - still need to work on sign-in/login HTML
| | | |
| * | | commit ef559125721481c93dd6ae6357408833de9e6a72
|/ / / Author: SodaVolcano <[email protected]>
| | | Date: Mon Apr 24 17:49:56 2023 +0800
| | |
| | | swapped colours with colour variables:
| | |
| * | commit 90271f6a280bb667e66522a0f88cd1c2af803efb
| |\ \ Merge: 19b56d3 e5913c8
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sun Apr 30 15:22:08 2023 +0800
| | | |
| | | | Merge branch 'Messages' of https://github.com/SodaVolcano/CITS3403_Web_Project into Messages
| | | |
| | * | commit e5913c87bcf56b5eeb392e99b2048fded93bcc2e
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Sun Apr 30 07:05:59 2023 +0000
| | | |
| | | | Automated changes
| | | |
| * | | commit 19b56d370b8ea7d7d3efe76f9f0e135f2421197c
| |/ / Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun Apr 30 15:22:04 2023 +0800
| | |
| | | fixing login and typesciprt
| | |
| * | commit 1278a57c789967d7e769b8d9d082d41f463cf4b8
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Sun Apr 30 15:05:12 2023 +0800
| | |
| | | removed flask sesiobn
| | |
| * | commit d14c8095fbb7038f0814d70f463d970fb18dce77 (origin/Messages)
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Fri Apr 21 03:00:07 2023 +0000
| | |
| | | Automated changes
| | |
| * | commit 9019fdd5d626573df2f16e59193400d98c4ad4b9
| | | Author: Martin-EvansUWA <[email protected]>
| | | Date: Fri Apr 21 10:59:24 2023 +0800
| | |
| | | added robot
| | |
| * | commit 081d86e9f8b91f2cff3285b8c39f240f37d425bb
| |\ \ Merge: 66d2ca1 7755f81
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Fri Apr 21 10:46:59 2023 +0800
| | | |
| | | | Merge branch 'Messages' of https://github.com/SodaVolcano/CITS3403_Web_Project into Messages
| | | |
| | * | commit 7755f812c756b47b65640cb87fdcb8a282e833c7
| | | | Author: Martin-EvansUWA <[email protected]>
| | | | Date: Fri Apr 21 02:45:13 2023 +0000
| | | |
| | | | Automated changes
| | | |
| * | | commit 66d2ca1fcaf861edfa86f6afe052e67d9b0a00e1
| |/ / Author: Martin-EvansUWA <[email protected]>
| | | Date: Fri Apr 21 10:46:55 2023 +0800
| | |