Skip to content
Commits on Jun 15, 2016
  1. @mgersh

    Merge pull request #2126 from learning-unlimited/per-program-cleanup

    Dead code cleanup: per-program templates and emailprefs
    mgersh committed on GitHub Jun 14, 2016
  2. @mgersh

    Delete the emailprefs view and corresponding model

    The migration in here includes this change and one from #1830.
    mgersh committed Jun 11, 2016
  3. @mgersh

    Delete "per-program templates" functionality

    It stopped making sense when we started using the same codebase for more
    than one site, and no one is using it.
    
    There's also a bit of various code cleanup in here from checking all the
    render_to_response() calls.
    mgersh committed Jun 11, 2016
Commits on Jun 14, 2016
  1. @betaveros @benjaminjkraft
Commits on Jun 13, 2016
  1. @mgersh @benjaminjkraft

    Performance fixes (#2124)

    This should help a lot with the dashboard stats.  Also added a test for dashboard grades stats.
    mgersh committed with benjaminjkraft Jun 13, 2016
  2. @mgersh @benjaminjkraft

    Delete login by birthday and school (#2127)

    They leak user data.
    mgersh committed with benjaminjkraft Jun 13, 2016
Commits on Jun 2, 2016
  1. @mgersh

    Merge pull request #2123 from learning-unlimited/contributing-link

    Add links between contributing and vagrant docs and README
    mgersh committed Jun 1, 2016
  2. @benjaminjkraft
  3. @benjaminjkraft
  4. @benjaminjkraft
Commits on Jun 1, 2016
  1. @mgersh @benjaminjkraft

    Clean up our URL patterns (#2121)

    The main goal of this commit is to remove uses of patterns() and string
    view arguments to url(), both of which are deprecated. While I was doing
    that, I moved some patterns into per-app files and cleaned up the main
    urls.py a bit. Progress towards, but not a complete fix for, #1292.
    
    (I still compulsively fix warnings.)
    mgersh committed with benjaminjkraft Jun 1, 2016
Commits on May 17, 2016
  1. @tankersleyk @benjaminjkraft
Commits on Apr 28, 2016
  1. @uakfdotb @benjaminjkraft

    Fix issue where QSD edit is not saved in some cases. (#2116)

    Specifically, if only title is edited and other fields stay the same, then
    the edit would not be made. The code is cleaned up so the condition and copies
    aren't duplicated.
    uakfdotb committed with benjaminjkraft Apr 28, 2016
Commits on Apr 23, 2016
  1. @hwatheod @benjaminjkraft

    Fix scrolling class list so only class time block events are consider…

    …ed (#2113)
    
    Fixes #2110. Also took the opportunity to add a comment on what timedelta(-1, 85200) does.
    hwatheod committed with benjaminjkraft Apr 22, 2016
  2. @hwatheod @benjaminjkraft

    modify lunch constraints module to allow generating lunch sections wi…

    …thout generating constraints (#2105)
    
    Added an additional checkbox (generate_constraints) to the lunch constraints module which indicates whether to really generate lunch scheduling constraints, or generate lunch sections only. Fixes #2103.
    
    Also modified the instructions on lunch_constraints.html accordingly.
    hwatheod committed with benjaminjkraft Apr 22, 2016
Commits on Apr 15, 2016
  1. @mgersh @benjaminjkraft

    Fix bug in schedules with compulsory events (#2112)

    If the "class" is a compulsory event, grab start time via the appropriate attribute.
    mgersh committed with benjaminjkraft Apr 14, 2016
Commits on Apr 13, 2016
  1. @hwatheod @benjaminjkraft
Commits on Apr 8, 2016
  1. @hwatheod @benjaminjkraft

    Don't clear teacher interview or training signups when editing class …

    …availability (fix #2071) (#2093)
    
    Make clearAvailableTimes() clear only Class Time Block events, not all events (for a particular teacher and program). This fixes #2071.
    hwatheod committed with benjaminjkraft Apr 7, 2016
  2. @btidor

    Merge pull request #1712 from learning-unlimited/ticket-1454

    Ticket 1454
    btidor committed Apr 7, 2016
  3. @btidor

    Merge pull request #2047 from learning-unlimited/user-classes-cleanup

    Refactor of user_classes.js
    btidor committed Apr 7, 2016
  4. @btidor

    Merge pull request #2015 from learning-unlimited/bio-url-cleanup

    Deprecate and redirect old teacher bio URLs
    btidor committed Apr 7, 2016
Commits on Apr 7, 2016
  1. @benjaminjkraft
  2. @benjaminjkraft

    Fix for ticket #1309

    - Added more fields to program list in admin panel
    - Added search on name
    benjaminjkraft committed Apr 6, 2016
  3. @benjaminjkraft
  4. @benjaminjkraft

    Cleanup fix for #1454

    benjaminjkraft committed Apr 6, 2016
  5. @hwatheod @benjaminjkraft

    Add date of birth as an option to listgen

    Needed by Stanford to complete "working with minors" registration form requested by the university.
    hwatheod committed with benjaminjkraft Apr 6, 2016
  6. @mgersh @benjaminjkraft

    Add setting to prevent theme clobbering

    Some sites are still on themes that aren't in generic templates. Ideally they
    wouldn't be, but until we fix that, this will make it harder to accidentally
    clobber one of these themes. It also makes manage.py update safe to use on these
    sites, which should make releases easier.
    mgersh committed with benjaminjkraft Apr 7, 2016
Commits on Apr 6, 2016
  1. @hwatheod @benjaminjkraft

    Add documentation in vagrant.rst for using PyCharm IDE

    Added some documentation in vagrant.rst for setting up the project in the PyCharm IDE. It only works in the Professional Edition.
    hwatheod committed with benjaminjkraft Apr 5, 2016
Commits on Apr 1, 2016
  1. @benjaminjkraft

    Merge pull request #2092 from learning-unlimited/getListDescriptions

    getListDescriptions() shouldn't be cached
    benjaminjkraft committed Apr 1, 2016
  2. @benjaminjkraft

    Merge pull request #2090 from learning-unlimited/approve-reject-statu…

    …s-dashboard
    
    Make the approve/unreview/reject buttons on the status popup behave correctly in all cases
    benjaminjkraft committed Apr 1, 2016
Commits on Mar 29, 2016
  1. @jmoldow

    getListDescriptions() shouldn't be cached

    This is because arbitrary program modules may add new lists at
    any time.
    
    Program.students(), Program.teachers(), etc. are already not
    cached.
    jmoldow committed Mar 28, 2016
Commits on Mar 27, 2016
  1. @hwatheod

    Make the approve/unreview/reject buttons on the status popup behave c…

    …orrectly in all cases
    hwatheod committed Mar 27, 2016
  2. @mgersh

    Merge pull request #2088 from learning-unlimited/no-lunch-category-ex…

    …ception
    
    Fix exception in studentregtwophase.py when there is no Lunch category
    mgersh committed Mar 27, 2016
  3. @mgersh

    Merge pull request #2087 from learning-unlimited/two-phase-hidden-class

    Remove hidden classes in catalog-new.js (fixes #2086)
    mgersh committed Mar 27, 2016
  4. @hwatheod
Something went wrong with that request. Please try again.