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

Updates master with the new features #287

Merged
merged 192 commits into from
Mar 8, 2018
Merged

Updates master with the new features #287

merged 192 commits into from
Mar 8, 2018

Conversation

ghatighorias
Copy link
Contributor

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

rhnonose and others added 30 commits September 15, 2017 14:15
@rhnonose
Add timezone type as a system variable.
bb1efb2
@rhnonose
Replace Timex.now calls with timezone shifts.
b434135
@rhnonose
Move timezone function to settings module.
ceb3473
@rhnonose
Convert display times in views/templates according to configured time…
899db17 
…zone.
@rhnonose
Add fallback controller.
13ce026
@rhnonose
Let users 404 errors fallback.
531cb3a
@rhnonose
Let attendances 404 errors fallback.
9879480
@rhnonose
Let classes 404 errors fallback.
297d7f5
@rhnonose
Let courses 404 errors fallback.
2c264bb
@rhnonose
Let tasks 404 errors fallback.
c03fff6
@rhnonose
Let terms 404 errors fallback.
da99502
@rhnonose
Move class stuff from controller to context.
643b9c0
@rhnonose
Move coordinator stuff from controller to context.
caa90f5
@rhnonose
Move offered course stuff from controller to context.
a2e744b
@rhnonose
Move settings stuff from controller to context.
f60b1d0
@rhnonose
Merge branch 'master' into nonose/action_fallback
539b230
@rhnonose
Fix warnings.
df9fa1d
@rhnonose
Test fallback controller.
d439f0e
@rhnonose
Merge branch 'master' into nonose/timezone
9456e6e
@rhnonose
Convert timezone when storing in task and fix some stuff.
e91161c
@rhnonose
Test different datetime types.
603ef62
@rhnonose
Merge branch 'master' into nonose/timezone
b8f103e
@ghatighorias
adds all the attendances of a student to its show page
c73311a
@ghatighorias
consider class starting time for ordering as well
c08a60e
@ghatighorias
adds the forgoten where to the query
5af6529
@ghatighorias
Fixes the query to filter the correct attendance
ace597e
@rhnonose
Merge branch 'master' into ghatighorias/fix_attendance_sorting
2c01029
@rhnonose
Merge pull request #261 from digitalnatives/ghatighorias/fix_attendan…
6dc8472 
…ce_sorting

considers class starting time for ordering as well
@rhnonose
Merge pull request #260 from digitalnatives/ghatighorias/add_student_…
5e51183 
…attendances_to_show_page

Adds student attendances to show page
@rhnonose
Merge branch 'develop' into nonose/action_fallback
9e7db2f
ghatighorias and others added 28 commits November 2, 2017 16:31
@ghatighorias
renames the 'display every classes' to every slot
ca23519
@rhnonose
Remove unnecessary error handling.
f48c3cd
@rhnonose
Increment controller test with supervisor role.
6efffde
@rhnonose
Fix event fetching for supervisor.
0ae3945
@rhnonose
Let supervisor see offered course.
5e13dae
@ghatighorias
changes the color of slots based on if they are events or classes
1e7c292
@ghatighorias
fixes the coloring in the assets
344ff13
@rhnonose
Merge pull request #280 from digitalnatives/ghatighorias/show_events_…
5808cd7 
…in_the_calendar

Shows the events to the calendar
@rhnonose
Fix typo.
6152746
@rhnonose
Change future events to upcoming events.
50f2e71
@rhnonose
Remove unnecessary template.
ab5485d
@rhnonose
Merge pull request #279 from digitalnatives/nonose/supervisor_role
88781fd 
Supervisor role
@rhnonose
Merge branch 'develop' into nonose/split_events
95f9331
@rhnonose
Merge pull request #278 from digitalnatives/nonose/split_events
889c627 
Split event in index by past and future.
@rhnonose
Merge branch 'develop' into nonose/action_fallback
6244798
@rhnonose
Merge pull request #254 from digitalnatives/nonose/action_fallback
3fed07e 
Use phoenix 1.3's action_fallback
@ghatighorias
Provides the day view option
43541b7
@ghatighorias
adds renaming and fix current day button
9f14a7a
@ghatighorias
Fixes tooltip and the case when no date is in request
4b02039
@ghatighorias
fixes typo
cdf809b
@rhnonose
Merge pull request #282 from digitalnatives/ghatighorias/adds_day_vie…
128a242 
…w_to_calendar

Provides the day view option
@rhnonose
Fix environment variable capture for heroku.
0ebb701
@rhnonose
Merge pull request #283 from digitalnatives/nonose/fix_env_variables
c92cf6a 
Fix environment variable capture for heroku.
@ghatighorias
Fixes password length check when user updates itself
20b6caf
@ghatighorias
simplifies the test
e6d5e49
@rhnonose
Merge pull request #284 from digitalnatives/ghatighorias/fix_password…
3b2824d 
…_length_check

Fixes password length check when user updates itself
@ghatighorias
Fixes the messages given to the user
ba9e53b
@rhnonose
Merge pull request #286 from digitalnatives/ghatighorias/fix_messeges
a6ef19f 
Fixes the messages given to the user
@coveralls
Copy link

Coverage Status

Coverage increased (+9.7%) to 95.929% when pulling a6ef19f on develop into 0b164b0 on master.

@ghatighorias ghatighorias merged commit 8f1168d into master Mar 8, 2018
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.

None yet
3 participants
@ghatighorias @coveralls @rhnonose