Merge branch 'master' of https://gitlab.discs.ateneo.edu/fritzie.delpilar/midterm_CtrlF

README.txt

@@ -16,6 +16,7 @@ Date of Submission: March 6, 2023
 We, members of CtrlF, truthfully completed this project with all our efforts and knowledge.
 
 References:
+DateTimeField - https://www.geeksforgeeks.org/datetimefield-django-forms/
 
 Members' Signature:
 (sgd) Del Pilar, Fritzie Dianne B., March 6, 2023

widget_CtrlF/forum/migrations/0002_reply_post_alter_forumpost_author_alter_reply_author.py

+<<<<<<< HEAD
 # Generated by Django 4.1.7 on 2023-03-06 02:45
+=======
+# Generated by Django 4.1.7 on 2023-03-05 15:14
+>>>>>>> 4f4b6cf6f7366e676cd579dda188e9c9faa9c539
 
 from django.db import migrations, models
 import django.db.models.deletion

widget_CtrlF/forum/migrations/0003_alter_reply_pub_datetime.py

+# Generated by Django 4.1.7 on 2023-03-06 02:55
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('forum', '0002_reply_post_alter_forumpost_author_alter_reply_author'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reply',
+            name='pub_datetime',
+            field=models.DateTimeField(blank=True, default=django.utils.timezone.now, null=True),
+        ),
+    ]