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

Release after Sprint #3 and #4 #76

Merged
merged 32 commits into from
Jan 15, 2017
Merged

Release after Sprint #3 and #4 #76

merged 32 commits into from
Jan 15, 2017

Conversation

lauralindal
Copy link
Owner

  • Display Current Credits
  • Add legend to module plan
  • Render User data depending on login status
  • Provide Mock up data for lectures

@tzokoli please review

Lena Koester and others added 30 commits December 5, 2016 14:18
calculate and display current credits
1490a55
add selectedCourseCounter
0f15ae5
@noobiba
Add legend to ModulePlan.
72ee8de
@noobiba
Change legend names in german.
1cfdcc5
@noobiba
Add additional legend entry for urgent module in Module Pool.
a6cf1ab
@lauralindal
Update Hoodie in oder to enable Signout in Firefox, too.
58e9250
@lauralindal
Merge pull request #66 from lauralindal/63-calculate-current-credits
6657355 
\o/
@noobiba
Rename css style for legend.
427a166
@lauralindal
Conditional rendering of Login component or button, depending on status
516f150
@lauralindal
Get Hoodies data about SignIn status
e998390
@lauralindal
Merge pull request #68 from lauralindal/update-hoodie-2
43197da 
Update Hoodie
@noobiba
Add flex-container (ok in Firefox, still buggy in Chrome.
089fe0e
@noobiba
Change wording for legend.
222d81e
@noobiba
Align text with element.
5e87720
@noobiba
Make top/bottom border.
f834d9c
@noobiba
Delete 'Legende'.
c1fc390
@noobiba
Delete css redundancies. Change size of displayed legend box.
3d1a5d6
@zoepage
fix: added workaround to session error
9dc6362
@noobiba
Change wording according to pull request comment.
c943d23
@lauralindal
Merge pull request #70 from lauralindal/57-add-legend-for-module-status
604d6a4 
57 add legend for module status
@lauralindal
Merge pull request #71 from lauralindal/65-display-login-status
4f79cce 
Display Login status
@lauralindal
Display User Data only if logged in
63502e1
@lauralindal
Merge pull request #72 from lauralindal/61-enable-logout
7263d67 
Depend Display on User's Login Status
@sarahkami
add two ideas for mock-data-display
0579902
@sarahkami
add information to mock-data
ecdbf85
@sarahkami
add info for sem 1-3
eef2abe
@tzokoli
info semester 3-6
612444d
@tzokoli
resolve merge conflicts
d4d0af3
@sarahkami
harmonize mock-data
c65286d
Remove excessive commas from file
9211a61
@tzokoli
Copy link
Collaborator

tzokoli commented Jan 14, 2017

  • Display Current Credits
  • Add legend to module plan
  • Render User data depending on login status
  • Provide Mock up data for lectures

Sorry for the late review,
everything works,
let's merge :)

@lauralindal lauralindal merged commit ab4d435 into master Jan 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lauralindal @tzokoli @noobiba @zoepage @sarahkami