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.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Postgres 9 service pg_ctl command is returning invalid path #9011

Closed
sinemetu1 opened this Issue Jan 4, 2018 · 6 comments

Comments

Projects
None yet
2 participants
@sinemetu1
Copy link

sinemetu1 commented Jan 4, 2018

Hello,

Our travis builds are using the postgresql service feature. For some reason builds in the past few days have been failing because pg_ctl --bindir reports an invalid path (for version 10? 馃). I've created a travis build and yaml to reproduce this. Here is the .travis.yaml:

sudo: false
language: python
python: 3.6

services:
    - postgresql

script:
    - which pg_ctl
    - echo $PATH
    - pg_config --bindir
    - ls -lh /usr/lib/postgresql/
    - ls -lh /usr/lib/postgresql/10/bin/
    - ls -lh /usr/lib/postgresql/10/bin/pg_ctl

Here's the travis build: https://travis-ci.org/sinemetu1/test-pg-travis/builds/325130012

And the related section of the logs:

...
$ which pg_ctl
The command "which pg_ctl" exited with 1.
$ echo $PATH
/home/travis/virtualenv/python3.6.3/bin:/home/travis/bin:/home/travis/.local/bin:/opt/pyenv/shims:/home/travis/.phpenv/shims:/home/travis/perl5/perlbrew/bin:/home/travis/.nvm/versions/node/v8.9.1/bin:/home/travis/.kiex/elixirs/elixir-1.4.5/bin:/home/travis/.kiex/bin:/home/travis/.rvm/gems/ruby-2.4.1/bin:/home/travis/.rvm/gems/ruby-2.4.1@global/bin:/home/travis/.rvm/rubies/ruby-2.4.1/bin:/home/travis/gopath/bin:/usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/home/travis/.gimme/versions/go1.7.4.linux.amd64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/travis/.rvm/bin:/home/travis/.phpenv/bin:/opt/pyenv/bin:/home/travis/.yarn/bin
The command "echo $PATH" exited with 0.
$ pg_config --bindir
/usr/lib/postgresql/10/bin
The command "pg_config --bindir" exited with 0.
$ ls -lh /usr/lib/postgresql/
total 0
drwxr-xr-x 4 root root 26 Dec  5 19:59 9.2
drwxr-xr-x 4 root root 26 Dec  5 19:59 9.3
drwxr-xr-x 4 root root 26 Dec  5 20:00 9.4
drwxr-xr-x 4 root root 26 Dec  5 20:00 9.5
drwxr-xr-x 4 root root 26 Dec  5 20:00 9.6
The command "ls -lh /usr/lib/postgresql/" exited with 0.
$ ls -lh /usr/lib/postgresql/10/bin/
ls: cannot access /usr/lib/postgresql/10/bin/: No such file or directory
...

Thanks for your time and help!

@BanzaiMan

This comment has been minimized.

Copy link
Member

BanzaiMan commented Jan 4, 2018

This feels like a packaging issue. We are installing postgresql-common, which provides this file. Even when there is no PostgreSQL 10 package installed on the system, the binary /usr/bin/pg_config.libpq-dev has strings pointing to version 10.

travis@42efb11a6c57:~$ dpkg -l | grep postgres
ii  pgdg-keyring                             2017.3                                     all          keyring for apt.postgresql.org
ii  postgresql-9.2                           9.2.24-1.pgdg14.04+1                       amd64        object-relational SQL database, version 9.2 server
ii  postgresql-9.2-postgis-2.3-scripts       2.3.3+dfsg-1.pgdg14.04+1                   all          Geographic objects support for PostgreSQL 9.2 -- scripts
ii  postgresql-9.3                           9.3.20-1.pgdg14.04+1                       amd64        object-relational SQL database, version 9.3 server
ii  postgresql-9.3-postgis-2.3-scripts       2.3.3+dfsg-1.pgdg14.04+1                   all          Geographic objects support for PostgreSQL 9.3 -- scripts
ii  postgresql-9.4                           9.4.15-1.pgdg14.04+1                       amd64        object-relational SQL database, version 9.4 server
ii  postgresql-9.4-postgis-2.3-scripts       2.3.3+dfsg-1.pgdg14.04+1                   all          Geographic objects support for PostgreSQL 9.4 -- scripts
ii  postgresql-9.5                           9.5.10-1.pgdg14.04+1                       amd64        object-relational SQL database, version 9.5 server
ii  postgresql-9.5-postgis-2.3-scripts       2.3.3+dfsg-1.pgdg14.04+1                   all          Geographic objects support for PostgreSQL 9.5 -- scripts
ii  postgresql-9.6                           9.6.6-1.pgdg14.04+1                        amd64        object-relational SQL database, version 9.6 server
ii  postgresql-9.6-postgis-2.3-scripts       2.3.3+dfsg-1.pgdg14.04+1                   all          Geographic objects support for PostgreSQL 9.6 -- scripts
ii  postgresql-client                        9.3+154ubuntu1.1                           all          front-end programs for PostgreSQL (supported version)
ii  postgresql-client-9.2                    9.2.24-1.pgdg14.04+1                       amd64        front-end programs for PostgreSQL 9.2
ii  postgresql-client-9.3                    9.3.20-0ubuntu0.14.04                      amd64        front-end programs for PostgreSQL 9.3
ii  postgresql-client-9.4                    9.4.15-1.pgdg14.04+1                       amd64        front-end programs for PostgreSQL 9.4
ii  postgresql-client-9.5                    9.5.10-1.pgdg14.04+1                       amd64        front-end programs for PostgreSQL 9.5
ii  postgresql-client-9.6                    9.6.6-1.pgdg14.04+1                        amd64        front-end programs for PostgreSQL 9.6
ii  postgresql-client-common                 188.pgdg14.04+1                            all          manager for multiple PostgreSQL client versions
ii  postgresql-common                        188.pgdg14.04+1                            all          PostgreSQL database-cluster manager
ii  postgresql-contrib-9.2                   9.2.24-1.pgdg14.04+1                       amd64        additional facilities for PostgreSQL
ii  postgresql-contrib-9.3                   9.3.20-1.pgdg14.04+1                       amd64        additional facilities for PostgreSQL
ii  postgresql-contrib-9.4                   9.4.15-1.pgdg14.04+1                       amd64        additional facilities for PostgreSQL
ii  postgresql-contrib-9.5                   9.5.10-1.pgdg14.04+1                       amd64        additional facilities for PostgreSQL
ii  postgresql-contrib-9.6                   9.6.6-1.pgdg14.04+1                        amd64        additional facilities for PostgreSQL
travis@42efb11a6c57:~$ strings /usr/bin/pg_config.libpq-dev | grep postgres
/usr/lib/postgresql/10/bin
Report bugs to <pgsql-bugs@postgresql.org>.
'--with-icu' '--with-tcl' '--with-perl' '--with-python' '--with-pam' '--with-openssl' '--with-libxml' '--with-libxslt' '--with-tclconfig=/usr/lib/x86_64-linux-gnu/tcl8.6' '--with-includes=/usr/include/tcl8.6' 'PYTHON=/usr/bin/python' '--mandir=/usr/share/postgresql/10/man' '--docdir=/usr/share/doc/postgresql-doc-10' '--sysconfdir=/etc/postgresql-common' '--datarootdir=/usr/share/' '--datadir=/usr/share/postgresql/10' '--bindir=/usr/lib/postgresql/10/bin' '--libdir=/usr/lib/x86_64-linux-gnu/' '--libexecdir=/usr/lib/postgresql/' '--includedir=/usr/include/postgresql/' '--enable-nls' '--enable-integer-datetimes' '--enable-thread-safety' '--enable-tap-tests' '--enable-debug' '--disable-rpath' '--with-uuid=e2fs' '--with-gnu-ld' '--with-pgport=5432' '--with-system-tzdata=/usr/share/zoneinfo' 'CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fPIC -pie -fno-omit-frame-pointer' 'LDFLAGS=-Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now' '--with-gssapi' '--with-ldap' '--with-includes=/usr/include/mit-krb5' '--with-libs=/usr/lib/mit-krb5' '--with-libs=/usr/lib/x86_64-linux-gnu/mit-krb5' '--with-selinux' 'CPPFLAGS=-D_FORTIFY_SOURCE=2'
postgres-10
/usr/share/postgresql/10
/etc/postgresql-common
/usr/include/postgresql
/usr/lib/postgresql/10/lib
/usr/share/postgresql/10/man
/usr/include/postgresql/10/server
/usr/share/doc/postgresql-doc-10
@BanzaiMan

This comment has been minimized.

Copy link
Member

BanzaiMan commented Jan 4, 2018

libpq-dev points to version 10:

travis@42efb11a6c57:~$ dpkg -l | grep libpq
ii  libpq-dev                                10.1-1.pgdg14.04+1                         amd64        header files for libpq5 (PostgreSQL library)
ii  libpq5:amd64                             10.1-1.pgdg14.04+1                         amd64        PostgreSQL C client library
@BanzaiMan

This comment has been minimized.

Copy link
Member

BanzaiMan commented Jan 4, 2018

Looking at the content of /usr/bin/pg_config (which is just a wrapper), I believe that it is (somewhat) assuming that postgresql-server-dev-X.Y is also installed.

travis@988f659570cf:~$ sudo apt-get install postgresql-server-dev-9.4
Reading package lists... Done
Building dependency tree
Reading state information... Done
The following NEW packages will be installed:
  postgresql-server-dev-9.4
0 upgraded, 1 newly installed, 0 to remove and 6 not upgraded.
Need to get 645 kB of archives.
After this operation, 3,344 kB of additional disk space will be used.
Get:1 http://apt.postgresql.org/pub/repos/apt trusty-pgdg/main amd64 postgresql-server-dev-9.4 amd64 9.4.15-1.pgdg14.04+1 [645 kB]
Fetched 645 kB in 0s (685 kB/s)
Selecting previously unselected package postgresql-server-dev-9.4.
(Reading database ... 72205 files and directories currently installed.)
Preparing to unpack .../postgresql-server-dev-9.4_9.4.15-1.pgdg14.04+1_amd64.deb ...
Unpacking postgresql-server-dev-9.4 (9.4.15-1.pgdg14.04+1) ...
Setting up postgresql-server-dev-9.4 (9.4.15-1.pgdg14.04+1) ...
travis@988f659570cf:~$ pg_config --bindir
/usr/lib/postgresql/9.4/bin

Unfortunately, we can't install these packages for all the versions we install on our build images, because /usr/bin/pg_config always runs the latest version. (See https://stackoverflow.com/q/30143046/136333.)

Ultimately, I think this is a bug with PostgreSQL.

@sinemetu1

This comment has been minimized.

Copy link

sinemetu1 commented Jan 4, 2018

Ah okay. Thanks for the help!

@BanzaiMan

This comment has been minimized.

Copy link
Member

BanzaiMan commented Jan 5, 2018

If you are interested in getting useful output from pg_config, I think you can install postgresql-server-dev-9.4 (or whatever version you are using); e.g.,

addons:
  apt:
    packages:
      - postgresql-server-dev-9.4

@BanzaiMan BanzaiMan added the postgresql label Jan 5, 2018

@sinemetu1

This comment has been minimized.

Copy link

sinemetu1 commented Jan 5, 2018

Using the addon worked for us. Thanks!

benjaminjkraft added a commit to learning-unlimited/ESP-Website that referenced this issue Jan 21, 2018

Fix Travis tests
Something is funky with Travis's postgres packaging; I used the fix
suggested here: travis-ci/travis-ci#9011 (comment)

hwatheod added a commit to learning-unlimited/ESP-Website that referenced this issue Feb 4, 2018

Fix Travis tests (#2489)
Something is funky with Travis's postgres packaging; I used the fix
suggested here: travis-ci/travis-ci#9011 (comment)

hwatheod added a commit to learning-unlimited/ESP-Website that referenced this issue Feb 4, 2018

Fix Travis tests (#2489)
Something is funky with Travis's postgres packaging; I used the fix
suggested here: travis-ci/travis-ci#9011 (comment)

sfllaw added a commit to sfllaw/pghkp that referenced this issue Apr 16, 2018

Build using PostgreSQL 9.4
travis-ci/travis-ci#9011 has trouble with PostgreSQL 10.

Falling back to PostgreSQL 9.4 works just fine.

sfllaw added a commit to sfllaw/pghkp that referenced this issue Apr 16, 2018

sfllaw added a commit to sfllaw/pghkp that referenced this issue Apr 16, 2018

sfllaw added a commit to sfllaw/pghkp that referenced this issue Apr 16, 2018

milescalabresi added a commit to learning-unlimited/ESP-Website that referenced this issue Apr 24, 2018

Squashed commit of the following to bring branch up to date with main:
commit 49765cae577dff104707685514ba4c3a07180c7d
Merge: 2c57bf3 6ab37b2
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Tue Apr 24 17:56:52 2018 -0400

    Merge branch 'main' of https://github.com/learning-unlimited/ESP-Website into main

commit 6ab37b2a4c283d4d6a9553b94c89c6215f73a534
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Apr 22 21:57:25 2018 -0700

    Check in student immediately upon scanning (#2562)

    * Checkin student upon scanning

    * SR 11 Documentation

commit 2c57bf3a185cd10c10ac55cfd9c8f77ef6af62ae
Merge: 53a614c a635873
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Fri Apr 20 21:21:10 2018 -0400

    Merge branch 'main' of https://github.com/learning-unlimited/ESP-Website into main

commit a6358739f809184f4822d17fc614c5fdceddf59b
Author: Favyen Bastani <fbastani@perennate.com>
Date:   Wed Apr 18 00:26:37 2018 -0400

    Fix HTML formatting / Unicode bug in sending e-mails. (#2549)

    * Fix HTML formatting / Unicode bug in sending e-mails.
    * Remove <indent>

commit 5f1968953e4d949384c321872f1960732d764fdc
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Tue Apr 17 23:43:27 2018 -0400

    In Makefile, pull origin, not just fetch (#2553)

    this way, it will retrieve updates to existing branches

commit 89df3461ebec6cc4289cc6c9b0e691b91e258e5c
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Tue Apr 17 20:42:19 2018 -0700

    add sr11 documentation for barcode feature (#2556)

commit 70076ee33a3a7815f546a83fd23c0009b5d701f5
Merge: ccbe602 8a045c0
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Mon Apr 16 13:18:22 2018 -0400

    Merge pull request #2551 from learning-unlimited/log-in-font

    Made log in button not use custom font

commit ccbe602a75f89ef44a1c32045901fd2bd73a8bcf
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Apr 15 19:45:31 2018 -0700

    Functionality to scan barcodes with device's camera (#2539)

    * Added functionality to scan barcodes with device

    * Remove commented blob

    * Fix for iOS 11

    * Remove commented lines and console logs

commit 8a045c0024aa5b06f4316e28ea0dfd14d907bf84
Author: Katherine <katherine.brumberg@yale.edu>
Date:   Sun Apr 15 20:29:57 2018 -0400

    Made log in button not use custom font

commit fad80bd7fccd0e01538fe85acb499d3f79e68801
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Sun Apr 15 18:50:45 2018 -0400

    add default loginhelp page (#2538)

    * add default loginhelp page

    * fix typo (change "my" to "your")

    * fix typo "reset"

commit e5f256f3af5298abd628fe628440164aae547cbc
Merge: e28cb1f 00a4384
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Thu Apr 12 14:58:34 2018 -0400

    Merge pull request #2540 from learning-unlimited/benkraft.docs-sr11

    Add placeholder docs for SR11

commit 00a4384e6b32614b31964ab4c8a4a5db7d48aebf
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Wed Apr 11 12:50:34 2018 -0400

    include update for #2538

commit 56b2983726638c7a7eb08be45fe1c550ff0206e6
Author: Will Gearty <willgearty@gmail.com>
Date:   Sat Apr 7 13:05:12 2018 -0700

    Update for #2432

commit e28cb1f4e1b80e8c8a256aeb18fa5b6e5024cf21
Author: Will Gearty <willgearty@gmail.com>
Date:   Sat Apr 7 13:03:02 2018 -0700

    Front end for resource type choices (#2432)

    Fixes #372.

commit 1b8e937a74feda7df020e850802de66b84bb3b27
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Apr 7 10:04:06 2018 -0700

    Fix release number

commit d31ae84d0d8867724eb45b31f946b9db25ca3d26
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Apr 7 10:02:58 2018 -0700

    Add placeholder docs for SR11

    Maybe this time we'll actually do a good job of updating them as we
    go!

commit 19e4bceab0f431e9e7d97f76734fc50bb9031c03
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Apr 7 10:00:38 2018 -0700

    Stable Release 10 documentation (#2516)

    This branch contains the release notes for Stable Release 10.
    As usual, these will be shared with chapters and should be
    written for an audience of chapter admins. We aren't separately
    releasing SR9, so I merged its release notes into SR10's.

commit a9d0080d857393dd79902a937517804c05ccbcea
Author: Ben Kraft <ben@benkraft.org>
Date:   Fri Apr 6 20:01:17 2018 -0700

    Explicitly order sections to make sure index() is stable (#2521)

    I'm amazed this has ever worked right, but I guess in the past postgres
    has mostly ordered consistently; apparently in whatever version MIT ESP
    is using (9.6, I think) it doesn't.  Anyway, this is definitely safer.

    Hopefully fixes #2505.

commit a3b5c3d83fae8270191bd818857593df5b4a58d2
Author: Ben Kraft <ben@benkraft.org>
Date:   Tue Apr 3 09:16:42 2018 -0700

    Fix error in lunch constraint generation (#2522)

    * Fix error in lunch constraint generation

    This fixes #2510, a nasty bug in lunch constraint generation, which has
    been around forever but formerly was masked by postgres being fairly
    stable about ordering in practice.  In particular, the constraints were
    generated with several duplicate `seq` values rather than each token
    having a distinct `seq`.

    The underlying issue was that `BooleanExpression.get_stack()` is cached,
    and the cache wasn't being expired when new tokens were added, because
    apparently `depend_on_row` doesn't work correctly for subclasses --
    django only sends the signal for the exact model class being written,
    not the subclasses, it seems.  This meant that sometimes when tokens
    were added, they wouldn't see the preceding token, because they would
    get a cached value of `get_stack()` generated before the previous token
    was added.

    The fix -- not the nicest but it should work -- is to just explicitly
    depend on every subclass.  Luckily this seems to be the only cache that
    depends on `BooleanToken`, so I didn't have to change it anywhere else.

    I tested this by regenerating some lunch constraints on my dev server;
    they now have distinct `seq`s for every token within each expression,
    and the ordering looks correct to me.

    * Fix the same issue in the other places we have caches depending on BooleanToken

    I have now properly run `git grep 'depend_on.*BooleanToken'`, and fixed
    up all the results.

commit 0e07742ba918b16d2c1ebc25372bff092ed23d45
Author: Ben Kraft <ben@benkraft.org>
Date:   Sun Apr 1 09:33:54 2018 -0700

    Fixes to Makefile (#2518)

    The main fix here, to #2508, is to `set -o pipefail` where we have a
    nontrivial pipeline, so that if the first command (the `pg_dump`) fails,
    at least we'll obviously crash.  In the past it would just silently fail
    and continue working, which is bad since then we have no db dump.

    While I was in the area I also converted some tabs to spaces, because
    `make` is really just happier with tabs.

commit 4e195894ba000f6ed5d01b05a69ce816ab58eaca
Author: kkbrum <katherine.brumberg@yale.edu>
Date:   Fri Mar 30 11:37:40 2018 -0400

    Better email schedules (issue #373) (#2528)

    * Turned email schedules into html tables. Renders as string right now

    * Fixed the rendering

    * Fixed whitespace

    * Switched width to percentages and added program name

    * Changed to format_html

    * Fixed whitespace

commit 7e70460b73291ab6f4f8f309f93dd02de48c8c3b
Author: kkbrum <katherine.brumberg@yale.edu>
Date:   Fri Mar 30 11:31:21 2018 -0400

    Display query options in comm panel (#2532)

    * Diplay query in comm panel

    * Added newline for Travis

    * Removed unmatched tag

commit f7f2b244859db40c9a274783f35205e7683c37df
Merge: 6b31ef0 bc9d067
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Wed Mar 28 00:40:29 2018 -0400

    Merge pull request #2533 from learning-unlimited/benkraft.new-site

    Two fixes to new_site.sh

commit bc9d067b8a9e5c69a6be9af2e6719b44a96f0497
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Tue Mar 27 23:10:35 2018 -0400

    add missing quotation mark

commit 2d4b830b7eff25fbbaef7f237738f3982782f5ba
Author: Ben Kraft <ben@benkraft.org>
Date:   Thu Mar 22 23:25:23 2018 -0700

    Fix chown in new_site.sh

    We set -f which means we can't use wildcards.  Luckily, we don't really
    need them, since we explicitly create the files anyway.

commit 6b31ef0179a7c56acd31e9e8482c1794d01f7537
Merge: 8944553 962b49d
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Wed Mar 21 14:54:48 2018 -0400

    Merge pull request #2529 from learning-unlimited/benkraft.deploy-docs

    Mention deleting old directories in deploy docs

commit 8944553b7285080168ee6f5d9157435a01058e12
Merge: 9bb30bf 05a956f
Author: Will Gearty <willgearty@gmail.com>
Date:   Wed Mar 21 09:19:35 2018 -0700

    Merge pull request #2373 from learning-unlimited/benkraft.bigpicture-fixes

    bigpicture fixes

commit 9bb30bf737c25743bf713674ef2cd163cc042048
Merge: 40112b8 85b06a2
Author: Will Gearty <willgearty@gmail.com>
Date:   Wed Mar 21 09:12:15 2018 -0700

    Merge pull request #2517 from learning-unlimited/benkraft.django-version-bump

    Bump django version

commit 962b49dd1788909c45019ed761e065d1cf96adf4
Author: Ben Kraft <ben@benkraft.org>
Date:   Tue Mar 20 16:29:03 2018 -0700

    Mention deleting old directories in deploy docs

commit 40112b877f0a66a9d7519f741bdc80bd2ec3d12e
Author: kkbrum <katherine.brumberg@yale.edu>
Date:   Tue Mar 20 00:29:48 2018 -0400

    Display better info (#2523)

    Added a grade filter to the scheduler. This takes the minimum or maximum grade inputted and only displays sections that have that grade as the lower or upper bound. For example, if you set the min to 10, you will get 10-11 and 10-12th grade classes, and if you also set the max to 12 you will get just 10-12th grade classes.

    Added a column to show whether the user is activated or deactivated in the user search. This is helpful if one person has many accounts.

    Added a select all button to the recipient checklist in the communications panel.

commit c4dacf65fdac1369945a3180845e6e70990eab45
Author: Ben Horowitz <horowitz.ben@gmail.com>
Date:   Mon Mar 19 21:28:14 2018 -0700

    Updated Stripe Requirements (#2527)

    Doesn't seem to break anything! :)

commit b40bb30507922262b6ed172ddca4703c80edcb06
Author: kkbrum <katherine.brumberg@yale.edu>
Date:   Sun Mar 18 18:11:35 2018 -0400

    Fix teacher shirt statistics (#2524)

    The teacher shirt statistics weren't working when the types were removed. I fixed it by tallying the shirt as a plain ('M') shirt if shirt types were turned off.  Fixes #1194.

commit 2ae29237df7512fbabdb4ea1f6b27889254d606d
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Sun Mar 18 15:10:40 2018 -0700

    add ndmin parameter for corner case in import_assignments in lottery.py (#2526)

    If there is only one student or section, then the import_assignements lottery.py fails because numpy.loadtxt generates an array with the wrong number of dimensions (one fewer than expected).

    This likely wouldn't occur in a real program, but I discovered it while testing the lottery module on stanford-sr8 with a small amount of data.

    This is fixed by specifying the parameter ndmin to force numpy.loadtxt to produce an array with the right number of dimensions (see documentation here: https://docs.scipy.org/doc/numpy-1.14.0/reference/generated/numpy.loadtxt.html)

commit 5f44e049eae65d08c25c7212a023489a9a61cc3e
Author: kkbrum <katherine.brumberg@yale.edu>
Date:   Sun Mar 18 15:38:52 2018 -0400

    Aligned Log in and Sign up buttons (#2525)

    Fixes issue #2479. Removed the padding on the log in button to align it with the sign up button.

commit 874f1b390e5d93359ec83c7a65befc810c1406cc
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Sat Mar 17 22:59:21 2018 -0400

    Add default LU favicon

    This replaces the MIT favicon as the default, but chapters can still add their own later

commit 1d9397d0837902e43af9faa0e659e90617d9fd2f
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Mar 12 19:00:28 2018 -0700

    Teacher big board fixes (#2519)

    Fixes #2499, #2511, and #2512.

commit 05a956f9d7dc10eb78122e52d99e8c855631ea33
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Mar 10 23:20:42 2018 -0800

    Fix misalignment of buttons on dashboard

    There's an override in fruitsalad for this.  I copied it to bigpicture.
    Eventually we should clean up our css to make things like this more
    consistent across themes.

commit 50a3065c6f0b852d0038627fd4b932dbfbdbf1ce
Merge: fc112c3 f5785fc
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Mar 10 22:55:04 2018 -0800

    Merge remote-tracking branch 'origin/main' into benkraft.bigpicture-fixes

commit 85b06a28ce3c000eac54ba279e08cf31b928c03a
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Mar 10 15:33:42 2018 -0800

    Bump django version

    This contains some minor security fixes; nothing that looks particularly
    interesting but always a good idea to have.  The main change is actually
    on dev servers; I think our default settings should continue to work
    fine.  See
        https://docs.djangoproject.com/en/1.11/releases/1.8.16/#dns-rebinding-vulnerability-when-debug-true
    for details.

commit f5785fce2dacb123bdffddc70d16f9ad78f445ee
Merge: f36e995 c961083
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Feb 17 15:38:31 2018 -0500

    Merge pull request #2450 from learning-unlimited/upgrade-jquery-ui

    Upgrade jQuery UI to v1.12.1 and fix CSS

commit f36e99522003c9cf3c04f4c90379b3f54c28ff13
Merge: bd2e492 4c63c57
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Feb 17 15:38:08 2018 -0500

    Merge pull request #2452 from learning-unlimited/id-class-search

    Intelligently class search by ID in admin toolbar

commit c961083f0636ab1f3417e75d09c7f2414e68dbb3
Merge: 7710661 bd2e492
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Feb 17 15:18:49 2018 -0500

    Merge branch 'main' into upgrade-jquery-ui

commit 4c63c57bfe2ebf39aae627b62bfedaed5148ddb2
Merge: 1414ccf bd2e492
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Feb 17 15:17:07 2018 -0500

    Merge branch 'main' into id-class-search

commit bd2e492691b4f5886cc8fc972d98a828bbb13b3f
Merge: 4425f55 919290b
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Feb 11 11:00:50 2018 -0800

    Merge pull request #2498 from learning-unlimited/can_request_subject

    Adds email code to class cancellation request email subject

commit 919290b40f0ff4c42b26e6507f5c83c74a058ae6
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Feb 11 10:47:38 2018 -0800

    Fix subject

commit 4425f55c899009a812a9614ba0bcb9efb1a75840
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Feb 11 09:56:18 2018 -0800

    Fix time within teacher texts (#2497)

commit e02b47e3d9f23b3111e44e1ace554fcd26763734
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Mon Feb 5 11:39:30 2018 -0800

    Adds email code to class cancellation request email subject

commit 64db04c1f1ab3609f9d80eb60eab2a0ac50cf5e4
Author: Ben Kraft <ben@benkraft.org>
Date:   Sun Feb 4 13:18:13 2018 -0800

    Update default archiver address (#2475)

    * Update default archiver address

    * Also update in django_settings.py

    I don't think this one is used, but might as well.

commit 35e1c53210e194530daf519b722e99e6d49fb129
Author: Ben Horowitz <horowitz.ben@gmail.com>
Date:   Sun Feb 4 13:17:27 2018 -0800

    better adminbar (#2486)

commit c7746cf0d5d7342f287d347102527ce1804ee9d1
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Feb 4 13:15:51 2018 -0800

    progressbar.html fix (#2491)

commit b83f4075fea7b8ca62c0dc0e0d61d56ca2607503
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Feb 4 13:14:40 2018 -0800

    CSS fix for student lottery progress bars (#2490)

    * CSS fix for student lottery progress bars

    * Move bootstrap import

    * Final CSS fix

commit 1464e99d23fbdeff66d92d1e636feddc3bbb9e2e
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sun Feb 4 16:12:34 2018 -0500

    Display program name in some error pages (#2494)

    Display the program name in Deadline Closed and Wrong Grade error pages.
    This makes it easier for users (or us) to notice when they accidentally
    visit last year's program instead of this year's.

commit ec3ab3a709a31c8ab5134cbad4d327478f5276ce
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sun Feb 4 15:59:55 2018 -0500

    Update after 2017/12 webminification troubleshooting (#2478)

    * Update after 2017/12 webminification troubleshooting

    - Add more on editing the PATH variable on Windows
    - Emphasize the necessity of enabling virtualization in BIOS on some
      OS's
    - Explain how to debug by running VM not headlessly

    * Respond to comments

commit 2137122bbee1fed350048af340bf08be3f8e47f5
Author: Ben Horowitz <horowitz.ben@gmail.com>
Date:   Sun Feb 4 12:55:09 2018 -0800

    Deactivated User Warning (#2492)

commit 3a8b83cea262c63f98978efb798fe2a2aa498377
Author: Ben Kraft <ben@benkraft.org>
Date:   Sun Feb 4 10:28:39 2018 -0800

    Fix Travis tests (#2489)

    Something is funky with Travis's postgres packaging; I used the fix
    suggested here: https://github.com/travis-ci/travis-ci/issues/9011#issuecomment-355561967

commit 1414ccf52a2bbf449e7d75862d5915ead12ff6c6
Merge: 79234c4 032ac2c
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Wed Jan 31 20:28:14 2018 -0500

    Merge branch 'main' into id-class-search

commit 032ac2c05bacc2cee3aa7910446c93fd62c82ed2
Author: Ben Horowitz <horowitz.ben@gmail.com>
Date:   Sun Jan 14 16:01:52 2018 -0800

    update vagrant error conditions

commit a7121c42679d8e6f552b87b0ed4c9b018d0b4802
Merge: d60978e e711d4c
Author: Ben Horowitz <horowitz.ben@gmail.com>
Date:   Tue Jan 9 17:57:30 2018 -0800

    Merge pull request #2480 from learning-unlimited/remove-ga

    Remove hardcoded Google Analytics tracking code from fruitsalad theme. Seems straightforward to me!

commit e711d4c0ab4484e3d87d6279c08f8a324b4a8476
Author: Favyen Bastani <fbastani@perennate.com>
Date:   Mon Jan 8 15:20:57 2018 -0500

    Remove hardcoded Google Analytics tracking code from fruitsalad theme.

commit d60978e220472875ae118e8d4c9007652295db90
Merge: 8ff16cc f87ddcb
Author: Will Gearty <willgearty@gmail.com>
Date:   Fri Nov 24 15:14:27 2017 -0800

    Merge pull request #2458 from learning-unlimited/cancel-req-deadline

    Request Cancellation Button Deadline and Logic

commit 8ff16cc7b1924395e49fc8b580d93fcab99cc2d6
Author: Will Gearty <willgearty@gmail.com>
Date:   Fri Nov 24 13:24:42 2017 -0800

    Teacher Big Board (#2396)

    This is my first stab at creating a teacher big board (#1587).
    As of right now, it shows a graph of the following stats:

    - Number of registered classes
    - Number of approved classes
    - Number of teachers teaching
    - Number of registered hours of classes (class-hours and class-student-hours) (on separate y-axes)

    It also displays the following static stats:

    - Number of teachers registering in the last 10 minutes
    - Number of teachers teaching a class
    - Number of classes registered
    - Number of classes approved
    - Number of registered hours of classes (class-hours and class-student-hours)
    - Number of teachers checked in today

commit f87ddcbb49fdc6b851db6d85fa9c5bed428434f5
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Fri Nov 24 13:24:11 2017 -0800

    Moved css

commit ca78ebc05bfb8ae3f00e894c2b176c016a78ad08
Author: Will Gearty <willgearty@gmail.com>
Date:   Fri Nov 24 12:20:22 2017 -0800

    Small changes to text message profile form field (#2429)

    This changes the form field from a boolean field to a radio select field, allowing to have both `True` and `False` options, with one of the two options required to submit the form.
    This fixes the potential problem of students submitting the form without reading/thinking about the field in the form (since the field was previously not required).
    This also removes the field from the form if you are not a student or if it is not enabled by the `text_messages_to_students` tag.
    Finally, I also added a little CSS to remove the bullet points that would otherwise be next to the radio buttons.

    ![image](https://user-images.githubusercontent.com/7232514/29956090-80d86508-8e99-11e7-8e85-6d54da715f1b.png)

    N.B. Since the option values are converted to strings, it required some coercing to save the value as a boolean when the form is submitted and some setup in the `__init__` of the form in case the user previously selected "No" (otherwise, we could get some very grumpy students who complain about having to select "No" over and over every time they have to update their profile).

commit e57d71107c5523dc55afb45ef03383a445695f57
Merge: a7716eb 78dab3f
Author: Will Gearty <willgearty@gmail.com>
Date:   Thu Nov 23 12:13:32 2017 -0800

    Merge pull request #2425 from learning-unlimited/star-progress

    Progress bars for starred classes

commit 9b7b4392fc4205d37ce73a23e00009f65c48df9a
Merge: 15b8c17 6c33657
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Thu Nov 23 12:05:00 2017 -0800

    Merge branch 'main' into cancel-req-deadline

commit 78dab3f6299fcd1b8bc08566bea99bb76360fef0
Merge: 8be5964 6c33657
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Thu Nov 23 11:56:56 2017 -0800

    Merge remote-tracking branch 'origin' into star-progress

commit a7716eb2dd0d44a14e4028737409f07738f59cb3
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Thu Nov 23 11:38:57 2017 -0800

    In annotated_categories, convert 'num_class_hours' None to 0 to avoid float() exception (#2471)

    Fixes #2470 (sort of, it prevents the exception, but we don't know how the duplicate happened in the first place).

commit 6c3365701da6f00f276d6563267ef937edac159a
Author: Will Gearty <willgearty@gmail.com>
Date:   Thu Oct 12 21:39:02 2017 -0700

    Remove grade range from walkins form (#2456)

    * Remove grade range from walkins form

    * Lint fix

commit 73dc82999effae8eed609576008cdb8cee117c8e
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Thu Oct 12 21:34:48 2017 -0700

    don't upgrade libpq-dev because version 10 breaks our Travis tests, apparently (#2459)

commit 15b8c17de3b31a07e04e4bdaef9a0c944014080f
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Thu Oct 12 09:48:38 2017 -0700

    Remove delete button, change cancel request button layout

commit 89fd42cbf7263a4848df7faa36c8e328f7a3dd9a
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Wed Oct 11 11:38:02 2017 -0700

    Delete/Cancel Request button logic

commit c65c1e3e4267fbf6548cae5cf9b042f56acb9a58
Merge: 47ed5e3 a6a70bf
Author: uakfdotb <fbastani@perennate.com>
Date:   Sun Oct 8 12:02:08 2017 -0400

    Merge pull request #2453 from learning-unlimited/sophie-tinkering

    Add room capacity to room cell on AJAX scheduler

commit 8be5964f23b5a49fd24c2b7c16915596d3208386
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Sat Oct 7 22:02:15 2017 -0700

    Alignment adjustment

commit 86e9601cf59a373cd2ecca03e62bb7afd8918804
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Sat Oct 7 21:54:52 2017 -0700

    Bootstrap progress bar and priority list

commit a6a70bf5bd353b58793a08ce843dd50285737753
Author: Sophie Mori <ksmori@mit.edu>
Date:   Sat Oct 7 23:40:44 2017 -0400

    Unbreak tooltip

commit 79234c4caab908b5b3b7833d4b55e4a07d8e10b2
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Oct 7 19:38:45 2017 -0400

    Intelligently class search by ID in admin toolbar

    Search directly by ID, bypassing the program check, if the query looks
    like a class ID. If not, fall back to searching by name as usual with a
    message.

    Also fail in "I'm Feeling Lucky" gracefully.

commit 8e36df87ff5e28584e47790a7757a94312a73885
Author: Sophie Mori <ksmori@mit.edu>
Date:   Sat Oct 7 19:44:52 2017 -0400

    Add capacity to room cell on AJAX scheduler

commit 47ed5e3d6bd6716a9c6c73ca1bbdb763b3896921
Merge: fb5ced7 b8dafde
Author: uakfdotb <fbastani@perennate.com>
Date:   Sat Oct 7 19:09:53 2017 -0400

    Merge pull request #2451 from learning-unlimited/good-random

    Filter random classes by a tag

commit fb5ced73ddb8d296638847ec70f1a6bbb88af2c3
Merge: d37d2cd 9eca255
Author: uakfdotb <fbastani@perennate.com>
Date:   Sat Oct 7 18:59:52 2017 -0400

    Merge pull request #2449 from learning-unlimited/scheduler-text-content

    AJAX scheduler: look up tooltip by textContent

commit b8dafded07999228444041999fe432d66362fcdc
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Tue Feb 14 21:57:14 2017 -0500

    Filter random classes by a tag

    Add a JSON tag in which we can specify certain class names and program
    name substrings to exclude from random class generation.

commit 7710661cb7bb358b0d0a7b2b3087ba1f4132d566
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Oct 7 16:54:35 2017 -0400

    Commpanel CSS fixes

    - Set an overflow attribute on .tabs-ui-nav so the tab bar is not
      needlessly tall.
    - Overrode `#content a` rules with copies of jQuery UI rules.
    - Removed an unnecessary clearfix.

commit 926c432890c1398b6bd39271d2550d4740383be5
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Oct 7 15:26:57 2017 -0400

    Upgrade jQuery UI to v1.12.1 and minify

    For posterity, this is a completely uncustomized download and theme
    (which is fairly different from the older jQuery UI themes, however).

    This fixes some quite annoying issues with the positioning of tooltips in
    the AJAX scheduler, which might be https://bugs.jqueryui.com/ticket/8710
    , so it's important. Some work is necessary to make the new style work
    with the comm panel though.

commit 9eca255b9a47c781a89b24d781d670212edc5b29
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Oct 7 15:22:04 2017 -0400

    AJAX scheduler: look up tooltip by textContent

    Use textContent instead of innerHTML. Fixes #2448.

commit d37d2cd527416fc58ab4bf1a14c7a0d2f336b9ad
Author: Ben Horowitz <horowitz.ben@gmail.com>
Date:   Thu Oct 5 10:59:12 2017 -0700

    Update program_modules.rst

    added space!

commit 46877ca715eaebae22314b9794c4e9a71e1a4570
Author: Ben Horowitz <horowitz.ben@gmail.com>
Date:   Thu Oct 5 10:58:35 2017 -0700

    Update program_modules.rst

commit 5218cbf7b4fb7bfc6d2537861154aae6bdbb1a77
Author: jerrywu64 <jerrywu9876@gmail.com>
Date:   Thu Oct 5 02:30:08 2017 -0400

    Fixed mathjax link (#2445)

commit 048c1cfed26ee4d315bc2d185e40de8889e9c7f2
Merge: c2a3a33 c327f08
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Oct 1 20:37:31 2017 -0700

    Merge branch 'main' into star-progress

commit c327f087c10a2f0caaf6ba7b1406f293f662dd62
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Oct 1 10:34:07 2017 -0700

    Grade filter for student catalog (#2405)

    Adds a dropdown menu to select grade level, then filters catalog by selected grade level.

    Fixes #439 and part of #65.

    ![image](https://user-images.githubusercontent.com/7232514/28250441-5043aab0-6a1d-11e7-87dd-edc92cbdfa99.png)

commit 2f62c9554904497c5cd2bb4d6f208cc838df645d
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Thu Sep 28 00:03:43 2017 -0400

    Document methods on module base class (#2437)

    Document teachers(), students(), volunteers() and their description
    methods

commit cf63bb52d8821bd46735365c98f9e2cf6ecbf2df
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Thu Sep 21 22:25:50 2017 -0400

    Update html with new CDN

    Old one is going defunct

commit 22e8873bb56464913d132b4ac07c23b475d9d316
Merge: 1b48317 d83636b
Author: jerrywu64 <jerrywu9876@gmail.com>
Date:   Tue Sep 19 12:37:46 2017 -0400

    Merge pull request #2438 from learning-unlimited/link-accounting

    Link to accounting page from userview

commit 1b48317c69f978d46371e6d4a1e422d2ab0979c8
Merge: 183ea33 778bc9a
Author: jerrywu64 <jerrywu9876@gmail.com>
Date:   Tue Sep 12 18:28:10 2017 -0400

    Merge pull request #2439 from learning-unlimited/classroom-import-resource-values

    CSV fresh classroom import script now handles resource values

commit 778bc9a03ff9d6fa83f8f7f1f1c52fc1c55e8e4c
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Thu Sep 7 19:55:21 2017 -0400

    Refactored/modified fresh classroom import script to generally support resource types with multiple options instead of special-casing classroom space in anticipation of Splash 2017

commit e8bda0ca5a563ca05c5531e2d5fb1b73bb321ada
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Thu Sep 7 12:20:10 2017 -0400

    Style fixes to comply with PEP8 so syntastic stops complaining at me

commit 58dbf9e3c095c1cb9ae7097f5d27121a43ff9706
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Thu Sep 7 11:43:05 2017 -0400

    Added try-catch around inputs and clarified code

commit 39297f73128fd4a9a7a9a7adb01dbed7127689b1
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Sun Feb 19 20:32:44 2017 -0500

    Fixed bug in re-inputting space type matchings

commit 640e6a69b3f4f6a6c731076ce4d704cd54abfc67
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Sun Feb 19 19:00:43 2017 -0500

    fixed offset bug

commit 8fd353109fd0fc7b9c9bfdb529169ba22e071e2c
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Sat Feb 18 23:23:13 2017 -0500

    Fixed trailing whitespace

commit 28434e184c8acee070fdc9792ebcdeeefa64739b
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Sat Feb 18 23:08:39 2017 -0500

    Updated csv fresh classroom import script to include classroom space types

commit d83636b1f19a6572d0f1a964c82c1a072631015b
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Sep 9 18:32:41 2017 -0400

    Link to accounting page from userview

    Fixes #2394.

commit 183ea3365d3a456de2946b4766a12f6e393563ef
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Sep 4 21:57:49 2017 -0700

    Resize nametag names (#2424)

commit 061d2bd18c992c9b6877f65f72bd1c6f1f64b80f
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Sep 4 21:15:47 2017 -0700

    Lunch constraint form removes lunches (#2423)

commit 0cb4b0e0a02d13706d2e15cd9efa39c4fd6b49c6
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Sep 4 20:57:58 2017 -0700

    Asterisk for required profile questions (#2420)

commit 7195a78a950d7d05c107499800cc0d0911608c70
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Sep 4 18:25:17 2017 -0700

    Style change for teacher availability form (#2419)

    * Style change for teacher availability form

    * Review fixes

commit 2e58bd9df422fdb0314c05eb1164066ae248a254
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Sep 4 17:28:51 2017 -0700

    Simplify coteacher interface (#2421)

    * Simplify coteacher interface

    * Lint fix

    * Capitalization

commit 0db736e580c4aafd9ab8dff83b64bf4f7551a531
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Sep 4 11:55:37 2017 -0700

    Request class cancellation button for teachers (#2418)

    * Teacher reg option of grade ranges instead of mins and maxes

    * Stray parenthesis

    * List and test fixes

    * Test fix

    * Cleanup

    * Test fix

    * Request class cancellation button for teachers

    * Lint fix

    * Add comment

commit 4a66ee98f32620cf21b3534c4c0636e5d0c3e65e
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Sep 4 11:41:29 2017 -0700

    Makes address optionally not required for teachers (#2427)

    * Address optionally not required for teachers

    * Add blank state as default

commit 864465d1216cbe0483141f85bf32262d0bbb181f
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Sep 4 08:33:32 2017 -0700

    Grade range fix for open class reg (#2433)

commit b4a48baab59eead9b1dd0a733cf3e0f69fd1b518
Merge: 8470d43 e732ff0
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Sat Sep 2 23:57:35 2017 -0700

    Merge pull request #2431 from learning-unlimited/class-styles-fix

    Class-styles form field fix

commit 8470d43464030cfb4c3a3388a61a1ccf5a6b5b02
Merge: 88b0705 a26e1ab
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Sat Sep 2 23:57:24 2017 -0700

    Merge pull request #2430 from learning-unlimited/grade-range-fix

    Fixed form fields when using grade ranges

commit e732ff0ababaea41b7640f786cbc03555e244f40
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Sat Sep 2 11:45:43 2017 -0700

    Class-styles form field fix

commit a26e1abf3ed2992f9b28d49440f43ad73f837ae4
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Sat Sep 2 11:33:34 2017 -0700

    Fixed form fields when using grade ranges

commit 88b070558d0a7df019a606809b2370f319b8c0da
Author: Will Gearty <willgearty@gmail.com>
Date:   Sat Aug 26 19:31:32 2017 -0400

    Catalog preview link more noticeable (#2426)

commit f0028ca58505731717c77e3cb3c7eb39b8ad925f
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Aug 26 19:26:52 2017 -0400

    Specify program with dropdown in userview (#2417)

    Add a GET parameter to the userview that lets you specify a program to
    list shortcuts for, and a <select> element on the page that chooses this
    parameter. Also some other UI tweaks.

    Fixes #1880.

commit bfbf36547aaddfc123c1099d72c1f7b870522730
Author: Will Gearty <willgearty@gmail.com>
Date:   Sat Aug 26 19:19:01 2017 -0400

    Adds option to text students when cancelling classes (#2404)

    The text_students form field is hidden if GroupTextModule is not enabled or if Twilio is not configured.

commit c2a3a33cd777ee313c28ee941b68e6e8cbdd487f
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Thu Aug 24 21:37:04 2017 -0400

    Progress bars for starred classes

commit b42e52f65cc80d1ebedbe01a0ebbe510b1d16405
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Thu Aug 10 10:45:34 2017 -0400

    Update README.rst

    Correct typo (change False to None) and add clarification about behavior for administrators vs. non-admin users

commit 16b3afc001de78514ed9c353e9eb605ef08a3d61
Author: Ben Kraft <ben@benkraft.org>
Date:   Sun Aug 6 15:16:28 2017 -0700

    Fix theme tests (#2397)

    Adding the bigpicture theme caused a conflict between the tests for it and for
    fruitsalad -- the two both set the same default files, which causes us to hit a
    confirm page to clobber them in the test, and we don't know to click that, so
    things don't work right.  This could also happen even before bigpicture, if
    running tests locally on a dev server that had such a conflicting file.

    One way to fix it would be to click past the confirm page. But that's a problem
    since it may be clobbering real files, if someone is running locally!  So
    instead, we now back up the offending files, and restore them at the end.  This
    is super hacky -- we really shouldn't be modifying the user's files at all ever
    if we can avoid it -- but it at least fixes the problem for now.

    Fixes #2388.

commit 560a9a3b207056f052ce07fd2a974479f7e56d85
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Jul 29 17:21:49 2017 -0400

    Get last program with profile on userview (#2399)

    Also add some documentation, simplify the template, and add some if
    guards and a link to the admin panel to search for registration
    profiles. Fixes the most common cause of #2102 and possibly makes #1880
    slightly easier since we now have the program and the profile
    independently in the template.

commit 37687e05f06bece59edda81ff02d9948374412f3
Author: tankersleyk <kainint@att.net>
Date:   Sat Jul 29 17:20:05 2017 -0400

    Allows admin toolbar search on teacher check-in page (#2415)

commit 457ca9a1abb73d3671cded2c35ef16f5a82349bc
Author: Will Gearty <willgearty@gmail.com>
Date:   Tue Jul 25 23:05:10 2017 -0700

    Teacher reg option of grade ranges instead of mins and maxes (#2414)

    This adds the option to provide teachers with grade ranges to choose from when registering a class instead of requiring the teacher to specify a minimum and maximum grade level for their class.
    Grade range options are set with the grade_ranges tag.  Fixes #51.

commit 01af87de33683c6e6d6f4741ba7044c57aac7d95
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Tue Jul 25 01:51:37 2017 -0400

    Add accounting module for showing user costs human-readably (#2400)

    The module gives a human-readable summary of costs, payments, financial
    aid, and discounts involving a particular user on a particular program.

    Part of #2394, but currently only accessible through URL-hacking; can be
    easily added to userview after #2399 is resolved or similar.

commit 386417b23980b3769cb6bc8c57082dd274462342
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Jul 24 22:49:23 2017 -0700

    Send emails to teachers re: cancelled classes (#2410)

    When a class/section is cancelled, the website now by default sends an email to each of the teachers of the class.

    Fixes #2360.

commit 35e8eecca9848de2d724d0d630fa16c795d7f3b7
Author: Will Gearty <willgearty@gmail.com>
Date:   Mon Jul 24 22:42:12 2017 -0700

    Text teachers for check-in reminder (#2413)

    Adds a button for each teacher on the check-in page that allows you to text them a reminder (using Twilio) to check-in before their class.  Fixes #2412.

commit a76cab02f27e3d77b30208b8977c10887ade4bca
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Jul 23 15:52:10 2017 -0700

    Sort room schedules alphabetically (#2411)

commit 5c63adf993a87a45582cc74c2405380f154e33b7
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Jul 23 15:46:11 2017 -0700

    Add class style to main catalog (#2408)

    Adds the class style implemented in #2302 to classes in the main catalog and FCFS phase.
    (Only shown if a class has a class style, just like prereqs)

commit a673fdcf068f3cc2622663b99d2acf1f5438da88
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sun Jul 23 18:33:07 2017 -0400

    Add docs, stats, mild refactoring to ClassChangeLottery (#2401)

    - Add a method print_stats that prints a relatively human-readable
      listing of important statistics about the lottery and popularly
      requested sections.
    - Thoroughly comment the push_back_students function.
    - In two places, break out intermediate computations to clarify program
      logic, eliminate redundancy, and reduce line length.
    - Add and fix a few other comments.

commit 4ca28d1f64374eb92540058c0915bbbf95630c0b
Merge: 7c36115 0092171
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sun Jul 16 13:52:17 2017 -0400

    Merge pull request #2325 from learning-unlimited/overhaul-deadlines

    Annotate request with permission info in checkDeadline, display it

commit 00921718696200657db83ed8e27a46a830ecf1db
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sun Jul 9 21:45:51 2017 -0400

    Fix deadline overhaul documetation, hasattr, polish

commit 7c36115c8ec33118af7079b614fcce027e39e1a0
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sun Jul 9 17:14:22 2017 -0400

    Display event types of timeslots (#2398)

    Events are confusing if we don't know what they are.

commit 3b87c2d545f17f0ac6bdfc34e828bded04426e02
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Jul 9 12:46:33 2017 -0700

    New Phase Zero (pre-lottery) module (#2190)

    This implements a new lottery system to determine which students can enter the
    program, along with an override system and a script to run the lottery.
    Students may enter the program in groups with other students (e.g.  siblings).
    It integrates with existing grade-based program cap functionality to accept a
    certain number of students from each grade.

    Requested by Stanford Splash.  Fixes #2350.

commit ff377b37ff824241d84101dd338a8bdd0e9874d7
Merge: 0a9e87d 12e7cc6
Author: Ben Horowitz <horowitz.ben@gmail.com>
Date:   Wed May 31 13:11:56 2017 -0700

    Merge pull request #2389 from learning-unlimited/benkraft.fix-id-docs

    Remove comment saying you can put HTML in the program name on nametags

commit 12e7cc67b35efa7603962ff35fceb922307c9655
Author: Ben Kraft <ben@benkraft.org>
Date:   Tue May 16 19:48:27 2017 -0700

    Remove comment saying you can put HTML in the program name on nametags

    You can't -- it will get escaped -- and it's probably better to use a template
    override anyway.

commit 0a9e87d3460a0efac588ab31748054210afece83
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Fri May 12 22:08:34 2017 -0400

    fix description = short_description in teacher event (#2387)

commit 984ea44166fa1709a76b2219b9e6c90e1a7e2b0c
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Mon May 1 22:08:00 2017 -0400

    UTF-8-encode in volunteer CSV generation (#2384)

    Fixes #1893.

commit 1ee92ecd95eeff4f90ffcba7c9e7e8c72525ba7f
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Mon May 1 22:06:27 2017 -0400

    Style volunteer management buttons (#2383)

commit 052534068904ed3dc1af39ec6f4ee3833d597fae
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Mon May 1 22:05:41 2017 -0400

    Clamp num_spaces to >=0 in class changes controller (#2382)

    If students enroll in a class and then it's moved to a smaller
    classroom, there can be negative space, so "more students than space",
    and the code will try to randomly sample a negative number of students
    to fill the space with, which naturally causes an exception. I think we
    ran into this bug while running the class changes lottery for Spring
    HSSP 2017.

commit 11b6024dea25fbf2d22b36276cf83fa3ec433b00
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Mon May 1 22:04:54 2017 -0400

    AJAX scheduler: Add gradient to classes with special scheduling needs (#2330)

    Add a gradient background to the corners of classes with special
    scheduling needs, as determined by the tags.

commit 5b9da698744db7828534469a5973b79c3f621e95
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Mon May 1 22:04:19 2017 -0400

    Delete useless select_related for meeting_times (#2380)

    I think it doesn't work for ManyToMany fields; older Django ignored it
    but now throws an error.

commit 0fe2e65011812c2d50f1161e9b408799df0eb5a7
Author: Andrew Lawrence He <he.andrew.mail@gmail.com>
Date:   Sun Apr 30 19:12:23 2017 -0400

    Hide class rooms in class changes grid (#2351) (#2378)

commit 5d0dab4296e16d1e81a9a1dcbac279b6f3f02598
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Thu Apr 27 01:48:14 2017 -0400

    Delete Showdown (#2379)

    It's an alternate Markdown implementation we used in another era; it
    hasn't been referenced since commit 0cbc07a33.

commit 40923d5c6a4ebdb0da26a8ac42f307fe652b43a0
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sun Apr 23 12:45:52 2017 -0400

    Add a page that picks and displays random classes (#2321)

    Add a page that displays a random class with a button that dynamically
    picks and displays another random class.

commit 6c50936ab6e451579fcb42e567713a557a0aae61
Author: uakfdotb <fbastani@perennate.com>
Date:   Sun Apr 23 12:30:57 2017 -0400

    Improves lottery UI per #2328. (#2335)

    The process for running the lottery should now be more clear, and in the
    case that there are existing enrolled StudentRegistration objects, there
    is a prominent warning that those will be overwritten.  Fixes #2328.

commit fc112c3ff61e9eb72ec3571f9b8033281661b0dc
Author: Ben Kraft <ben@benkraft.org>
Date:   Thu Apr 13 23:44:26 2017 -0700

    Fiddle with sizing of logo on bigpicture theme

    This should make logos with different sizes/proportions look a bit better and
    more consistent.  Fixes #2372.

commit 98ef329cf8fa7eb1a731a7f75218834872fd1e49
Author: Ben Kraft <ben@benkraft.org>
Date:   Thu Apr 13 23:43:24 2017 -0700

    Fix conditional on section header link in bigpicture theme

    Oops!  Fixes a bug reported by Clark; we may want to cherry-pick this to their
    site.

commit f747ca46f8ef6916e3a7d868e070437d859d5174
Author: Will Gearty <willgearty@gmail.com>
Date:   Sat Apr 8 22:30:40 2017 -0700

    Automatic nametags for any user group or volunteers (#2368)

    Adds a new option and dropdown menu to select any user group for nametag creation, requested by Stanford for use with custom student reg groups (so the nametags still have usernames on them).  Also adds nametags for volunteers, fixing #347.

commit 741163ef6c9addf762cdab2abaa80381d674acac
Author: Will Gearty <willgearty@gmail.com>
Date:   Sat Apr 8 22:28:12 2017 -0700

    Volunteer stats (#2369)

    Adds volunteer registration statistics to dashboard and volunteer page

    Fixes #627.

commit 86ca7fa8cba873d04c6e06d274ae84fabce28836
Merge: 3a0b57e 2db91ec
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Sat Apr 8 11:33:32 2017 -0700

    Merge pull request #2370 from learning-unlimited/benkraft.barcode-error

    Fix error when an invalid barcode is submitted

commit 2db91ec11a89c2e6c6f65d2470f80f7d41bc9ca5
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Apr 8 10:58:57 2017 -0700

    Fix error when an invalid barcode is submitted

    In the case where a submitted ID is nonzero or invalid, we were catching the
    error but handling it incorrectly.  In the case where this was not the first
    ID, we'd re-use the previous one, thereby processing it twice and perhaps
    causing a number in the results to be off by one.  In the case where this was
    the first ID, we'd crash with an undefined name error.  Now we'll correctly
    just continue to the next ID in all cases.

commit 3a0b57e7991757f582b377210e4dea43042a27b0
Merge: 0b58536 8ddfcec
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Fri Apr 7 09:19:45 2017 -0700

    Merge pull request #2366 from learning-unlimited/two-phase-cat-fix

    FCFS catalog fix

commit 8ddfcece56e43024e1c4f07dbc47948c85d84c55
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Apr 2 12:43:29 2017 -0700

    Add display css

    Fixes an unintended issue caused by #2317. Need to update display property for within student registration.

commit 0b58536014bd5178797db1bfc8e8f03c843b3eb5
Author: Philip Tran <philipkhiemtran@gmail.com>
Date:   Thu Mar 30 01:02:13 2017 -0400

    Fix zip code searches pluralization (#2357)

commit 1ec351548999493983b56301182e0593f0bdd4ec
Author: Miriam Gershenson <mgershe@gmail.com>
Date:   Thu Mar 30 01:00:21 2017 -0400

    Bump grappelli version (#2359)

    This fixes an bug where you can't edit anything that's in reversion from
    the admin panel.

commit d377c9b2098ac780fc947cade9c725886dce56ce
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Mar 18 12:31:52 2017 -0700

    Make sure new_site.sh sets up log files with the right permissions (#2356)

    This won't help the logrotate issues, but it'll at least prevent them on first setup.

commit a89687ef1e05063ece4a8de0e57434f115ed9ba8
Author: Ben Kraft <ben@benkraft.org>
Date:   Sat Mar 18 12:24:04 2017 -0700

    Update the SSL cert when adding a site (#2355)

    Now that we don't have a wildcard cert (since Let's Encrypt doesn't
    support it), we need to update it when adding a site.  This just
    requires running the script we already have.

commit 28358cab911cae676e97870b00c07f763e3128fc
Author: uakfdotb <fbastani@perennate.com>
Date:   Wed Mar 15 01:38:34 2017 -0400

    Update automatic printing text for new Firefox version. (#2349)

    print_printer is now used instead of print.print_printer.

commit 5580d3bf78b31c0e98cd926b6c919e832c917330
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Tue Mar 14 22:37:29 2017 -0700

    Add UI for bulk create accounts script (#2343)

    Fixes #2342.

commit e69555ddad5c14226b1a5fda93df39db391c9dab
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Wed Mar 15 00:52:36 2017 -0400

    Add more functions to medical bypass page (#2334)

    Add buttons to query the medical form submission status of the user and
    to delete the medical bypass. Also clarify text and message passing.

commit b63bcc365fcce6d8f643b4a825360310e010cb68
Author: Miriam Gershenson <mgershe@gmail.com>
Date:   Tue Mar 7 22:48:02 2017 -0500

    Update pip before using it to install anything else (#2345)

    setuptools needs a new version of pip, but virtualenv packages a
    very old version of pip. If we don't do this, we get strange errors.

commit ff9ac3db47d6ebc79349d4aa5935ae59bfa2e92a
Author: Miriam Gershenson <mgershe@gmail.com>
Date:   Tue Mar 7 22:41:36 2017 -0500

    Switch the dev VM image to 14.04 (#2344)

    As a bonus, it now has our dependencies pre-installed. No more waiting
    for all of texlive to download every time!

commit 3409e25feea12405487353800e35571b111d7380
Author: Benjamin Horowitz <horowitz.ben@gmail.com>
Date:   Thu Mar 2 11:57:22 2017 -0600

    Update program_modules.rst

commit fc34532e4c874f243ce29d2c860caa7054c7d169
Merge: c584976 a5f4f21
Author: Benjamin Horowitz <horowitz.ben@gmail.com>
Date:   Wed Mar 1 09:27:29 2017 -0800

    Merge pull request #2339 from learning-unlimited/update-themes-doc

    add notes about switching themes and logos

commit c58497674706d47dc164583539ddbab90bd1d6a3
Merge: bca611e 9e67ad6
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Mon Feb 27 22:55:44 2017 -0800

    Merge pull request #2319 from learning-unlimited/manage-student-denominators

    Add capacities, preregistered counts to Manage Class page

commit a5f4f210aa41fd2a090f98da0d77e9dda7720403
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Sun Feb 26 23:16:39 2017 -0500

    add notes about switching themes and logos

    Includes notes about template overrides when switching themes plus a few format and wording tweaks. Addresses #2336.

commit bca611ed097ae175e0fd83f3442f8cab3f201636
Author: uakfdotb <fbastani@perennate.com>
Date:   Sat Feb 25 22:29:14 2017 -0500

    Show module list on program manage directory by default. (#2333)

    Issue #357 added the current view with the nice looking sections and nice
    looking buttons, but we still use the module list a lot.

commit 17c96034960d0104a3d47051b0d11cb6e43d6add
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Sat Feb 25 22:26:21 2017 -0500

    Style class change request buttons (#2337)

commit 4ab53c016cddc34dc550fedfc32ac84308929577
Merge: 2ab20ea 5c57c79
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Tue Feb 21 22:54:56 2017 -0800

    Merge pull request #2331 from learning-unlimited/ajax-scheduling-html-cleanup

    clean up ajax_scheduling.html whitespace, tags

commit 2ab20ea8c4ce2e9518872b4f2161d69106a967a3
Merge: f7dd282 a46bfb1
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Tue Feb 21 22:48:41 2017 -0800

    Merge pull request #2332 from learning-unlimited/recovery-buttons

    Style recover password buttons

commit a46bfb13ceade737fb7bf3b5f9d4917ba19f8e21
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Tue Feb 21 20:38:36 2017 -0500

    Style recover password buttons

commit 5c57c792cb2c06c9edd19d296c3ae74c988eadde
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Tue Feb 21 20:25:08 2017 -0500

    clean up ajax_scheduling.html whitespace, tags

commit ca05556cf051eac82670407131cda14134fd457c
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Fri Feb 17 17:50:54 2017 -0500

    Annotate request with permission info in checkDeadline, display it

    In the helper function for checking deadline satisfiability, if the user
    is an administrator, annotate the request with information about which
    permission or deadline was checked and what roles would have had
    permission. Then display this information in the fruitsalad default
    template.

    To accommodate all this, also refactor deadline code to:

    - add a new method for listing roles that have a particular permission,
      pulling out shared logic with user_has_perm
    - eliminate duplication
    - remove the unused meets_all_deadlines method.

    Fixes #2324.

commit f7dd2828eb1d02c132381817a19b5c7ff9634879
Merge: e5fb551 3a599e1
Author: jerrywu64 <jerrywu9876@gmail.com>
Date:   Wed Feb 15 23:43:53 2017 -0500

    Merge pull request #2323 from learning-unlimited/scheduler-resource-tooltip

    Show attribute_value in scheduling application classroom tooltips.

commit 3a599e1e2ff4b5dfa15404264958c4c95b093c03
Author: Favyen Bastani <fbastani@perennate.com>
Date:   Wed Feb 15 18:39:02 2017 -0500

    Show attribute_value in scheduling application classroom tooltips.

    In addition to displaying resource names, it will include the resource
    attribute_value if set.

commit e5fb551e135c54fcb783892bc2ba7405b7fef55c
Merge: 2ea82bb 4ab1a6f
Author: jerrywu64 <jerrywu9876@gmail.com>
Date:   Tue Feb 14 23:20:11 2017 -0500

    Merge pull request #2322 from learning-unlimited/partialrevert2283

    Partial revert of #2283 to fix missing teacher reg buttons.

commit 4ab1a6ffbe14d435a873c2c374ac20ccccad2e57
Author: Favyen Bastani <fbastani@perennate.com>
Date:   Tue Feb 14 23:05:12 2017 -0500

    Partial revert of #2283 to fix missing teacher reg buttons.

    Seems like incorrect CSS class was modified with display:none, the
    same change was made to the correct CSS class in #2317 but the old
    CSS class did not get fixed. This reverts the changes to the incorrect
    CSS class.

commit 9e67ad68c51e6078f5adb7f94a76ca6d06533198
Author: Brian Chen <brian.chxn@gmail.com>
Date:   Mon Feb 13 17:09:33 2017 -0500

    Add capacities, preregistered counts to Manage Class page

    Add the capacity of sections as well as the number of people who
    preregistered for each section in the first part of the Manage Class
    view, with text descriptions so they are not confused.

    Also break things into more lines and add a linebreak tag that went
    missing.

commit 2ea82bb140a1517b22648048d7e7947528f6241e
Author: Will Gearty <willgearty@gmail.com>
Date:   Tue Feb 7 22:07:50 2017 -0800

    Volunteer shift import (#2284)

    Allows for the import of volunteer shifts from previous programs as is possible with class timeslots.

    Fixes #2173.

commit e890ea23239829403b0c600e84690f9e5cb6eb6a
Author: Miriam Gershenson <mgershe@gmail.com>
Date:   Wed Feb 8 01:06:07 2017 -0500

    Add better error message for timeslot import from the same program (#2316)

    Fixes #2114.

commit 83420f25fc1d1038a8bc7d2bf3ec0ed7424f562d
Merge: cee88b0 2348d10
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Tue Feb 7 20:32:17 2017 -0800

    Merge pull request #2317 from learning-unlimited/catalog-buttons

    Change catalog button default to hidden (2)

commit 2348d1097b54e98d86efabfe33bfc8585f542372
Merge: 20c7a8f ee7c460
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Tue Feb 7 10:07:59 2017 -0800

    Merge branch 'catalog-buttons' of https://github.com/learning-unlimited/ESP-Website into catalog-buttons

commit 20c7a8fe959ffc2031943be721f94e595e90f961
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Tue Feb 7 10:07:37 2017 -0800

    Whoops, apparently I changed the wrong CSS class

commit cee88b066f948e6a99ccb49975a7b2bcde9b2d97
Merge: 5e9fae2 3bf1d7d
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Sun Feb 5 23:02:39 2017 -0800

    Merge pull request #2313 from learning-unlimited/mgersh-dead-code

    Dead code deletion

commit 5e9fae2399c9dc80dbb424d8b7c09adfc0a8e4a5
Merge: e1d7d0c 6086c4d
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Sun Feb 5 22:31:01 2017 -0800

    Merge pull request #2314 from learning-unlimited/k12school-contact-name

    Fix K12School admin panel

commit e1d7d0ce8fba89022dca1fc78d615375f9bf90f4
Merge: 264cfd4 7da056a
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Sun Feb 5 22:13:57 2017 -0800

    Merge pull request #2315 from learning-unlimited/flushcache

    Make manage/flushcache with no trailing slash work

commit 7da056ab0af62e61f16f90701494a5bb5d26ebe5
Author: Miriam Gershenson <mgersh@mit.edu>
Date:   Sun Feb 5 22:15:42 2017 -0500

    Make manage/flushcache with no trailing slash work

    Fixes #2175.

commit 6086c4d8e893ed2db18f88c83ed3cd89196b797c
Author: Miriam Gershenson <mgersh@mit.edu>
Date:   Sun Feb 5 21:43:28 2017 -0500

    Fix K12School admin panel

commit 3bf1d7d3a16bca1c6132b93acf0dfe23f5d7d37e
Author: Miriam Gershenson <mgersh@mit.edu>
Date:   Sun Feb 5 21:29:14 2017 -0500

    Delete select_students view

    It's been broken since we stopped using the datatree.

commit 7c192e2d60c91fd5b9e1b44df1b8b49427c33669
Author: Miriam Gershenson <mgersh@mit.edu>
Date:   Tue Dec 27 00:54:07 2016 -0500

    Delete unused fields from RegistrationProfile

commit b7d7b2a56cba4daa370514d7a089174e8b39f8d6
Author: Miriam Gershenson <mgersh@mit.edu>
Date:   Tue Dec 22 18:01:11 2015 -0500

    Delete check_indexes management command

    It's broken, and sqldiff (from django-extensions) does
    the same thing.

commit 264cfd4f39e9a6e7a02cd3c742ca49c669a5ad50
Author: jerrywu64 <jerrywu9876@gmail.com>
Date:   Sun Feb 5 21:04:07 2017 -0500

    Added attribute_value field to resources model (#2311)

    * Added attribute_value field to resources model

    * Added default to new resources attribute_value field

    * add the relevant migration

    * Added comment to attribute_value field of Resource, and set blank=True

commit e93ba21ae1a577ff6d0b4ee03342f7f753c3f1fc
Merge: 4a850a6 997a3a3
Author: Miriam Gershenson <mgershe@gmail.com>
Date:   Sun Feb 5 19:07:53 2017 -0500

    Merge pull request #2310 from learning-unlimited/how-to-add-tags

    How to add tags

commit 997a3a356efa81ed54df932320e3c558544a7346
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Sun Feb 5 15:32:59 2017 -0500

    Update tags.rst

    clarify explanation of import-time error and change suggest of when to notify admin of invalid tag data

commit 153ec755ee1587bd1a1924909f1b1ff2991f8a82
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Fri Feb 3 12:19:27 2017 -0500

    Update tags.rst

    more formatting improvements, corrections about using tag data in `models` files, and elaboration on passing programs to `getBooleanTag()`

commit 63406a9dfd6265dd44c92264b778e86c7317ef1f
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Fri Feb 3 01:35:23 2017 -0500

    Update tags.rst

    two more minor edits

commit 2e765b97ad7349f8373e5315c7d5300277a40bc3
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Fri Feb 3 01:30:40 2017 -0500

    Update and rename add-new-tag to tags.rst

    Rename and reformat for better rst

commit a5cb1aa50ab28fd3d7d9d502056ab13904b73b32
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Fri Feb 3 00:48:04 2017 -0500

    Update add-new-tag

    corrections and reformatting for readability

commit 8a581b5d600a47fa2ba9ef668bfe1488f8ab3c5b
Author: Miles Calabresi <mcalabresi1@gmail.com>
Date:   Fri Feb 3 00:45:13 2017 -0500

    Create add-new-tag

    Overview of the process to make and use new tags in the development process. This doc is based on my first experience using them, so please correct me and provide feedback/edits/additions!

commit 4a850a65ebd04caefd0a06e0305240900ec27bd0
Merge: c69f96b 459261f
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Wed Feb 1 23:55:07 2017 -0800

    Merge pull request #2306 from learning-unlimited/werryju-fresh-import-robust

    CSV fresh classroom import script can now handle invalid rows in furnishings csv

commit c69f96b3dbd8eb172cff46891d1e2e332b8c3521
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Wed Feb 1 22:15:11 2017 -0800

    Add profile affiliation field (#2155)

    This change is requested by Stanford, to add an affiliation field to the profile form. The options are undergrad, grad, postdoc, other, none ("none" is not needed by Stanford but is added so that this change can be used at all schools). There is an additional field to specify further, if "other" or "none" is selected.

    I also removed several questions from the form that are made redundant by this change: from_here, is_graduate_student, school. The fields are not removed from the database, because they are used elsewhere. Instead, these fields are populated automatically based on the affiliation.

    "Affiliation" was also added as a display column and filter on the teacher infos admin page, and also on the userview display.

commit e90cd4e0b96596e616418a8894e47bcaf1aeb78b
Merge: 9d40eed ef067bf
Author: jerrywu64 <jerrywu9876@gmail.com>
Date:   Wed Feb 1 00:13:11 2017 -0500

    Merge pull request #2305 from learning-unlimited/werryju-hit-save

    Added message to hit save to teach add-coteachers page

commit 9d40eedecac28ad895db5518f5b83afb68813a99
Author: Will Gearty <willgearty@gmail.com>
Date:   Tue Jan 31 20:36:11 2017 -0800

    Change catalog button default to hidden (#2283)

    Makes `display: none` the default for register buttons in catalog. Buttons are shown when student class reg settings indicate them to be shown.

    Fixes #2205.

commit 8de10892addaefaa20336e3ac8a6475d4767c65c
Merge: d61f59b bd2b461
Author: Ben Kraft <ben@benkraft.org>
Date:   Tue Jan 31 20:34:39 2017 -0800

    Merge pull request #2279 from learning-unlimited/navbar-edit

    Add Django admin links to navbar for edit/add entry

commit 459261f395e748927e1edc0ff3522cb361365339
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Tue Jan 31 15:19:09 2017 -0500

    Made csv fresh classroom import script robust to invalid rows in the furnishings sheet and improved text output slightly

commit ef067bf7d94d36b156b62a3a7e7d1b097446f155
Author: Jerry Wu <jerrywu9876@gmail.com>
Date:   Tue Jan 31 14:58:13 2017 -0500

    Added message to hit save to teach add-coteachers page

commit d61f59b35f52cf32e3a9dc40d43d8ad3df44ae52
Merge: 4dd54aa 4e051a1
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Mon Jan 30 00:38:48 2017 -0800

    Merge pull request #2302 from learning-unlimited/class-styles

    Class styles

commit 4e051a11309deb336513f089f185a6c9373ee0ff
Author: Theodore Hwa <ted@learningu.org>
Date:   Mon Jan 30 00:27:43 2017 -0800

    set default style_choices to []

commit 4dd54aa698d83be9de534a6c658695eaca2aaa28
Merge: f5f31dc b1cbb5b
Author: hwatheod <hwatheod@cs.stanford.edu>
Date:   Sun Jan 29 20:03:12 2017 -0800

    Merge pull request #2301 from learning-unlimited/benkraft.teacherreg-help-text]

    Add grade min/max to teacherreg fields with customizable help text

commit bca1402dc39b63af8d632fd53154766cc341a09b
Author: Theodore Hwa <ted@learningu.org>
Date:   Sun Jan 29 19:24:01 2017 -0800

    dummy style list; must set "class_style_choices" Tag appropriately to enable class styles

commit 3c9b456fb1307d2a10af290cd00b38510f9fe5ff
Author: Theodore Hwa <ted@learningu.org>
Date:   Sun Jan 29 18:48:10 2017 -0800

    add "class style" field to catalog-new

commit 23d1c30ea1493bf4ed3af354c35c4b59bd59557d
Author: Theodore Hwa <ted@learningu.org>
Date:   Sun Jan 29 18:00:27 2017 -0800

    add "class style" field to program dashboard "Status" pop-up box

commit a88d8ded70b853a0c7357e3c8905b916ae434ce4
Author: Theodore Hwa <ted@learningu.org>
Date:   Sun Jan 29 16:54:20 2017 -0800

    add "class style" field to class registration form

commit f5f31dc70be8b52eb565536f465465c840fc5153
Merge: 053c722 0023634
Author: Ben Kraft <ben@benkraft.org>
Date:   Sun Jan 29 12:59:05 2017 -0800

    Merge pull request #1527 from learning-unlimited/jlegris_1098

    Onsite grid: support moving new students into program

commit 0023634e80a993bac5c6ad5c6d596dace220f358
Author: Anthony Lu <lua@mit.edu>
Date:   Sun Jan 29 00:20:49 2017 -0500

    Semicolon

commit 77cc5efe63eef248b8ac5fc38557369ce38e8a1b
Author: Anthony Lu <lua@mit.edu>
Date:   Sun Jan 29 00:13:20 2017 -0500

    Clean up server autocomplete logic

commit e2002056a8e06865eebf854c4ff5ca1cc133c2df
Author: Anthony Lu <lua@mit.edu>
Date:   Sun Jan 29 00:17:52 2017 -0500

    Use server autocomplete only if there's no local match

commit b1cbb5ba1b5062d8bed2e6d99fdbe8af65311f72
Author: Ben Kraft <ben@benkraft.org>
Date:   Wed Jan 25 22:39:36 2017 -0800

    Add grade min/max to teacherreg fields with customizable help text

    Not entirely sure why we don't have this for all fields, but in any case these
    were requested by Clark (and I've put this change on their site).

commit ee7c4603d37eb2001eb4450fde2fcf6bde2c5a6c
Author: willgearty@gmail.com <willgearty@gmail.com>
Date:   Mon Jan 23 07:45:25 2017 -0500

    Fixed jquery, removed class

commit 053c72215e4b5d497ed686589a9bbb06c41c49e5
Author: Will Gearty <willgearty@gmail.com>
Date:   Sun Jan 22 13:20:39 2017 -0800

    Added and implemented volunteer deadlines (#2172)

    Added a basic volunteer deadline and one for volunteer signup (see #2108).

    Implemented the Volunteer/Signup deadline for the volunteer signup page.  Note that in order for teacher accounts to also volunteer, you must make separate deadlines for teachers and volunteers, each with the Volunteer/Signup deadline.  We also control whether auth is required by a tag.

commit df74bd2e342b54c9beab8993dfa7ec0fb3299e70
Author: Miriam Gershenson <mgershe@gmail.com>
Date:   Sun Jan 22 16:17:14 2017 -0500

    Make new site script prompt for release branch (#2285)

commit 484a580042b636fd90a98f9527d0c267009fd9e8
Author: Anthony Lu <lua@mit.edu>
Date:   Sat Jan 21 00:51:03 2017 -0500

    Fix another whitespace

commit c20dafbb13f310d32d5c5cdd81f57aba079603e8
Author: Anthony Lu <lua@mit.edu>
Date:   Sat Jan 21 00:49:52 2017 -0500

    Add a dummy entry to data.students to fix undefined errors

commit 0dcc94bbbe69f6fa7d3477fd31c87b79aad1ef4a
Author: Anthony Lu <lua@mit.edu>
Date:   Fri Jan 20 23:45:30 2017 -0500

    Fix renamed add_required_transfers() -> ensu鈥

dev-zero added a commit to dev-zero/aiida_core that referenced this issue Jul 6, 2018

travis: explicitly install postgresql-server-dev-9.5
Based on travis-ci/travis-ci#9011 it seems we
have to specify explicitly the dependency on the postgresql-dev package
by now.

dev-zero added a commit to dev-zero/aiida_core that referenced this issue Jul 9, 2018

travis: explicitly install postgresql-server-dev-9.5
Based on travis-ci/travis-ci#9011 it seems we
have to specify explicitly the dependency on the postgresql-dev package
by now.

DropD added a commit to aiidateam/aiida_core that referenced this issue Jul 10, 2018

travis: fix pgtest failure (#1726)
* travis: explicitly install postgresql-server-dev-9.5

Based on travis-ci/travis-ci#9011 it seems we
have to specify explicitly the dependency on the postgresql-dev package
by now.

* Revert "skip pgtest related testcases until #1722 is fixed (#1724)"

This reverts commit 777c16c and fixes #1723

* travis: add proper postgresql bin-dir to path

fixes #1722

* travis: fix ssh-keygen for private instances

dev-zero added a commit to dev-zero/aiida_core that referenced this issue Jul 10, 2018

travis: explicitly install postgresql-server-dev-9.5
Based on travis-ci/travis-ci#9011 it seems we
have to specify explicitly the dependency on the postgresql-dev package
by now.

DropD added a commit to aiidateam/aiida_core that referenced this issue Jul 10, 2018

travis: fix pgtest failures (release-branch) (#1736)
* travis: explicitly install postgresql-server-dev-9.5

Based on travis-ci/travis-ci#9011 it seems we
have to specify explicitly the dependency on the postgresql-dev package
by now.

* travis: add proper postgresql bin-dir to path

fixes #1722

* travis: fix ssh-keygen for private instances
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment