-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathda
1739 lines (1177 loc) · 52.8 KB
/
da
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
[33mcommit 1a462c6c28b574f46234f75cff0f5810f152ba1f[m[33m ([m[1;36mHEAD -> [m[1;32mdev[m[33m, [m[1;31morigin/dev[m[33m)[m
Author: Yoonjae Jung <[email protected]>
Date: Thu Dec 7 06:19:54 2023 +0000
add prompr exemplar for referencing existing plans
[33mcommit 5f6d04ad96c3b341845ede8b6c07b0d3d9991f20[m
Merge: 7ca98c1 83d9e71
Author: darwinj07 <[email protected]>
Date: Thu Dec 7 00:44:29 2023 +0900
Merge remote-tracking branch 'origin/refactor-rawdb' into dev
[33mcommit 7ca98c115ad8685fd793c931b814acbd28e334ac[m
Author: kimkun07 <[email protected]>
Date: Wed Dec 6 23:47:01 2023 +0900
endTime 24:00 Changed. EditText clearFocus. Add Manager Error Response
[33mcommit 23e88a55070808c9f8da2d27331180ee363cc479[m
Author: kimkun07 <[email protected]>
Date: Wed Dec 6 21:42:34 2023 +0900
FIX: Mic Permission, voice recognition return bug
[33mcommit e016716d23d8d578bd7c31c2cd65814f3dd12498[m
Author: kimkun07 <[email protected]>
Date: Wed Dec 6 20:57:21 2023 +0900
Merge conflict
[33mcommit 8a862ef6f24fe2fa87b83629b76f53d0306cbedf[m
Merge: 81cf06b e38a561
Author: kimkun07 <[email protected]>
Date: Wed Dec 6 20:57:07 2023 +0900
Merge branch 'Bug-Refine2' into dev
[33mcommit e38a5611942a18c9bc67ca76ef0aba162ffc3b7b[m
Author: kimkun07 <[email protected]>
Date: Wed Dec 6 20:49:35 2023 +0900
Monthly Title Font & content. Edit Page Checkbox. Category Delete Bug Fix
[33mcommit 81cf06b8cdd6f11a3f06f5ba579cc9a236b5097b[m
Author: Jaemin Choi <[email protected]>
Date: Wed Dec 6 20:46:14 2023 +0900
fix : set addPlan default time
[33mcommit cc219c06f4ceda43cbc3d81d65e4c41f4da3de83[m
Author: Darwin Jung <[email protected]>
Date: Wed Dec 6 15:08:59 2023 +0900
implement briefing feature on local application
[33mcommit ccdd97a97d38bbae81377cfb6008c4c201e39019[m
Author: Yoonjae Jung <[email protected]>
Date: Wed Dec 6 06:00:11 2023 +0000
implement briefing feature on server
[33mcommit 8c0d1a8727c8d439394273851121f9cb90f9bb97[m
Author: hochanb <[email protected]>
Date: Wed Dec 6 14:47:52 2023 +0900
feat : revision logs can be seen in merged list popup
[33mcommit f9e6645be1f048559ec96c78354d0b37e708119f[m
Author: hochanb <[email protected]>
Date: Tue Dec 5 18:31:47 2023 +0900
fix structures merged dev and feature-voice-assistance
[33mcommit 26da00d8b5e8b0ea2b71c6ff45cbc4dab0aa8c72[m
Merge: dcbe00e 3677e6d
Author: hochanb <[email protected]>
Date: Tue Dec 5 17:34:48 2023 +0900
merged dev and feature-voice-assistance
[33mcommit 3677e6de2275ba4d24322679a0c152bc979aef84[m[33m ([m[1;31morigin/feature-voice-button[m[33m)[m
Author: hochanb <[email protected]>
Date: Tue Dec 5 16:55:21 2023 +0900
fix : fixed simple ui
[33mcommit 9401ac2b219590c62f6ea2fb7c7b4dffb7809ea2[m
Author: hochanb <[email protected]>
Date: Tue Dec 5 02:13:59 2023 +0900
feat : add long click delete function, fix voice ai icons etc.
[33mcommit 436873311bdf3ebe3530b7ee2d3cafeb91b797e9[m
Author: hochanb <[email protected]>
Date: Tue Dec 5 01:33:59 2023 +0900
fix : date formatting issue fix. +some plan list item ui fix
[33mcommit 0797e170ce12f315d159f770f040da653055c319[m
Author: kimkun07 <[email protected]>
Date: Mon Dec 4 20:29:30 2023 +0900
Monthly Topbar Height Changes
[33mcommit 3bab5d4bbc0100ce088eb8714ea2ecf0276114a2[m
Author: hochanb <[email protected]>
Date: Mon Dec 4 19:18:32 2023 +0900
fix : fixing bug in monthly view
[33mcommit 531f9825beac51bbf0ca8b0f27f61b4fbab2ef77[m
Author: hochanb <[email protected]>
Date: Mon Dec 4 13:47:51 2023 +0900
feat : fix long plan label memory exceeding problem, and added add button
[33mcommit 733bf237dc5d6000540672e0b44b7af672935dc3[m
Author: hochanb <[email protected]>
Date: Mon Dec 4 13:14:00 2023 +0900
feat : added AI voice manager button and popup
[33mcommit dcbe00e7aec9f4e553550aca1a1cd17b28f01ed3[m
Merge: b1385bd 1815b16
Author: Jaemin Choi <[email protected]>
Date: Mon Dec 4 10:49:41 2023 +0900
Merge branch 'dev' of github.com:snuhcs-course/swpp-2023-project-team-10 into dev
[33mcommit 1815b16c0f1bb209b3eaa9b984493f6e311ee703[m
Author: kimkun07 <[email protected]>
Date: Sun Dec 3 23:07:37 2023 +0900
Merge Conflict: Add Schedule in WeeklyPage
[33mcommit 6fafc68341fbf375a086214514e9989f6565a884[m
Merge: 6c9f168 dd6e4d1
Author: kimkun07 <[email protected]>
Date: Sun Dec 3 23:07:17 2023 +0900
Merge branch 'Bug-Refine' into dev
[33mcommit dd6e4d1a390b11b26aa0f9e7bbc1e96fa070bbd8[m
Author: kimkun07 <[email protected]>
Date: Sun Dec 3 22:47:29 2023 +0900
AI Manager in Background. Fix Message Date Bug. Help Button.
Use WorkManager
[33mcommit 6c9f16883e4ab0b35f4380d7931e841ea1658db9[m
Author: Yoonjae Jung <[email protected]>
Date: Sat Dec 2 19:02:10 2023 +0000
improved AI manager to support '남은 거', '이번 주', '브리핑', and plan type changing
[33mcommit 83d9e7113b497ab9b21dd02c9419a6fc5331514b[m[33m ([m[1;31morigin/refactor-rawdb[m[33m)[m
Author: darwinj07 <[email protected]>
Date: Sun Dec 3 03:41:24 2023 +0900
rename rawsqldb to rawdb and integrate into maindb
[33mcommit b1385bdbea0658951147ad053a773e17e43e1211[m
Author: Jaemin Choi <[email protected]>
Date: Sun Dec 3 01:10:18 2023 +0900
fix: fix minior bug in week page
[33mcommit 70cc75defea427070d65ef2437b768830fa6d220[m
Merge: 8f1116e ce81c58
Author: Jaemin Choi <[email protected]>
Date: Sun Dec 3 00:57:18 2023 +0900
Merge branches 'dev' and 'dev' of github.com:snuhcs-course/swpp-2023-project-team-10 into dev
[33mcommit 8f1116e6c5225210c561e410e547cb6a0648f036[m
Author: Jaemin Choi <[email protected]>
Date: Sun Dec 3 00:57:09 2023 +0900
feat: set multipleDay schedule ui
[33mcommit 30f9cd493e3643a3fccfa33c8f4e195560e0048a[m
Author: kimkun07 <[email protected]>
Date: Sat Dec 2 21:04:36 2023 +0900
Send Briefing to Server, Route to Edit Plan Page
[33mcommit ce81c583ba150d2bef237ac88bd0e70eda18bc0e[m
Author: HHCHU <[email protected]>
Date: Sat Dec 2 16:02:12 2023 +0900
chore: Update VerticalWheelPickerWrapper size
[33mcommit 1b93db1a02ae3da09c63d5f14c4af6e07e8e6996[m
Author: Jaemin Choi <[email protected]>
Date: Sat Dec 2 11:55:11 2023 +0900
fix : todo page ui refine / remove font
[33mcommit 098b8befeb88d312e1f48c3ad9d59c40f3b61b02[m
Merge: 1f5465c 3f12879
Author: Jaemin Choi <[email protected]>
Date: Sat Dec 2 11:22:12 2023 +0900
Merge branch 'dev' of github.com:snuhcs-course/swpp-2023-project-team-10 into dev
[33mcommit 3f128791f45faf7823941b048fd2210b78cb281f[m
Merge: f3ee86d 3eab224
Author: kimkun07 <[email protected]>
Date: Fri Dec 1 21:56:43 2023 +0900
Merge branch 'feat-RepeatGroup' into dev
[33mcommit 3eab224b097b53d5d6b1df0945346a8df0c47fea[m
Author: kimkun07 <[email protected]>
Date: Fri Dec 1 21:48:50 2023 +0900
MessagePage UI. No RepeatGroup
[33mcommit 1f5465ca343b1734cc28d093a5344924852c4419[m
Author: Jaemin Choi <[email protected]>
Date: Fri Dec 1 10:05:27 2023 +0900
feat: implement todo update ui in week page
[33mcommit b0842a761d078021b2aca7adb325861fc3046ad9[m
Author: Jaemin Choi <[email protected]>
Date: Fri Dec 1 09:13:39 2023 +0900
feat: enable tab in week page
[33mcommit f3ee86d8133d245adaeaaee2573992df9a98f734[m
Author: HHCHU <[email protected]>
Date: Thu Nov 30 16:38:00 2023 +0900
chore: minor UI detail updated
navbar color change and detail UX writing to Korean
[33mcommit db9b7022c1a2e67d798e1ff33e0e4eb6d924d801[m
Author: Yoonjae Jung <[email protected]>
Date: Thu Nov 30 06:58:35 2023 +0000
refactor gpt api call
[33mcommit 3567ccc967f1af3e32d38df653191af3bd6595f1[m
Merge: d81c953 c28f536
Author: hochanb <[email protected]>
Date: Thu Nov 30 15:26:56 2023 +0900
Merge branch 'feature-monthly' into dev
[33mcommit c28f5360c710d001c1e83ad2749a6973c0c63f9d[m
Author: hochanb <[email protected]>
Date: Thu Nov 30 15:25:32 2023 +0900
fix : fixed monthly plan lagging, plan label error, etc.
[33mcommit d81c953406e6eb84616072885d84454af2433cd0[m
Author: Jaemin Choi <[email protected]>
Date: Thu Nov 30 14:56:36 2023 +0900
chore : modify theme
[33mcommit c624e29f4710df4652dddf4db450eddcb3b67784[m
Author: Jaemin Choi <[email protected]>
Date: Thu Nov 30 14:23:07 2023 +0900
chore : set default color
[33mcommit 2172943f72c6c4b879f1e9be45ca88038bf7af2c[m
Author: Jaemin Choi <[email protected]>
Date: Thu Nov 30 01:14:36 2023 +0900
chore: set Splash Screen loading time
[33mcommit 11f625e1d4693630729e954371da65d5c5366465[m
Merge: c78221f 8008864
Author: Jaemin Choi <[email protected]>
Date: Wed Nov 29 23:13:05 2023 +0900
Merge branch 'feature-nav' into dev
[33mcommit 80088646be062b78e2d594e220b79397284999c8[m
Author: Jaemin Choi <[email protected]>
Date: Wed Nov 29 23:07:37 2023 +0900
fix: change nav ui / font setting
[33mcommit c78221f506d6a86694fcbc7b4191172a91b15eb4[m
Author: hochanb <[email protected]>
Date: Wed Nov 29 20:30:32 2023 +0900
feat : manager keyboard closing if touching outside
[33mcommit 882adbcef9d54a400aed553815cb6a55c6116e86[m
Author: hochanb <[email protected]>
Date: Wed Nov 29 19:01:25 2023 +0900
feat : manager plan list ui refine. added undo all button, set appropriate text style to selected query result
[33mcommit 6eab1119fad17a8df5d853a66a2161bed38c78d1[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 28 23:43:22 2023 +0900
fix: Manager Tab Bug. GPT SELECT Working
[33mcommit 9356c735f28020c3e361c50a6764c1f388c7b6f2[m
Merge: 28200a5 a9facd6
Author: kimkun07 <[email protected]>
Date: Tue Nov 28 18:25:09 2023 +0900
Merge branch 'rev-edit-ui' into dev
[33mcommit 28200a5d1319abe138cbbb93dfba2b06c558a8f0[m
Merge: 03b8a74 9987ff0
Author: kimkun07 <[email protected]>
Date: Tue Nov 28 18:17:01 2023 +0900
Merge branch 'bixby-briefing' into dev
[33mcommit a9facd6a33be7b7030d72fe1537abd3cb67d8804[m
Merge: 06c4bb7 9987ff0
Author: kimkun07 <[email protected]>
Date: Tue Nov 28 18:16:49 2023 +0900
Merge branch 'bixby-briefing' into rev-edit-ui
[33mcommit 9987ff0558a4f388407a58a2241646ec03f9f6ce[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 28 18:16:39 2023 +0900
Bixby Briefing
[33mcommit 06c4bb7f313bb56c2d024cb981887bd75f807d3a[m
Merge: e2a6362 03b8a74
Author: kimkun07 <[email protected]>
Date: Tue Nov 28 18:15:41 2023 +0900
Merge branch 'dev' into rev-edit-ui
[33mcommit e2a6362af15af565ae8140a940a0614891b4850b[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 28 18:12:30 2023 +0900
DeepLink, Edit Page, RepeatGroup
[33mcommit 03b8a74a56fcce0b3a0bb5c5d472c7b52c219681[m
Merge: e8db664 11fcc61
Author: hochanb <[email protected]>
Date: Tue Nov 28 16:58:51 2023 +0900
Merge branch 'feature-messagepage' into dev
[33mcommit 11fcc61ff5121af3ebf6825fd8f0ef14f4d53b54[m
Author: hochanb <[email protected]>
Date: Tue Nov 28 16:58:03 2023 +0900
feat : implemented control on plan revision, and fixed some UI (manager messages, todo checkbox color, etc.)
[33mcommit e8db6642f65837d22eb248884b5ade15e63cacac[m
Merge: e913764 6adeead
Author: Jaemin Choi <[email protected]>
Date: Tue Nov 28 16:45:09 2023 +0900
Merge branch 'feature-weekPage' into dev
[33mcommit 6adeead16ba5d87278b8d656c05329ab41380ef7[m
Author: Jaemin Choi <[email protected]>
Date: Tue Nov 28 16:27:37 2023 +0900
feat: implement splash screen and fix week page
[33mcommit e9137643ebd3f2c2c52765f3d6a1898a2b6f75e8[m
Merge: 1cdaa4d 0753311
Author: kimkun07 <[email protected]>
Date: Thu Nov 23 22:08:56 2023 +0900
Merge branch 'dev' into rev-edit-ui
[33mcommit 1cdaa4da8e03b953c89df0d389efbb8c0be77ddb[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 23 22:04:45 2023 +0900
Rev: Edit Page - Schedule/Todo Button UI & DateTime Selection
[33mcommit 0753311461f37f3fe575053ee7286a2e6aa1318e[m
Merge: b1f297a e3088d4
Author: darwinj07 <[email protected]>
Date: Thu Nov 23 19:44:51 2023 +0900
Merge branch 'dev' of github.com:snuhcs-course/swpp-2023-project-team-10 into dev
[33mcommit e3088d425ef177c5e3114af583c5a0cd8a847b57[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 23 19:42:31 2023 +0900
FIX: Merge Conflicts
[33mcommit b1f297ae20ba8e1242a4fab70abfc2e626dd6681[m
Merge: f7ff8eb beb8f72
Author: darwinj07 <[email protected]>
Date: Thu Nov 23 19:42:22 2023 +0900
Merge branch 'dev' of github.com:snuhcs-course/swpp-2023-project-team-10 into dev
[33mcommit 8e7067b5b758d14160b3014b1dd3533fbdddb911[m
Merge: beb8f72 89e332a
Author: kimkun07 <[email protected]>
Date: Thu Nov 23 19:42:14 2023 +0900
Merge branch 'feature-bixby' into dev
[33mcommit beb8f72edc0b6664834fd1949b967ef7acd8874f[m
Author: Yoonjae Jung <[email protected]>
Date: Thu Nov 23 10:29:12 2023 +0000
distinguish insert/update commands accurately
[33mcommit f7ff8eb22c939851944eb25fe8cbd52f879657bf[m
Author: darwinj07 <[email protected]>
Date: Thu Nov 23 18:42:33 2023 +0900
fixed typo gptOriginalMessage to gptFirstMessage in MessagePageViewModel
[33mcommit a283cf22b169ae27a86b539fe7eadf86d2273fbc[m
Merge: 86a556c 1780dcb
Author: darwinj07 <[email protected]>
Date: Thu Nov 23 18:31:20 2023 +0900
resolved merge conflicts
[33mcommit 86a556c5ceafb16fdb53125187a46044a81004f9[m
Author: darwinj07 <[email protected]>
Date: Thu Nov 23 18:24:47 2023 +0900
refactored MessagePageViewModel
[33mcommit 1780dcb1bb295468ef120bd75839e9f96518a5c6[m
Merge: 7c1a425 190cd32
Author: hochan <[email protected]>
Date: Thu Nov 23 18:02:57 2023 +0900
Merge branch 'feature-monthly' into dev
[33mcommit 190cd329d4cdea93e4612c19a5a716ff76646bdd[m
Author: hochan <[email protected]>
Date: Thu Nov 23 17:39:09 2023 +0900
feat: Message page UI Refactoring on progress
[33mcommit 7c1a4256cd9c514e3069b9b6574ffdffa06e8042[m
Author: Jaemin Choi <[email protected]>
Date: Thu Nov 23 15:26:08 2023 +0900
feat: enable edit category
[33mcommit 563fc71e3e95146ecd25bdf4c6edb143a1195def[m
Author: Yoonjae Jung <[email protected]>
Date: Thu Nov 23 03:56:27 2023 +0000
update exemplars
[33mcommit dce2f51b800de5adf6558fa9d47574e907455d23[m
Author: hochan <[email protected]>
Date: Thu Nov 23 10:25:19 2023 +0900
Imported MCV library
[33mcommit 50567d9c6e1ecfb834bb95ab6787545d70785fd1[m
Author: Yoonjae Jung <[email protected]>
Date: Wed Nov 22 14:58:01 2023 +0000
removed turbo endpoint and updated system prompt & exemplars to remove data specificity
[33mcommit 0ba10f0ff92e037ac21423cb35dd7236ee1d1510[m
Author: Yoonjae Jung <[email protected]>
Date: Wed Nov 22 11:31:23 2023 +0000
correctly distinguish am/pm time
[33mcommit a0904eb00b2a4813c3a4854894661677a1d9c07f[m
Author: Jaemin Choi <[email protected]>
Date: Wed Nov 22 20:08:51 2023 +0900
FIX: fix mutilple day schedule error
[33mcommit ccac37166201e7fd076a8afc05487a825d5a42b2[m
Author: Jaemin Choi <[email protected]>
Date: Wed Nov 22 18:54:37 2023 +0900
feat: enable mutiple day schedule
[33mcommit e40e8b475690599c3416232782310299744a8636[m
Author: Jaemin Choi <[email protected]>
Date: Wed Nov 22 14:19:39 2023 +0900
FIX: update TODO page ui
[33mcommit cc474418a4696ab50c2602fa9faf0e786da8a84a[m
Author: kimkun07 <[email protected]>
Date: Wed Nov 22 13:55:17 2023 +0900
FIX: View Plans for other months
[33mcommit b38486cb8d98bc1bd9a12da77b81b9189b5a74d7[m[33m ([m[1;31morigin/feature-gpt-sql-back[m[33m)[m
Author: EC2 Default User <[email protected]>
Date: Tue Nov 21 17:26:18 2023 +0000
remove config.json from tracking
[33mcommit a896572d89c5c4419cbf7d0b539c3b339b26e9b4[m
Author: EC2 Default User <[email protected]>
Date: Tue Nov 21 17:13:16 2023 +0000
fixed errors from HE & extended capabilities
[33mcommit fc410f2cc2a2267a7a6ba8d2296afecc9f7840a2[m
Author: EC2 Default User <[email protected]>
Date: Wed Nov 8 10:21:56 2023 +0000
separate key from main.js
[33mcommit 9734a66e27bdf542d6758fbe16776d2e84e6c383[m
Author: EC2 Default User <[email protected]>
Date: Wed Nov 8 10:10:57 2023 +0000
apply given time
[33mcommit e31d96a05610c7e6d80f0afd46c3e426e955a171[m
Author: EC2 Default User <[email protected]>
Date: Sun Nov 5 13:27:37 2023 +0000
updated openapi key to yoonjae's
[33mcommit ef9c6cbbea21089d98e6ad04374d906a962cdfba[m
Author: EC2 Default User <[email protected]>
Date: Sun Nov 5 11:45:49 2023 +0000
changed openai api key from yoonjae's to hyehyun's
[33mcommit bc59cd59f87f74097efbd5d791509a1c7a65121d[m
Author: EC2 Default User <[email protected]>
Date: Sun Nov 5 11:30:04 2023 +0000
server setup for gpt sql extraction
[33mcommit 08378f39ae344e29a1dfb4fe74691879f86a4219[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 21 23:04:03 2023 +0900
FIX: List Popup in Monthly. Date Picker GMT Bug
[33mcommit fdc54f5fdd563767ced8ef147282c94ea3d1a966[m
Author: HHCHU <[email protected]>
Date: Tue Nov 21 17:58:33 2023 +0900
Fix: Add import Check Icon
[33mcommit d2c3009fe9a70f7f7244ea66a8d4d5c83d93cf5e[m
Merge: 742dc7b ee244db
Author: HHCHU <[email protected]>
Date: Tue Nov 21 17:55:40 2023 +0900
Merge branch 'feature-editpage-ui' into dev
[33mcommit 742dc7b28c4d6a2288b7c90639fac7c8f9732df0[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 21 17:43:10 2023 +0900
Merge Conflict Resolved: Works Good
[33mcommit 51322c39d056aa762c33f47632ba6fd33341ec15[m
Merge: 0926af6 aa5620d
Author: kimkun07 <[email protected]>
Date: Tue Nov 21 17:38:56 2023 +0900
Merge remote-tracking branch 'origin/feature-weekly-ui' into testing-2
[33mcommit 0926af663edfb7dc7766ff757eea79da65d1a301[m
Merge: f8fb4a4 a951c9e
Author: kimkun07 <[email protected]>
Date: Tue Nov 21 16:53:07 2023 +0900
Merge branch 'testing' into dev
[33mcommit aa5620d3aaccc750bfa6d98a7f814c3512d455a2[m[33m ([m[1;31morigin/feature-weekly-ui[m[33m)[m
Author: Jaemin Choi <[email protected]>
Date: Tue Nov 21 16:47:12 2023 +0900
Fix: fix weeklyPage UI
[33mcommit a951c9ecade0f31444b094a1c0373f7a5a662daa[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 21 16:46:21 2023 +0900
Speech Recognition UI. View Revision History
[33mcommit ee244db7b233aa595d95bbdb31ce3d3d9ad1ac48[m[33m ([m[1;31morigin/feature-editpage-ui[m[33m)[m
Author: HHCHU <[email protected]>
Date: Tue Nov 21 16:41:56 2023 +0900
Fix: Add paddings to DateTimeSelect Dialog
[33mcommit af9a964147025a20609f66e112d0455eee819ae3[m
Author: Jaemin Choi <[email protected]>
Date: Tue Nov 21 13:39:10 2023 +0900
Fix: fix crash on navigating editPlan page
[33mcommit 2471679f1ef113b45fe82ee5c1549810de8248cb[m
Author: kimkun07 <[email protected]>
Date: Sun Nov 19 18:47:51 2023 +0900
FIX: getSchedulesStream Works Correctly
[33mcommit f8fb4a49e694d080d892b9a85194101174b85f77[m
Author: hochan <[email protected]>
Date: Thu Nov 16 16:55:57 2023 +0900
feat: implemented long day plan decorator
[33mcommit b538e924e45847eb628b8c11b63fc80ae3f14b28[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 16 15:21:13 2023 +0900
PlanRepository Testing
[33mcommit e9f3d3bae004067005422e7608d67aa433921983[m
Author: Jaemin Choi <[email protected]>
Date: Thu Nov 16 14:48:42 2023 +0900
feat: implement weeklyPage basic ui
[33mcommit fd4278d876009e73572b03b12c8da28eae3502ce[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 16 13:12:40 2023 +0900
Jacoco Aggregated Report Works! for local testing
[33mcommit 7b209c5288287fe1fe2d5d8c314ebd0a5c0c7c26[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 16 12:59:15 2023 +0900
Implementing Testing
[33mcommit 13b0d16bd98402ad33f87c1b09170b8df6e840ca[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 16 12:58:45 2023 +0900
PlanRepository: Validate plan
[33mcommit b31d3e4b789d466a75ae28316ef5febeb1c8e005[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 17:41:15 2023 +0900
Merge All: All Working Great
[33mcommit 9f7bb387748f6dba71813e2fd399ce5048cd0596[m
Merge: 55112df eeef70b
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 17:41:06 2023 +0900
Merge branch 'db-under-construction' into dev
[33mcommit 55112df7ef3670b40dae47988fc41f9d4f3b39c1[m
Merge: b34167f abe91ca
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 17:21:52 2023 +0900
Merge remote-tracking branch 'origin/feature-monthly' into dev
[33mcommit abe91caa46cdf6ccaa10b5ff9fb65e0e684266ac[m
Author: hochan <[email protected]>
Date: Tue Nov 14 17:15:47 2023 +0900
feat: implemented long day plan decorator
[33mcommit 47ac3b777228f2a91cca9a9fb729845bf99d3fe6[m
Author: HHCHU <[email protected]>
Date: Tue Nov 14 16:39:04 2023 +0900
Fix: Change button size and check button
[33mcommit b34167f15a16f6f31e41a7219ea7d91dd1da191d[m
Merge: 1d468fd e77cfa0
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 15:41:04 2023 +0900
Merge pull request #12 from snuhcs-course/feature-todo
Todo Page: Use Month Selection
[33mcommit e77cfa0f69d6807fb0e998bfa0a20a37a8349b82[m
Merge: 5f25886 5e78c09
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 15:39:02 2023 +0900
Merge branch 'feature-todo' of https://github.com/snuhcs-course/swpp-2023-project-team-10 into feature-todo
[33mcommit 5f25886607f8175bc0fc1c7d94716fb0a9673300[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 15:38:42 2023 +0900
Revert "Update CalendyDatabase.kt"
This reverts commit f54683ca756b6589eb240ada8231258dc23e3c2f.
[33mcommit b1068e1c98a459979c511b0cfae86f395b9c7e50[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 15:38:34 2023 +0900
Revert "MainActivity Merge Conflict (Navigation)"
This reverts commit eb7d6ebdb971160ad87cac0e56628c490505486d.
[33mcommit f5f0c3006a9fcaf64342c522412cdaa65ef88e29[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 15:37:58 2023 +0900
Revert 9769581
[33mcommit 89e332a9b648e59d97c1c33234938ad529bc59ac[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 14 15:28:42 2023 +0900
Initial Bixby: deep link enabled
[33mcommit 5e78c09a1873c4a34860346de6b9fd14ba17befd[m
Author: Jaemin Choi <[email protected]>
Date: Tue Nov 14 15:22:58 2023 +0900
Fix: fix typo
[33mcommit 8459c32515a879c4954b057c7a0a8d19bf431b03[m
Author: hochan <[email protected]>
Date: Mon Nov 13 01:06:08 2023 +0900
ui: add AddPlan button in main calendar view
[33mcommit 4e6f181f5e24a6ee19baaca14c70ee60040b0de7[m
Author: hochan <[email protected]>
Date: Mon Nov 13 00:28:49 2023 +0900
fix: fix dependency of mcv to hochanb:material-calendarview:1.6.2
[33mcommit eeef70b486e163a1c526a842aefada7da21120e9[m
Author: kimkun07 <[email protected]>
Date: Sun Nov 12 16:28:27 2023 +0900
DB Changes
[33mcommit 9145886ad740bdf999a0cd6c4779923b196e9891[m
Author: Jaemin Choi <[email protected]>
Date: Sat Nov 11 20:50:32 2023 +0900
feat: fix todoPage UI
[33mcommit 3ded04088575297819cda1549743038536aba779[m
Author: HHCHU <[email protected]>
Date: Sat Nov 11 20:20:22 2023 +0900
Fix: Fix TypeButton color bug
[33mcommit f54683ca756b6589eb240ada8231258dc23e3c2f[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 9 15:25:42 2023 +0900
Update CalendyDatabase.kt
[33mcommit 804bf11be60db1cb51fae7ccacc4eac94e1c8237[m
Merge: 9769581 1d468fd
Author: kimkun07 <[email protected]>
Date: Thu Nov 9 15:25:33 2023 +0900
Merge branch 'dev' into HE
[33mcommit 1d468fda0f9e7d0f8ed66b2bb6b9ec7f0ce11e30[m
Merge: 4de2001 eb7d6eb
Author: hochan <[email protected]>
Date: Thu Nov 9 15:21:53 2023 +0900
Merge remote-tracking branch 'origin/dev' into dev
[33mcommit eb7d6ebdb971160ad87cac0e56628c490505486d[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 9 15:15:02 2023 +0900
MainActivity Merge Conflict (Navigation)
[33mcommit 9769581ec35ff5964736557f6ac116846dc2459b[m
Author: darwinj07 <[email protected]>
Date: Thu Nov 9 15:07:11 2023 +0900
enabled priority referencing when inserting using AI manager
removed foreign key constraint on category_id
[33mcommit 4de2001b77b128b8432697192cfe06558f721f6d[m
Merge: a20c000 111a544
Author: hochan <[email protected]>
Date: Thu Nov 9 15:02:59 2023 +0900
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# frontend/app/src/main/java/com/example/calendy/view/popup/PlanListPopup.kt
[33mcommit a20c0008b7b563fe45e724c346039265c68610d7[m
Author: hochan <[email protected]>
Date: Thu Nov 9 15:01:00 2023 +0900
feat : implemented getting and showing modified plans
[33mcommit 111a54465aa1c1ba0242edf75ef5325e1cf9a52f[m
Author: Jaemin Choi <[email protected]>
Date: Thu Nov 9 14:46:57 2023 +0900
chore: change navigation structure
[33mcommit 74a33681d42d925e3154881376b0191d443a6747[m
Author: Jaemin Choi <[email protected]>
Date: Thu Nov 9 14:01:42 2023 +0900
feat: implement setting UI
[33mcommit 017c638b50613f1d59f67bf4fe8e6a59d3efa5c2[m
Author: Jaemin Choi <[email protected]>
Date: Wed Nov 8 21:56:47 2023 +0900
feat: set simple todoPage
[33mcommit ccf97ec16a7afb974d7fec850e0e5890c69fbc9e[m
Merge: 51bee8a 94f81fc
Author: Jaemin Choi <[email protected]>
Date: Wed Nov 8 19:35:50 2023 +0900
Merge remote-tracking branch 'origin/dev' into dev
[33mcommit 51bee8a9a7bb58b09ff8b62f310ff3a4fd28dd75[m
Author: Jaemin Choi <[email protected]>
Date: Wed Nov 8 19:35:31 2023 +0900
feat: enable using repeat-plans
[33mcommit 94f81fca30f36f052afec1ac14e357d061b0f73c[m
Author: hochan <[email protected]>
Date: Tue Nov 7 23:57:49 2023 +0900
feat : connected message log db and message page ui
[33mcommit 722078d7fca40255c1d2ad44bc7af094be71c896[m
Merge: 58c0a91 f2cdcc8
Author: hochan <[email protected]>
Date: Tue Nov 7 17:37:40 2023 +0900
Merge remote-tracking branch 'origin/feature-LogDB' into dev
[33mcommit f2cdcc854a90890b5afbe8f4faa9e0bc17b1e2b7[m
Author: kimkun07 <[email protected]>
Date: Tue Nov 7 17:36:57 2023 +0900
feaet: Add Log DB
[33mcommit 58c0a9120504549845d2ecd484d87be1370fae6f[m
Author: hochan <[email protected]>
Date: Tue Nov 7 17:29:19 2023 +0900
on progress : edit page ui refine
[33mcommit 86ee9cfeb88c617eda3c5ed2896399478b7bdf4f[m
Author: hochan <[email protected]>
Date: Mon Nov 6 21:25:00 2023 +0900
feat: revised monthly components. including popup refactoring
[33mcommit 4696791fbf3b766b4e859b1df9b627556bc3f002[m
Author: hochan <[email protected]>
Date: Sun Nov 5 20:55:39 2023 +0900
merged WeeklyView
[33mcommit 00646c70bf2ab870970e96d8403238863295b28c[m
Merge: c874a08 348f2a7
Author: hochan <[email protected]>
Date: Sun Nov 5 20:50:06 2023 +0900
Merge remote-tracking branch 'origin/feature-weekly' into dev
# Conflicts:
# frontend/app/build.gradle.kts
# frontend/app/src/main/AndroidManifest.xml
# frontend/app/src/main/res/values/strings.xml
# frontend/app/src/main/res/values/themes.xml
# frontend/settings.gradle.kts
[33mcommit c874a082a905cbce146d2b0ebc6fb72b307552a8[m
Merge: 7fae6cb 500d31c
Author: hochan <[email protected]>
Date: Sun Nov 5 20:37:29 2023 +0900
Merge branch 'demo-monthly-revised' into dev
[33mcommit 500d31cb0f15e9af3ed0eb8b100f740d613c5222[m
Author: hochan <[email protected]>
Date: Sun Nov 5 20:33:54 2023 +0900
merged all
[33mcommit 19f0517c29069e575aba4e9de8d89492e3f6d1f5[m
Merge: 152568b 93e5409
Author: hochan <[email protected]>
Date: Sun Nov 5 20:25:36 2023 +0900
Merge remote-tracking branch 'origin/feature-gpt-sql-front' into demo-monthly-revised
# Conflicts:
# frontend/app/src/main/java/com/example/calendy/AppViewModelProvider.kt
# frontend/app/src/main/java/com/example/calendy/SqlExecutionTest.kt
# frontend/app/src/main/java/com/example/calendy/utils/DateHelper.kt
# frontend/app/src/main/java/com/example/calendy/view/monthlyview/MonthlyPageKT.kt
[33mcommit 152568bdad02f658cadf313f9600170b5f9db8b4[m[33m ([m[1;31morigin/demo-monthly-revised[m[33m)[m
Author: hochan <[email protected]>
Date: Sun Nov 5 20:04:48 2023 +0900
onprogress: refactoring
[33mcommit 93e5409cf23aea0b740f879173e7d892cc4b85bd[m[33m ([m[1;31morigin/feature-gpt-sql-front[m[33m, [m[1;32mfeature-gpt-sql-front[m[33m)[m
Author: kimkun07 <[email protected]>
Date: Sun Nov 5 20:03:42 2023 +0900
GPT Inteface Changed
[33mcommit 31a3109f932dd98ff298f0e78887d49f8e0d9d54[m
Merge: 6662eb1 ff9d7fa
Author: hochan <[email protected]>
Date: Sun Nov 5 15:51:12 2023 +0900
Merge branch 'feature-chatpage' into demo-monthly-revised
[33mcommit 6662eb17044a728186a756b6a1e5bff07f6be5eb[m
Author: hochan <[email protected]>
Date: Sun Nov 5 15:49:16 2023 +0900
feat: Implemented title label under day number, and fixed some ui stuffs
[33mcommit 3e0da80ddc0aba28b77968ffae9ec6a89f902ae2[m
Merge: 7d9a9e9 c8d7a82
Author: kimkun07 <[email protected]>
Date: Sat Nov 4 22:48:23 2023 +0900
Merge c8d7a82 (repeat-page)
[33mcommit 7d9a9e9cc9aea6f7164080f49c9b5ffbecfb473c[m
Author: kimkun07 <[email protected]>
Date: Sat Nov 4 22:33:10 2023 +0900
GPT Inteface Changed
[33mcommit ec2fc92553d51c5489df9720a118cbbfb09d5cba[m
Author: kimkun07 <[email protected]>
Date: Sat Nov 4 21:01:49 2023 +0900
Feat: SELECT RawQuery || GPTQuery Execution || STT
[33mcommit c8d7a829c4cda41876cc6191197f318e5cc3b9e2[m[33m ([m[1;31morigin/feature-repeat[m[33m)[m
Author: Jaemin Choi <[email protected]>
Date: Sat Nov 4 19:04:36 2023 +0900
feat: implement setRepeat page
[33mcommit ff9d7fa0a20b896be2aaffaeb42fc0b00528ac00[m
Author: hochan <[email protected]>
Date: Sat Nov 4 15:56:10 2023 +0900
feat: Implemented popup view frames
[33mcommit c0c32402161566ae61835133bb07d1860c1b5874[m
Author: hochan <[email protected]>
Date: Sat Nov 4 11:02:03 2023 +0900
feat: Implemented basic message page
[33mcommit c1b33e97a37d1481263155ccfec397f5e59fba6a[m
Author: kimkun07 <[email protected]>
Date: Thu Nov 2 18:06:09 2023 +0900
WIP: SQL Execute.
Revert ae25424. SQL Table Default Value
Create Empty DB
Retrofit - Timeout set to 30 sec
[33mcommit cc597bce0fd9e3f84245597432136152b26a0a4b[m[33m ([m[1;31morigin/demo[m[33m)[m
Author: kimkun07 <[email protected]>
Date: Mon Oct 30 23:06:59 2023 +0900
Demo Version