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.

Sign up for GitHub

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

Jump to bottom

Djello #31

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open

Djello #31

wants to merge 95 commits into from

Commits on Oct 22, 2017

  1. Rails setup

    @yxlau
    yxlau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    fa3cb67 View commit details
    Browse the repository at this point in the history

  2. Set up User back end

    @yxlau
    yxlau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    a039873 View commit details
    Browse the repository at this point in the history

  3. Set up React

    @yxlau
    yxlau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    8811b7a View commit details
    Browse the repository at this point in the history

  4. Set up login component

    @yxlau
    yxlau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    9b700b9 View commit details
    Browse the repository at this point in the history

  5. Enable CORS

    @yxlau
    yxlau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    099a8d6 View commit details
    Browse the repository at this point in the history

  6. Set up authentication (WIP)

    @yxlau
    yxlau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    a3926b7 View commit details
    Browse the repository at this point in the history

  7. Add login error message

    @yxlau
    yxlau committed Oct 22, 2017
    Configuration menu
    Copy the full SHA
    b0758ca View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2017

  1. Set up user requests

    @yxlau
    yxlau committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    51e01df View commit details
    Browse the repository at this point in the history

  2. Set up navbar

    @yxlau
    yxlau committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    977bf4e View commit details
    Browse the repository at this point in the history

  3. Set up logout

    @yxlau
    yxlau committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    00d51a2 View commit details
    Browse the repository at this point in the history

  4. Set up logout

    @yxlau
    yxlau committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    1ab3404 View commit details
    Browse the repository at this point in the history

  5. Set up board, membership, list and card models

    @yxlau
    yxlau committed Oct 24, 2017
    Configuration menu
    Copy the full SHA
    8fb7f65 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2017

  1. Set up user and main controllers

    @yxlau
    yxlau committed Oct 25, 2017
    Configuration menu
    Copy the full SHA
    d172399 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2017

  1. Set up board show and update on back end

    @yxlau
    yxlau committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    ed914ce View commit details
    Browse the repository at this point in the history

  2. Set up board update and show on front end

    @yxlau
    yxlau committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    f9fa841 View commit details
    Browse the repository at this point in the history

  3. Set up board destroy and update on back end

    @yxlau
    yxlau committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    0504d06 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2017

  1. Set up board destroy and update on front end

    @yxlau
    yxlau committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    827179a View commit details
    Browse the repository at this point in the history

  2. Update seeds file

    @yxlau
    yxlau committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    758ea9c View commit details
    Browse the repository at this point in the history

  3. Fix main controller request

    @yxlau
    yxlau committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    bae2019 View commit details
    Browse the repository at this point in the history

  4. Set up board selection

    @yxlau
    yxlau committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    04ed251 View commit details
    Browse the repository at this point in the history

  5. Fix main controller data lookup

    @yxlau
    yxlau committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    897678c View commit details
    Browse the repository at this point in the history

  6. Set up board creation

    @yxlau
    yxlau committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    d49d9d7 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2017

  1. Fix incoming data for board GET requests

    @yxlau
    yxlau committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    23cfb58 View commit details
    Browse the repository at this point in the history

  2. Set up list updates

    @yxlau
    yxlau committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    5df7d02 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2017

  1. Set up list creation

    @yxlau
    yxlau committed Oct 31, 2017
    Configuration menu
    Copy the full SHA
    4956ec7 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2017

  1. Update list style

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    56600aa View commit details
    Browse the repository at this point in the history

  2. Fix Board request specs

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    418daef View commit details
    Browse the repository at this point in the history

  3. Add PropTypes to Confirmation component

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    05ac676 View commit details
    Browse the repository at this point in the history

  4. Set up list deletion

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    c494941 View commit details
    Browse the repository at this point in the history

  5. Update style for delete list button

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    17a108f View commit details
    Browse the repository at this point in the history

  6. Set up ListCard view

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    b9fda82 View commit details
    Browse the repository at this point in the history

  7. Set up card creation on back end

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    45e6a3b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'board'

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    3b42b37 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'board/card'

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    f1ac571 View commit details
    Browse the repository at this point in the history

  10. Set up card creation

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    f131abd View commit details
    Browse the repository at this point in the history

  11. Start setting up card details view

    @yxlau
    yxlau committed Nov 1, 2017
    Configuration menu
    Copy the full SHA
    705f248 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. Set up updates for cards

    @yxlau
    yxlau committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    becb954 View commit details
    Browse the repository at this point in the history

  2. Fix up card details view

    @yxlau
    yxlau committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    feff1ff View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2017

  1. Set up "mark done" for cards

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    f427ead View commit details
    Browse the repository at this point in the history

  2. Ensure no duplicate card memberships

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    7ece239 View commit details
    Browse the repository at this point in the history

  3. Set up membership revocation

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    b77dd9a View commit details
    Browse the repository at this point in the history

  4. Set up member creation on back end

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    b3178a9 View commit details
    Browse the repository at this point in the history

  5. Redesign board memberships on back end

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    896fa29 View commit details
    Browse the repository at this point in the history

  6. Improve user model spec

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    e24898d View commit details
    Browse the repository at this point in the history

  7. Fix context wording

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    8c7498e View commit details
    Browse the repository at this point in the history

  8. Set up card member addition

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    93ceb7e View commit details
    Browse the repository at this point in the history

  9. Make sure potential card member pool is updated when user changes boards

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    28ba73a View commit details
    Browse the repository at this point in the history

  10. Fix invalid prop type

    @yxlau
    yxlau committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    f361c4b View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2017

  1. Merge cards into master

    @yxlau
    yxlau committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    5922f24 View commit details
    Browse the repository at this point in the history

  2. Fix card creation spec

    @yxlau
    yxlau committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    9d6fbf3 View commit details
    Browse the repository at this point in the history

  3. Remove unused model

    @yxlau
    yxlau committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    6eae000 View commit details
    Browse the repository at this point in the history

  4. Set up board accessibility for card members

    @yxlau
    yxlau committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    293baf5 View commit details
    Browse the repository at this point in the history

  5. Update card specs to check for update authorization

    @yxlau
    yxlau committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    010ab34 View commit details
    Browse the repository at this point in the history

  6. Ensure that card gets deleted when marked as done

    @yxlau
    yxlau committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    0f66b1b View commit details
    Browse the repository at this point in the history

  7. Remove "done" status from cards since "done" cards are destroyed

    @yxlau
    yxlau committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    7e58ecf View commit details
    Browse the repository at this point in the history

  8. Fix button style

    @yxlau
    yxlau committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    90fa6e9 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2017

  1. Set up activity model

    @yxlau
    yxlau committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    bb87eb7 View commit details
    Browse the repository at this point in the history

  2. Remove max-width from board container

    @yxlau
    yxlau committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    a2545c4 View commit details
    Browse the repository at this point in the history

  3. Allow user to assign cards to a different list

    @yxlau
    yxlau committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    3a6053b View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2017

  1. Set up activity tracking on back end

    @yxlau
    yxlau committed Nov 11, 2017
    Configuration menu
    Copy the full SHA
    2486ae8 View commit details
    Browse the repository at this point in the history

  2. Fix card creation bug

    @yxlau
    yxlau committed Nov 11, 2017
    Configuration menu
    Copy the full SHA
    f221706 View commit details
    Browse the repository at this point in the history

  3. Fix card reducer

    @yxlau
    yxlau committed Nov 11, 2017
    Configuration menu
    Copy the full SHA
    9f900be View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2017

  1. Fix card creation bug

    @yxlau
    yxlau committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    6225e23 View commit details
    Browse the repository at this point in the history

  2. Use object instead of array to store board members

    @yxlau
    yxlau committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    937506e View commit details
    Browse the repository at this point in the history

  3. Set up activities on front end

    @yxlau
    yxlau committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    6254027 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2017

  1. Display member names on card

    @yxlau
    yxlau committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    b7384a8 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2017

  1. Set up card drag and drop sorting

    @yxlau
    yxlau committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    f3eccb7 View commit details
    Browse the repository at this point in the history

  2. Set up 'esc' key for exiting edit mode

    @yxlau
    yxlau committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    7ce4d25 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2017

  1. Add esc key function for board creator

    @yxlau
    yxlau committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    db63137 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2017

  1. normalize data

    @yxlau
    yxlau committed Nov 18, 2017
    Configuration menu
    Copy the full SHA
    11984bc View commit details
    Browse the repository at this point in the history

  2. Set up loading indicator

    @yxlau
    yxlau committed Nov 18, 2017
    Configuration menu
    Copy the full SHA
    4ca1124 View commit details
    Browse the repository at this point in the history

  3. Fix modal cancel button size

    @yxlau
    yxlau committed Nov 18, 2017
    Configuration menu
    Copy the full SHA
    3aa766c View commit details
    Browse the repository at this point in the history

  4. Fix bug when adding card member

    @yxlau
    yxlau committed Nov 18, 2017
    Configuration menu
    Copy the full SHA
    1213dc0 View commit details
    Browse the repository at this point in the history

  5. Ensure all boards for a user are returned

    @yxlau
    yxlau committed Nov 18, 2017
    Configuration menu
    Copy the full SHA
    a684c1b View commit details
    Browse the repository at this point in the history

  6. Start working on errors

    @yxlau
    yxlau committed Nov 18, 2017
    Configuration menu
    Copy the full SHA
    53f1831 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2017

  1. Fix login error handling

    @yxlau
    yxlau committed Nov 21, 2017
    Configuration menu
    Copy the full SHA
    618dcb6 View commit details
    Browse the repository at this point in the history

  2. Give /client its own repository

    @yxlau
    yxlau committed Nov 21, 2017
    Configuration menu
    Copy the full SHA
    2f7289c View commit details
    Browse the repository at this point in the history

  3. Update CORS origin

    @yxlau
    yxlau committed Nov 21, 2017
    Configuration menu
    Copy the full SHA
    74b3fd8 View commit details
    Browse the repository at this point in the history

  4. -

    @yxlau
    yxlau committed Nov 21, 2017
    Configuration menu
    Copy the full SHA
    bb39b10 View commit details
    Browse the repository at this point in the history

  5. Set up cors in config/initializers/cors.rb

    @yxlau
    yxlau committed Nov 21, 2017
    Configuration menu
    Copy the full SHA
    01906e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2017

  1. Switch origin

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    5e3b832 View commit details
    Browse the repository at this point in the history

  2. Add /client back to repo

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    62502b1 View commit details
    Browse the repository at this point in the history

  3. Set up user registration on back end

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    f41a220 View commit details
    Browse the repository at this point in the history

  4. Use strong params for user creation

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    fb81cbf View commit details
    Browse the repository at this point in the history

  5. Fix back end for user sign ups

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    e59bb16 View commit details
    Browse the repository at this point in the history

  6. Set up user sign up on front end

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    9841670 View commit details
    Browse the repository at this point in the history

  7. Use ENV vars for CORS origin

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    7091439 View commit details
    Browse the repository at this point in the history

  8. Update baseURL

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    b8e4d1d View commit details
    Browse the repository at this point in the history

  9. Update README

    @yxlau
    yxlau committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    39ae331 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2017

  1. Fix card activities on membership creation and deletion

    @yxlau
    yxlau committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    a04a952 View commit details
    Browse the repository at this point in the history

  2. Fix user creation bugs

    @yxlau
    yxlau committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    b5c9095 View commit details
    Browse the repository at this point in the history

  3. Fix activity bug

    @yxlau
    yxlau committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    f2f8eeb View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Specify ruby version

    @yxlau
    yxlau committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    e3c6e80 View commit details
    Browse the repository at this point in the history

  2. Revert "Fix activity bug" 

    This reverts commit f2f8eeb.
    @yxlau
    yxlau committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    e1f4a78 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/yxlau/project_djello

    @yxlau
    yxlau committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    6880262 View commit details
    Browse the repository at this point in the history