0000000000000000000000000000000000000000 7c7f5c52203c03f6d99246b06ec7f5347ef7315b geoffrey jost <geoffrey.jost@densho.org> 1424473720 -0800	branch: Created from origin/develop
7c7f5c52203c03f6d99246b06ec7f5347ef7315b d447e9a13591f1080ef6b80f84d54b41aa18263b geoffrey jost <geoffrey.jost@densho.org> 1451586143 -0800	pull: Fast-forward
d447e9a13591f1080ef6b80f84d54b41aa18263b 4091eb64c48d205f53df884f858c956ecc82748a geoffrey jost <geoffrey@jostwebwerks.com> 1470944150 -0700	merge master: Merge made by the 'recursive' strategy.
4091eb64c48d205f53df884f858c956ecc82748a 4fc401aeedcb8b16b27d33b27c8200e6ce3ada19 geoffrey jost <geoffrey@jostwebwerks.com> 1491264417 -0700	pull: Fast-forward
4fc401aeedcb8b16b27d33b27c8200e6ce3ada19 63c1b607e95ebd91f6435c8d082139e4c606a39a geoffrey jost <geoffrey@jostwebwerks.com> 1495751733 -0700	pull: Fast-forward
63c1b607e95ebd91f6435c8d082139e4c606a39a 72f3ef6ad83098241ad2687011ac1e4b732ccd63 geoffrey jost <geoffrey@jostwebwerks.com> 1502497595 -0700	merge fpmpkg: Merge made by the 'recursive' strategy.
72f3ef6ad83098241ad2687011ac1e4b732ccd63 cd9a8f166867fff34fe2e460148e67adee2ed0af geoffrey jost <geoffrey@jostwebwerks.com> 1508957523 -0700	commit (cherry-pick): print version,elasticsearch info in comments in base template
cd9a8f166867fff34fe2e460148e67adee2ed0af c5b7031f0e203631a021b7da08e7113dc2d34c9e geoffrey jost <geoffrey@jostwebwerks.com> 1508971120 -0700	commit: settings: made package name function more robust
c5b7031f0e203631a021b7da08e7113dc2d34c9e e156a568b642c8498fe4c23fdeeb97f2fab348a3 geoffrey jost <geoffrey@jostwebwerks.com> 1508971607 -0700	commit (amend): settings: made package name function more robust
e156a568b642c8498fe4c23fdeeb97f2fab348a3 1b3cb4782bdb689fe729c3b173d68a5a196b182e geoffrey jost <geoffrey@jostwebwerks.com> 1512438107 -0800	commit: settings: gitpkg_debug in public.cfg
1b3cb4782bdb689fe729c3b173d68a5a196b182e e48c315a5f5b2e56b1915b4c4d9453da763cb309 geoffrey jost <geoffrey@jostwebwerks.com> 1512438366 -0800	commit: django-cors-headers to allow API users to make CORS requests
e48c315a5f5b2e56b1915b4c4d9453da763cb309 11aca58d2969572a92f80d6b9801bbaf0e75ce90 geoffrey jost <geoffrey@jostwebwerks.com> 1512506761 -0800	commit (amend): django-cors-headers to allow API users to make CORS requests
11aca58d2969572a92f80d6b9801bbaf0e75ce90 a63c92f7d15580c60616908dc4c2d94a5a66efc6 geoffrey jost <geoffrey@jostwebwerks.com> 1522787824 -0700	merge master: Merge made by the 'recursive' strategy.
a63c92f7d15580c60616908dc4c2d94a5a66efc6 6b396a40e5c0b7462ed3366632a03604e98faf45 geoffrey jost <geoffrey@jostwebwerks.com> 1527101174 -0700	merge ddrpub-static: Merge made by the 'recursive' strategy.
6b396a40e5c0b7462ed3366632a03604e98faf45 27f9b658901bfa9d95747364d98124fe28bb00ed geoffrey jost <geoffrey@jostwebwerks.com> 1527101443 -0700	commit: VERSION: 3.0.0
27f9b658901bfa9d95747364d98124fe28bb00ed 5f580d356a7b319a1c520fe36b5c51fd18686815 geoffrey jost <geoffrey@jostwebwerks.com> 1527101809 -0700	commit: Makefile: replace FPM_ prefix with DEB_
5f580d356a7b319a1c520fe36b5c51fd18686815 2e767b83390eb204da0b708291b2b3e5e80ac5a9 geoffrey jost <geoffrey@jostwebwerks.com> 1527113094 -0700	commit: Makefile: separate deb8/deb8 targets; modernize like ddrlocal
2e767b83390eb204da0b708291b2b3e5e80ac5a9 216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 geoffrey jost <geoffrey@jostwebwerks.com> 1527113171 -0700	rebase -i (finish): refs/heads/develop onto 5f580d356a7b319a1c520fe36b5c51fd18686815
216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 cc88f867db3edae0ca4259f999c7eda11cc7ff38 geoffrey jost <geoffrey@jostwebwerks.com> 1527198424 -0700	cherry-pick: ui: base.html edit to add cookie notice (79)
cc88f867db3edae0ca4259f999c7eda11cc7ff38 216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 geoffrey jost <geoffrey@jostwebwerks.com> 1527198782 -0700	reset: moving to HEAD~1
216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 e128237d18b33a37eea0a967969d1defc8e455e0 geoffrey jost <geoffrey@jostwebwerks.com> 1527198897 -0700	cherry-pick: ui: base.html edit to add cookie notice (79)
e128237d18b33a37eea0a967969d1defc8e455e0 0922732c3046dd782b0a8dd851bf18c9d22f60f0 geoffrey jost <geoffrey@jostwebwerks.com> 1527198940 -0700	commit: ui: add important missing character to cookie notice
0922732c3046dd782b0a8dd851bf18c9d22f60f0 48eb343b35f68b2961acd0350ede16f696d20fb3 geoffrey jost <geoffrey@jostwebwerks.com> 1527274642 -0700	rebase -i (finish): refs/heads/develop onto e128237d18b33a37eea0a967969d1defc8e455e0
48eb343b35f68b2961acd0350ede16f696d20fb3 b80e2d010d05df31ab64d444a501dc5d59be62aa geoffrey jost <geoffrey@jostwebwerks.com> 1527274728 -0700	commit: VERSION: 3.0.1
b80e2d010d05df31ab64d444a501dc5d59be62aa 6dc101a05fd22b730fb97ca307284a84465adb52 geoffrey jost <geoffrey@jostwebwerks.com> 1527717387 -0700	commit: Makefile: install namesdb in make task instead of pip requirements
6dc101a05fd22b730fb97ca307284a84465adb52 55c98388788b72f08b98a5408e3342de13f40a6e geoffrey jost <geoffrey@jostwebwerks.com> 1527787565 -0700	commit (amend): Makefile: install namesdb in make task instead of pip requirements
55c98388788b72f08b98a5408e3342de13f40a6e ffc2213721457ec09994e3c6a8b39b0613fab0d3 geoffrey jost <geoffrey@jostwebwerks.com> 1527793885 -0700	commit: requirements: update elasticsearch-py, elasticsearch-dsl
ffc2213721457ec09994e3c6a8b39b0613fab0d3 4b90fe088d5bc8d725a56241fb4dc5205c406a93 geoffrey jost <geoffrey@jostwebwerks.com> 1527793975 -0700	commit: namesdb: update to work with new Elasticsearch libs
4b90fe088d5bc8d725a56241fb4dc5205c406a93 9e3e7494e7f7fadf959f4a1757d2a12de3203401 geoffrey jost <geoffrey@jostwebwerks.com> 1527797486 -0700	commit: requirements: update non-Django dependencies
9e3e7494e7f7fadf959f4a1757d2a12de3203401 973cc84c27d07d3718639a282f1620021aa9eb22 geoffrey jost <geoffrey@jostwebwerks.com> 1527797634 -0700	commit (amend): requirements: update non-Django dependencies
973cc84c27d07d3718639a282f1620021aa9eb22 18df57ec895a09edbeadfac6bf349c9910be68de geoffrey jost <geoffrey@jostwebwerks.com> 1527799127 -0700	commit: requirements: upgrade to Django 1.9.*
18df57ec895a09edbeadfac6bf349c9910be68de 17b41726ea867c1e64b8a7f06635f3673c3ddc78 geoffrey jost <geoffrey@jostwebwerks.com> 1527808918 -0700	commit: upgrade to Django 1.10
17b41726ea867c1e64b8a7f06635f3673c3ddc78 8f1bdd0ee77f36ce013fcaae377c6c3784467bc7 geoffrey jost <geoffrey@jostwebwerks.com> 1527808956 -0700	rebase -i (finish): refs/heads/develop onto 4b90fe088d5bc8d725a56241fb4dc5205c406a93
8f1bdd0ee77f36ce013fcaae377c6c3784467bc7 8c2b6fdf8c75af25199af56424b3ef5588b68c0a geoffrey jost <geoffrey@jostwebwerks.com> 1527810034 -0700	commit (amend): upgrade to Django 1.10
8c2b6fdf8c75af25199af56424b3ef5588b68c0a f8cec11bc708004d24bcf5917bd2a868ef8d09fc geoffrey jost <geoffrey@jostwebwerks.com> 1527810362 -0700	commit: upgrade to Django 1.11
f8cec11bc708004d24bcf5917bd2a868ef8d09fc ef162beb6525efca42a5889e8037cf4bcca858b2 geoffrey jost <geoffrey@jostwebwerks.com> 1527810463 -0700	commit: settings: re-enable Redis caching (disabled during upgrades)
ef162beb6525efca42a5889e8037cf4bcca858b2 5795ddad75f09ec3fc67d1d05788c89309c7d016 geoffrey jost <geoffrey@jostwebwerks.com> 1527810706 -0700	rebase -i (finish): refs/heads/develop onto 7de9249e154c0ecefc3edc11b8bbf921d3425fa2
5795ddad75f09ec3fc67d1d05788c89309c7d016 21243c79b41de10a116098d773c88354cbce0ce6 geoffrey jost <geoffrey@jostwebwerks.com> 1527810804 -0700	commit: requirements: move to a single file in project root
21243c79b41de10a116098d773c88354cbce0ce6 adb22dca2e7595db4648c75135c5b6a6573f83d6 geoffrey jost <geoffrey@jostwebwerks.com> 1527811100 -0700	commit (amend): requirements: move to a single file in project root
adb22dca2e7595db4648c75135c5b6a6573f83d6 2d4027d3815d4865057fbb28c812cc7416842553 geoffrey jost <geoffrey@jostwebwerks.com> 1527811148 -0700	commit: .gitignore *.deb package files
2d4027d3815d4865057fbb28c812cc7416842553 17f451c247794c9ca12285eed5364d1070a70e1c geoffrey jost <geoffrey@jostwebwerks.com> 1527811406 -0700	commit: VERSION: 3.0.2
17f451c247794c9ca12285eed5364d1070a70e1c 76e7281a075ca1b752d8e85b249373ce38680a71 geoffrey jost <geoffrey@jostwebwerks.com> 1527813113 -0700	commit: requirements: upgrade djangorestframework to 3.6; add coreapi-cli
76e7281a075ca1b752d8e85b249373ce38680a71 e41cec39c94a786f64c441c9b2388f6d2d152dda geoffrey jost <geoffrey@jostwebwerks.com> 1527859976 -0700	rebase -i (finish): refs/heads/develop onto 2d4027d3815d4865057fbb28c812cc7416842553
e41cec39c94a786f64c441c9b2388f6d2d152dda 2ef02cc1933669f68c49ab5b1130d6383fd382b8 geoffrey jost <geoffrey@jostwebwerks.com> 1527860012 -0700	reset: moving to HEAD~1
2ef02cc1933669f68c49ab5b1130d6383fd382b8 55c98388788b72f08b98a5408e3342de13f40a6e geoffrey jost <geoffrey@jostwebwerks.com> 1527864806 -0700	reset: moving to HEAD~10
55c98388788b72f08b98a5408e3342de13f40a6e b80e2d010d05df31ab64d444a501dc5d59be62aa geoffrey jost <geoffrey@jostwebwerks.com> 1527864810 -0700	reset: moving to HEAD~1
b80e2d010d05df31ab64d444a501dc5d59be62aa 1013fbbc6869907dfb94c686a86de899908b5d26 geoffrey jost <geoffrey@jostwebwerks.com> 1527864823 -0700	merge 060-upgrade-django: Merge made by the 'recursive' strategy.
1013fbbc6869907dfb94c686a86de899908b5d26 bd549fa1b17f246b883bd68480270e0a81e60b10 geoffrey jost <geoffrey@jostwebwerks.com> 1527864878 -0700	commit: VERSION: 3.1.0
bd549fa1b17f246b883bd68480270e0a81e60b10 1d4541ad3a0d58d4a076a8dc4b957cb33c4ef6af geoffrey jost <geoffrey@jostwebwerks.com> 1528396315 -0700	merge 66-hotfix-ui-iaplayer: Merge made by the 'recursive' strategy.
1d4541ad3a0d58d4a076a8dc4b957cb33c4ef6af 1b7b591c644bb5ec5163158a99c83dd1cee3bb61 geoffrey jost <geoffrey@jostwebwerks.com> 1528396338 -0700	commit: VERSION: 3.1.1
