Skip to content
This repository has been archived by the owner on Mar 7, 2019. It is now read-only.

Add Dev Branch to Master #41

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

Add Dev Branch to Master #41

wants to merge 50 commits into from

Conversation

billmwong
Copy link
Member

@billmwong billmwong commented May 26, 2017 •
edited

This change is Reviewable

rsiegel812 and others added 30 commits April 30, 2017 22:39
Added Button to Save Course Plan
78acec5
@arianaolson419
Merge branch 'master' of https://github.com/olin/register into REG-49…
30db511 
…/update-plan-button

Conflicts:
	src/containers/SemesterListContainer.jsx
@arianaolson419
Add button to bottom of page
0384850
@arianaolson419
Remove button from component
320ec9c
@arianaolson419
Create a button to save plan
821eeb2
@arianaolson419
Add actions to post to /updateplan route
b2a1b32
@arianaolson419
Merge branch 'master' of https://github.com/olin/register into REG-49…
d08d2a4 
…/update-plan-button

Conflicts:
	src/reducers/LoginReducer.jsx
@arianaolson419
Merge branch 'master' of https://github.com/olin/register into dev
ea3f849 
Conflicts:
	src/actions/actions.jsx
	src/reducers/ProgressTrackerReducer.jsx
Added NavBar to SemesterPlanPage
4c8c01d
Split Fall and Spring Semesters into Columns
9cdf6eb
fix: linter error
f787e9d
@logandavis
Hotfix registration to add sane default name
b1c8176
@logandavis
Merge pull request #38 from olin/hotfix-register
77e73b3 
Hotfix registration to add sane default name
@logandavis
Added Button to Save Course Plan
5365401
@arianaolson419 @logandavis
Add button to bottom of page
b8831eb
@arianaolson419 @logandavis
Remove button from component
3b5ae7d
@arianaolson419 @logandavis
Create a button to save plan
e4724d9
@logandavis
fix: linter error
a84b232
@logandavis
Hotfix registration to add sane default name
8e02481
@logandavis
Merge the different spacings T_T
d7c0f8b
@logandavis
re-add missing action (?)
2054466
@logandavis
Never mind T______T
7928142
@logandavis
Added Button to Save Course Plan
7828277
@arianaolson419 @logandavis
Add button to bottom of page
3b234db
@arianaolson419 @logandavis
Remove button from component
1975d7e
@arianaolson419 @logandavis
Create a button to save plan
faa9fb2
@logandavis
fix: linter error
c8692ac
@logandavis
Hotfix registration to add sane default name
0dcf17c
@logandavis
Added Button to Save Course Plan
0fe0c95
@arianaolson419 @logandavis
Remove button from component
48483ff
Jeremy Garcia and others added 18 commits May 2, 2017 17:21
@logandavis
fix: linter error
dd6c1bd
@logandavis
re-add missing action (?)
f58847e
@logandavis
Never mind T______T
d8b70ea
@logandavis
Finish rebasing
d2c4ee5
@logandavis
Finish rebasing
ffb8b49
@logandavis
Touch up style on login page
2f15add
@logandavis
Adds state logic for login and register error components
028742a 
The login page was crashing on incorrect registers, and also
had no way of surfacing error messages. This commit fixes
the former problem and adds the state changes necessary
to display the latter.
@logandavis
Fix prop population errors on Login page
14e6f8a 
The connect function wasn't quite woring right, which was causing ugly
console errors and incorrect rehydrating. This commit fixes that by
adding mapDispatchToProps() and using it right.
@logandavis
Add error bar for registration errors, with styling
c1cb6fd
@logandavis
Add login error bar
0e128d0
@logandavis
Merge pull request #39 from olin/REG-69-dev
8dd9b53 
Reg 69 dev
@arianaolson419
Add route to calendar page
3177ef3
@arianaolson419
Remove unused function
11f310d
@logandavis
Added NavBar to SemesterPlanPage
c183b9b
@logandavis
Split Fall and Spring Semesters into Columns
785cc77
@logandavis
Add UpdatePlan
9b61fd7
@logandavis
Merge pull request #40 from olin/REG-54/style-calendar-page
2105931 
Reg 54/style calendar page
@arianaolson419
Patch referencing errors
63f4b62
@billmwong billmwong added the wip label May 26, 2017
@billmwong
Merge branch 'master' of github.com:olin/register into dev
6d54e09 
Conflicts:
	routes/index.js
	src/actions/actions.jsx
	src/reducers/LoginReducer.jsx
@billmwong
Copy link
Member Author

billmwong commented May 26, 2017 •
edited

Known features in here:

  • Consolidated reducers with combineReducers() into [Student, Major, Courses, Progress, CoursePlanner]
  • Styled Calendar Page
  • "Update Plan" button to save plan to database
  • Register new user hotfix

TODO:

  • Check that this branch is functional
  • Check that register hotfix to make sure that works
  • Check that this code is good
  • Update any code as necessary

TODO from JIRA:

  • Make linked reqs talk to each other (e.g. When you select "Linearity I" for your "Linearity I" requirement, it should also chunk that into your "Math" credit requirement)
  • Pull the calendar all together
  • Sync client state to server
  • link to calendar page

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
wip
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@billmwong @arianaolson419 @logandavis