Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #26

Open
wants to merge 175 commits into
base: main
Choose a base branch
from
Open

Fixes #26

wants to merge 175 commits into from

Commits on Oct 31, 2022

  1. Project set up

    saritahub committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    a28b372 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2022

  1. Basic project setup

    Arshad-Siddiqui committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    afeabd5 View commit details
    Browse the repository at this point in the history
  2. global CSS test

    Dmum303 committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    a0ae2fd View commit details
    Browse the repository at this point in the history
  3. Added tests for making a post + posting in chronolically reverse orde…

    …r. Tests currently fail so need to implement method/function to fix
    AamirKhanDev committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    2c1b954 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2022

  1. Configuration menu
    Copy the full SHA
    db6093f View commit details
    Browse the repository at this point in the history
  2. Create post form

    Arshad-Siddiqui committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    891454c View commit details
    Browse the repository at this point in the history
  3. Added fork

    AamirKhanDev committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    0a1df4b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8e04950 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'main' of github.com:Dmum303/acebook-team-bikini-bottom …

    …into create_post
    
     merge branches
    Arshad-Siddiqui committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    9d6cdb3 View commit details
    Browse the repository at this point in the history
  6. updated nav bar

    piperrosearmstrong committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    cf6b377 View commit details
    Browse the repository at this point in the history
  7. navigation bar

    Dmum303 committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    0994eff View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6a7126d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d7ed6a0 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    62ff91a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    d102844 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #2 from Dmum303/frontendexplore

    Frontendexplore
    Arshad-Siddiqui authored Nov 2, 2022
    Configuration menu
    Copy the full SHA
    5209c36 View commit details
    Browse the repository at this point in the history
  13. Pulling main

    saritahub committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    5009f76 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    f61a908 View commit details
    Browse the repository at this point in the history
  15. Testing comments

    saritahub committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    db23d22 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    0e71c4a View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    8cab85b View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    253c869 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    6d7aa1c View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    66cdace View commit details
    Browse the repository at this point in the history
  21. Add Post form to app

    Arshad-Siddiqui committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    a9e7bc0 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    18cc74b View commit details
    Browse the repository at this point in the history
  23. Refactor

    saritahub committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    f2c928f View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    c173f0f View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. Configuration menu
    Copy the full SHA
    fae45fb View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3 from Dmum303/Testing-with-new-schema

    Added date into schema for posts and also added test for date in post…
    Dmum303 authored Nov 3, 2022
    Configuration menu
    Copy the full SHA
    c72114f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1d0d908 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f4b9084 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b1e6794 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b555d03 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    adeca32 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f429cf4 View commit details
    Browse the repository at this point in the history
  9. testing comment fields

    Dmum303 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    58da208 View commit details
    Browse the repository at this point in the history
  10. testied user field

    Dmum303 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    3b82dc1 View commit details
    Browse the repository at this point in the history
  11. not sure what changed

    Dmum303 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    cdd514a View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    3259eb4 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    ffd5a25 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    482d296 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    9cb6d80 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    b66c507 View commit details
    Browse the repository at this point in the history
  17. Post comment test passed

    saritahub committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    0357816 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    7f518f3 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    408149f View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    00c6bae View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    80e1614 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    fc44e66 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    5560e0f View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    5f7bb0c View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    2406bb6 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    973ebdd View commit details
    Browse the repository at this point in the history
  27. change to post comment

    Dmum303 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    891b3d8 View commit details
    Browse the repository at this point in the history
  28. Merge pull request #4 from Dmum303/create_post

    Create post
    Dmum303 authored Nov 3, 2022
    Configuration menu
    Copy the full SHA
    69071db View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    d109d70 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    5831765 View commit details
    Browse the repository at this point in the history
  31. Refactor Signup page

    Arshad-Siddiqui committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    69de3cd View commit details
    Browse the repository at this point in the history
  32. Create TSConfig file

    Arshad-Siddiqui committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    cec7449 View commit details
    Browse the repository at this point in the history
  33. comment test

    Dmum303 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    06340c2 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    ba9259f View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    313f8bb View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    64f5ce5 View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    9fda105 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    4fc877d View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    5203d68 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2022

  1. Reformat JSX

    Arshad-Siddiqui committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    8f27b6c View commit details
    Browse the repository at this point in the history
  2. comment testing

    Dmum303 committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    345f0b8 View commit details
    Browse the repository at this point in the history
  3. multiple comments tested

    Dmum303 committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    59fa261 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2f1e87c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    329b3f0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9cc386f View commit details
    Browse the repository at this point in the history
  7. Merge pull request #5 from Dmum303/signup_plus

    Signup plus
    saritahub authored Nov 4, 2022
    Configuration menu
    Copy the full SHA
    e6d46e3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    39ddd57 View commit details
    Browse the repository at this point in the history
  9. Refactor

    saritahub committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    4dd76b2 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7b45212 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    ef45116 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b78f8eb View commit details
    Browse the repository at this point in the history
  13. testing comment bugs

    Dmum303 committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    b415680 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2022

  1. stuck with routes

    Dmum303 committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    83adb6a View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2022

  1. Configuration menu
    Copy the full SHA
    84efbcc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3eb1d65 View commit details
    Browse the repository at this point in the history
  3. Save files to push

    Dmum303 committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    48ee941 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2022

  1. Configuration menu
    Copy the full SHA
    ef073b4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    39d1a5d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #8 from Dmum303/commentvad

    Commentvad
    Dmum303 authored Nov 7, 2022
    Configuration menu
    Copy the full SHA
    6e322e9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    edae257 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5c5ba01 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1c30d75 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    eb5a969 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d4a1489 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a4fd642 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #9 from Dmum303/commentvad

    updated comments con test with new user mod info
    saritahub authored Nov 7, 2022
    Configuration menu
    Copy the full SHA
    8fcfc0f View commit details
    Browse the repository at this point in the history
  11. Merge comments

    Arshad-Siddiqui committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    a2c2e28 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b00650c View commit details
    Browse the repository at this point in the history
  13. Merge pull request #6 from Dmum303/user-to-post

    Add link between User and their Post
    piperrosearmstrong authored Nov 7, 2022
    Configuration menu
    Copy the full SHA
    e85a3d2 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    2281f53 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    4087276 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    4894cd9 View commit details
    Browse the repository at this point in the history
  17. Did this commit

    Dmum303 committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    158f813 View commit details
    Browse the repository at this point in the history
  18. Merge pull request #7 from Dmum303/footer

    Footer
    Dmum303 authored Nov 7, 2022
    Configuration menu
    Copy the full SHA
    3af3163 View commit details
    Browse the repository at this point in the history
  19. Comments front end

    Dmum303 committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    9b3c774 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. Configuration menu
    Copy the full SHA
    68f14f8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d33632 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7dd074b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3311260 View commit details
    Browse the repository at this point in the history
  5. Change favicon

    Arshad-Siddiqui committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    7f454da View commit details
    Browse the repository at this point in the history
  6. Comments fronted working

    Dmum303 committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    5dddbca View commit details
    Browse the repository at this point in the history
  7. Merge pull request #10 from Dmum303/footer

    Footer
    Dmum303 authored Nov 8, 2022
    Configuration menu
    Copy the full SHA
    b730fa8 View commit details
    Browse the repository at this point in the history
  8. minor adj

    Dmum303 committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    278ce55 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    382c4d8 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    6e0ec7c View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    378ab4d View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    c43c988 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    193d984 View commit details
    Browse the repository at this point in the history
  14. minor adj2

    Dmum303 committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    7420200 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. comments sorted

    Dmum303 committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    78daeff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ed08eab View commit details
    Browse the repository at this point in the history
  3. Merge pull request #11 from Dmum303/frontendcomments

    Frontendcomments
    Arshad-Siddiqui authored Nov 9, 2022
    Configuration menu
    Copy the full SHA
    163aa0c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    106a912 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d0caeff View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7e04a56 View commit details
    Browse the repository at this point in the history
  7. Testing PostForm image

    saritahub committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    a0a225b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    799411c View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    48b62a7 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    ee05c8c View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    5bacf10 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b93bcde View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    c8e7e37 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    c884f4d View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    fc4e579 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    b24a7ef View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    06d72ca View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    4c13e23 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    8b4ccbe View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    0f1d580 View commit details
    Browse the repository at this point in the history
  21. hide comments complete

    Dmum303 committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    2d967e0 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    ca7b689 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    11ab1aa View commit details
    Browse the repository at this point in the history
  24. messing with css

    Dmum303 committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    bad4792 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    1b1f467 View commit details
    Browse the repository at this point in the history
  26. Create friend card

    Arshad-Siddiqui committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    184a806 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    3a6bd9f View commit details
    Browse the repository at this point in the history
  28. start flexbox

    Dmum303 committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    46fa6d3 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    a725a98 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    44eabb6 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    4a3dd6b View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    41e0781 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    ae5ea67 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    09d288a View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    9c3b456 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    da57a65 View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    54fa100 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    6427c95 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    cdb8824 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    fa5f0e2 View commit details
    Browse the repository at this point in the history
  41. Configuration menu
    Copy the full SHA
    77c1ea0 View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    8998500 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. Refactor

    saritahub committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    0193418 View commit details
    Browse the repository at this point in the history
  2. Photos added to posts

    saritahub committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    2d188e2 View commit details
    Browse the repository at this point in the history
  3. Image style amended

    saritahub committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    f036907 View commit details
    Browse the repository at this point in the history
  4. next com

    Dmum303 committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    bfebbae View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c6f0b08 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    18032e2 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #13 from Dmum303/final-photo-upload

    Final photo upload
    Arshad-Siddiqui authored Nov 10, 2022
    Configuration menu
    Copy the full SHA
    773d407 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0d6e957 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    3dc9b13 View commit details
    Browse the repository at this point in the history
  10. Removed comment from css

    Dmum303 committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    a5188e0 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #15 from Dmum303/commentstyletest2

    Commentstyletest2
    Dmum303 authored Nov 10, 2022
    Configuration menu
    Copy the full SHA
    9fb0588 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    71e7c71 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    4ba4a3f View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    f76fc3f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    c983793 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    9e8c974 View commit details
    Browse the repository at this point in the history