0000000000000000000000000000000000000000 ac1dfaffcdbfbf775974b61757fd1ef767cccac4 root <root@partner> 1390336611 -0800	clone: from https://github.com/densho/ddr-public.git
ac1dfaffcdbfbf775974b61757fd1ef767cccac4 0bbfa6f38eb40f5385921a04e5ae57bb83556337 geoffrey jost <geoffrey.jost@densho.org> 1390345340 -0800	commit: ddr-cmdln and ddr-local are requirements
0bbfa6f38eb40f5385921a04e5ae57bb83556337 11d73892049c24b7d7d8ff96551a96397a70e207 geoffrey jost <geoffrey.jost@densho.org> 1390345387 -0800	commit: rm settings.py.template; real one is debian/conf/settings.py
11d73892049c24b7d7d8ff96551a96397a70e207 bc2e3231f0762170e4083e0b4a2288862c6e6533 geoffrey jost <geoffrey.jost@densho.org> 1390345434 -0800	commit: install/update scripts and config files
bc2e3231f0762170e4083e0b4a2288862c6e6533 c08564a061b947334d6772e85528f2769f595119 geoffrey jost <geoffrey.jost@densho.org> 1391124617 -0800	pull: Fast-forward
c08564a061b947334d6772e85528f2769f595119 30655a188ffb10304a695b5b6d9922a26821b8c5 root <root@partner> 1392072077 -0800	pull: Fast-forward
30655a188ffb10304a695b5b6d9922a26821b8c5 77435a2854657cfac2bb076e3519be3ed7ba8c27 geoffrey jost <geoffrey.jost@densho.org> 1394491567 -0700	pull: Fast-forward
77435a2854657cfac2bb076e3519be3ed7ba8c27 7c7f5c52203c03f6d99246b06ec7f5347ef7315b geoffrey jost <geoffrey.jost@densho.org> 1424473720 -0800	checkout: moving from master to develop
7c7f5c52203c03f6d99246b06ec7f5347ef7315b 77435a2854657cfac2bb076e3519be3ed7ba8c27 geoffrey jost <geoffrey.jost@densho.org> 1427217840 -0700	checkout: moving from develop to master
77435a2854657cfac2bb076e3519be3ed7ba8c27 1ba781a62dd212d962d070950517cff28a0c8060 geoffrey jost <geoffrey.jost@densho.org> 1427217841 -0700	pull: Fast-forward
1ba781a62dd212d962d070950517cff28a0c8060 7c7f5c52203c03f6d99246b06ec7f5347ef7315b geoffrey jost <geoffrey.jost@densho.org> 1427217852 -0700	checkout: moving from master to develop
7c7f5c52203c03f6d99246b06ec7f5347ef7315b d447e9a13591f1080ef6b80f84d54b41aa18263b geoffrey jost <geoffrey.jost@densho.org> 1451586143 -0800	pull: Fast-forward
d447e9a13591f1080ef6b80f84d54b41aa18263b 1ba781a62dd212d962d070950517cff28a0c8060 geoffrey jost <geoffrey.jost@densho.org> 1451586159 -0800	checkout: moving from develop to master
1ba781a62dd212d962d070950517cff28a0c8060 d594362ec4844baa5a6dcc0bae929b2e83b973eb geoffrey jost <geoffrey.jost@densho.org> 1451586161 -0800	pull: Fast-forward
d594362ec4844baa5a6dcc0bae929b2e83b973eb d447e9a13591f1080ef6b80f84d54b41aa18263b geoffrey jost <geoffrey.jost@densho.org> 1451586685 -0800	checkout: moving from master to develop
d447e9a13591f1080ef6b80f84d54b41aa18263b d594362ec4844baa5a6dcc0bae929b2e83b973eb geoffrey jost <geoffrey@jostwebwerks.com> 1463702270 -0700	checkout: moving from develop to master
d594362ec4844baa5a6dcc0bae929b2e83b973eb bb4cd2dd666885924c7ad483ced507f5d91646f0 geoffrey jost <geoffrey@jostwebwerks.com> 1463702272 -0700	pull: Fast-forward
bb4cd2dd666885924c7ad483ced507f5d91646f0 984e7f289ed8e40d5dfb5139aa6aadfad55635ab geoffrey jost <geoffrey@jostwebwerks.com> 1463702463 -0700	commit: added config file fields expected by DDR.config
984e7f289ed8e40d5dfb5139aa6aadfad55635ab b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 geoffrey jost <geoffrey@jostwebwerks.com> 1464293005 -0700	pull: Fast-forward
b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 d447e9a13591f1080ef6b80f84d54b41aa18263b geoffrey jost <geoffrey@jostwebwerks.com> 1464825021 -0700	checkout: moving from master to develop
d447e9a13591f1080ef6b80f84d54b41aa18263b b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 geoffrey jost <geoffrey@jostwebwerks.com> 1464828031 -0700	checkout: moving from develop to master
b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 d447e9a13591f1080ef6b80f84d54b41aa18263b geoffrey jost <geoffrey@jostwebwerks.com> 1470944104 -0700	checkout: moving from master to develop
d447e9a13591f1080ef6b80f84d54b41aa18263b b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 geoffrey jost <geoffrey@jostwebwerks.com> 1470944115 -0700	checkout: moving from develop to master
b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 d447e9a13591f1080ef6b80f84d54b41aa18263b geoffrey jost <geoffrey@jostwebwerks.com> 1470944129 -0700	checkout: moving from master to develop
d447e9a13591f1080ef6b80f84d54b41aa18263b 4091eb64c48d205f53df884f858c956ecc82748a geoffrey jost <geoffrey@jostwebwerks.com> 1470944150 -0700	merge master: Merge made by the 'recursive' strategy.
4091eb64c48d205f53df884f858c956ecc82748a 4091eb64c48d205f53df884f858c956ecc82748a geoffrey jost <geoffrey@jostwebwerks.com> 1470944254 -0700	checkout: moving from develop to 023a-signatures
4091eb64c48d205f53df884f858c956ecc82748a 2d60b0039c5b17bda478ca8bb49bd678bbacb2e1 geoffrey jost <geoffrey@jostwebwerks.com> 1470944645 -0700	commit: replace "signature_file" with "signature_id"
2d60b0039c5b17bda478ca8bb49bd678bbacb2e1 b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 geoffrey jost <geoffrey@jostwebwerks.com> 1491264396 -0700	checkout: moving from 023a-signatures to master
b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 geoffrey jost <geoffrey@jostwebwerks.com> 1491264410 -0700	checkout: moving from master to master
b7da5c5a38a555e113bdde3243fd41a9fb7fdad6 b648840f5703adc314f38b6428ebd2e5fc7b1e27 geoffrey jost <geoffrey@jostwebwerks.com> 1491264412 -0700	pull: Fast-forward
b648840f5703adc314f38b6428ebd2e5fc7b1e27 4091eb64c48d205f53df884f858c956ecc82748a geoffrey jost <geoffrey@jostwebwerks.com> 1491264416 -0700	checkout: moving from master to develop
4091eb64c48d205f53df884f858c956ecc82748a 4fc401aeedcb8b16b27d33b27c8200e6ce3ada19 geoffrey jost <geoffrey@jostwebwerks.com> 1491264417 -0700	pull: Fast-forward
4fc401aeedcb8b16b27d33b27c8200e6ce3ada19 b648840f5703adc314f38b6428ebd2e5fc7b1e27 geoffrey jost <geoffrey@jostwebwerks.com> 1495751723 -0700	checkout: moving from develop to master
b648840f5703adc314f38b6428ebd2e5fc7b1e27 e0a5f43cbc486fa420f43ec20e194bdc6209d8cf geoffrey jost <geoffrey@jostwebwerks.com> 1495751727 -0700	pull: Fast-forward
e0a5f43cbc486fa420f43ec20e194bdc6209d8cf 4fc401aeedcb8b16b27d33b27c8200e6ce3ada19 geoffrey jost <geoffrey@jostwebwerks.com> 1495751730 -0700	checkout: moving from master to develop
4fc401aeedcb8b16b27d33b27c8200e6ce3ada19 63c1b607e95ebd91f6435c8d082139e4c606a39a geoffrey jost <geoffrey@jostwebwerks.com> 1495751733 -0700	pull: Fast-forward
63c1b607e95ebd91f6435c8d082139e4c606a39a b648840f5703adc314f38b6428ebd2e5fc7b1e27 geoffrey jost <geoffrey@jostwebwerks.com> 1495751737 -0700	checkout: moving from develop to master-v1
b648840f5703adc314f38b6428ebd2e5fc7b1e27 e0a5f43cbc486fa420f43ec20e194bdc6209d8cf geoffrey jost <geoffrey@jostwebwerks.com> 1495751743 -0700	checkout: moving from master-v1 to master
e0a5f43cbc486fa420f43ec20e194bdc6209d8cf e0a5f43cbc486fa420f43ec20e194bdc6209d8cf geoffrey jost <geoffrey@jostwebwerks.com> 1502317909 -0700	checkout: moving from master to fpmpkg
e0a5f43cbc486fa420f43ec20e194bdc6209d8cf 416c252bd1e7a0c4567c625f977c76d71f9db998 geoffrey jost <geoffrey@jostwebwerks.com> 1502486235 -0700	commit: move project from /usr/local/src/ddr-public to /opt/
416c252bd1e7a0c4567c625f977c76d71f9db998 9d7a9bc4cabfa26ea6e6eb019be89db0c4648af5 geoffrey jost <geoffrey@jostwebwerks.com> 1502486388 -0700	commit: Makefile: bring up to speed with other project makefiles
9d7a9bc4cabfa26ea6e6eb019be89db0c4648af5 cba6f9eac271024eef4f94bec7b7c831b0fd05d3 geoffrey jost <geoffrey@jostwebwerks.com> 1502486428 -0700	commit: get SECRET_KEY from ddrpublic.cfg instead of separate file
cba6f9eac271024eef4f94bec7b7c831b0fd05d3 76d89db0e291ec591e64232191c8ea254d25a1da geoffrey jost <geoffrey@jostwebwerks.com> 1502486663 -0700	commit: conf: separate nginx.conf for elasticsearch
76d89db0e291ec591e64232191c8ea254d25a1da 2a65329f3feabc500438e017cec17cb23840e6e5 geoffrey jost <geoffrey@jostwebwerks.com> 1502486705 -0700	commit: conf: allowed_hosts and nginx server_name
2a65329f3feabc500438e017cec17cb23840e6e5 248a61aff368452d88a73a66a0c939b516d01db6 geoffrey jost <geoffrey@jostwebwerks.com> 1502486911 -0700	commit: conf: rename nginx,supervisor files, rm elasticsearch,supervisord
248a61aff368452d88a73a66a0c939b516d01db6 ce6787dca4e8600ffb8e6ca62d40bea07efa9e7a geoffrey jost <geoffrey@jostwebwerks.com> 1502497511 -0700	commit: Makefile: .deb packaging
ce6787dca4e8600ffb8e6ca62d40bea07efa9e7a 63c1b607e95ebd91f6435c8d082139e4c606a39a geoffrey jost <geoffrey@jostwebwerks.com> 1502497547 -0700	checkout: moving from fpmpkg to develop
63c1b607e95ebd91f6435c8d082139e4c606a39a 72f3ef6ad83098241ad2687011ac1e4b732ccd63 geoffrey jost <geoffrey@jostwebwerks.com> 1502497595 -0700	merge fpmpkg: Merge made by the 'recursive' strategy.
72f3ef6ad83098241ad2687011ac1e4b732ccd63 e0a5f43cbc486fa420f43ec20e194bdc6209d8cf geoffrey jost <geoffrey@jostwebwerks.com> 1502497701 -0700	checkout: moving from develop to master
e0a5f43cbc486fa420f43ec20e194bdc6209d8cf e81f0aeb43a18b4ec50d3bcf7a37d38f59ffc709 geoffrey jost <geoffrey@jostwebwerks.com> 1502497708 -0700	pull: Fast-forward
e81f0aeb43a18b4ec50d3bcf7a37d38f59ffc709 4865170d062a023a33a0e9366c71e51df9985254 geoffrey jost <geoffrey@jostwebwerks.com> 1502497725 -0700	merge fpmpkg: Merge made by the 'recursive' strategy.
4865170d062a023a33a0e9366c71e51df9985254 72f3ef6ad83098241ad2687011ac1e4b732ccd63 geoffrey jost <geoffrey@jostwebwerks.com> 1502497742 -0700	checkout: moving from master to develop
72f3ef6ad83098241ad2687011ac1e4b732ccd63 4865170d062a023a33a0e9366c71e51df9985254 geoffrey jost <geoffrey@jostwebwerks.com> 1502498496 -0700	checkout: moving from develop to master
4865170d062a023a33a0e9366c71e51df9985254 3fecc11934b654bbc657d3d0cdcc4ca6f225b49f geoffrey jost <geoffrey@jostwebwerks.com> 1502844569 -0700	commit: Makefile: supervisor,nginx configs in right place
3fecc11934b654bbc657d3d0cdcc4ca6f225b49f 3fecc11934b654bbc657d3d0cdcc4ca6f225b49f geoffrey jost <geoffrey@jostwebwerks.com> 1502847825 -0700	checkout: moving from master to from-old-site
3fecc11934b654bbc657d3d0cdcc4ca6f225b49f a81fe3d180605c8638c7b154e3fb666d1ad9b0b2 geoffrey jost <geoffrey@jostwebwerks.com> 1502847864 -0700	commit: catch redirects from archive.densho.org, display welcome message
a81fe3d180605c8638c7b154e3fb666d1ad9b0b2 8c25202e32991e1886f78e3842645334e2aa3f72 geoffrey jost <geoffrey@jostwebwerks.com> 1502901981 -0700	commit: official archive.densho.org redirect welcome message
8c25202e32991e1886f78e3842645334e2aa3f72 a920ce6c16e0978648aadac5475ab5abfffafc09 geoffrey jost <geoffrey@jostwebwerks.com> 1502902694 -0700	commit (amend): official archive.densho.org redirect welcome message
a920ce6c16e0978648aadac5475ab5abfffafc09 88f7c547ae41116575ffbd0a486f0e46c7ce8363 geoffrey jost <geoffrey@jostwebwerks.com> 1502904989 -0700	commit (amend): official archive.densho.org redirect welcome message
88f7c547ae41116575ffbd0a486f0e46c7ce8363 384238647244ae8e9049eec64afba902e5edbb26 geoffrey jost <geoffrey@jostwebwerks.com> 1502905035 -0700	commit (amend): official archive.densho.org redirect welcome message
384238647244ae8e9049eec64afba902e5edbb26 ef367badf37f4d9ec48c0ea7a4f64a812cec11c1 geoffrey jost <geoffrey@jostwebwerks.com> 1507584649 -0700	commit: make deb: don't install configs managed by ansible-colo
ef367badf37f4d9ec48c0ea7a4f64a812cec11c1 384238647244ae8e9049eec64afba902e5edbb26 geoffrey jost <geoffrey@jostwebwerks.com> 1507585292 -0700	reset: moving to HEAD~1
384238647244ae8e9049eec64afba902e5edbb26 ef367badf37f4d9ec48c0ea7a4f64a812cec11c1 geoffrey jost <geoffrey@jostwebwerks.com> 1507585308 -0700	pull: Fast-forward
ef367badf37f4d9ec48c0ea7a4f64a812cec11c1 3fecc11934b654bbc657d3d0cdcc4ca6f225b49f geoffrey jost <geoffrey@jostwebwerks.com> 1507585323 -0700	checkout: moving from from-old-site to master
3fecc11934b654bbc657d3d0cdcc4ca6f225b49f 72f3ef6ad83098241ad2687011ac1e4b732ccd63 geoffrey jost <geoffrey@jostwebwerks.com> 1507585354 -0700	checkout: moving from master to develop
72f3ef6ad83098241ad2687011ac1e4b732ccd63 3fecc11934b654bbc657d3d0cdcc4ca6f225b49f geoffrey jost <geoffrey@jostwebwerks.com> 1507585362 -0700	checkout: moving from develop to master
3fecc11934b654bbc657d3d0cdcc4ca6f225b49f 580e9697a3764d7afaa0086ff1cac08a8f631e44 geoffrey jost <geoffrey@jostwebwerks.com> 1507585445 -0700	commit: make deb: don't install configs managed by ansible-colo
580e9697a3764d7afaa0086ff1cac08a8f631e44 72f3ef6ad83098241ad2687011ac1e4b732ccd63 geoffrey jost <geoffrey@jostwebwerks.com> 1508874471 -0700	checkout: moving from master to develop
72f3ef6ad83098241ad2687011ac1e4b732ccd63 580e9697a3764d7afaa0086ff1cac08a8f631e44 geoffrey jost <geoffrey@jostwebwerks.com> 1508955255 -0700	checkout: moving from develop to master
580e9697a3764d7afaa0086ff1cac08a8f631e44 9d2524f344c6497a7facdc3f70924778449f2a40 geoffrey jost <geoffrey@jostwebwerks.com> 1508955286 -0700	merge develop: Merge made by the 'recursive' strategy.
9d2524f344c6497a7facdc3f70924778449f2a40 7c882ef7efc2fc133c68974039f483a3626106c8 geoffrey jost <geoffrey@jostwebwerks.com> 1508956334 -0700	commit: print version,elasticsearch info in comments in base template
7c882ef7efc2fc133c68974039f483a3626106c8 72f3ef6ad83098241ad2687011ac1e4b732ccd63 geoffrey jost <geoffrey@jostwebwerks.com> 1508956581 -0700	checkout: moving from master to develop
72f3ef6ad83098241ad2687011ac1e4b732ccd63 7c882ef7efc2fc133c68974039f483a3626106c8 geoffrey jost <geoffrey@jostwebwerks.com> 1508957354 -0700	checkout: moving from develop to master
7c882ef7efc2fc133c68974039f483a3626106c8 72f3ef6ad83098241ad2687011ac1e4b732ccd63 geoffrey jost <geoffrey@jostwebwerks.com> 1508957363 -0700	checkout: moving from master to develop
72f3ef6ad83098241ad2687011ac1e4b732ccd63 cd9a8f166867fff34fe2e460148e67adee2ed0af geoffrey jost <geoffrey@jostwebwerks.com> 1508957523 -0700	commit (cherry-pick): print version,elasticsearch info in comments in base template
cd9a8f166867fff34fe2e460148e67adee2ed0af 7c882ef7efc2fc133c68974039f483a3626106c8 geoffrey jost <geoffrey@jostwebwerks.com> 1508958899 -0700	checkout: moving from develop to master
7c882ef7efc2fc133c68974039f483a3626106c8 ef367badf37f4d9ec48c0ea7a4f64a812cec11c1 geoffrey jost <geoffrey@jostwebwerks.com> 1508959163 -0700	checkout: moving from master to from-old-site
ef367badf37f4d9ec48c0ea7a4f64a812cec11c1 cbd400fcf066176e6daa7457294888b745cc029a Geoffrey Jost <root@dloc> 1508959246 -0700	commit (cherry-pick): print version,elasticsearch info in comments in base template
cbd400fcf066176e6daa7457294888b745cc029a cd9a8f166867fff34fe2e460148e67adee2ed0af geoffrey jost <geoffrey@jostwebwerks.com> 1508961479 -0700	checkout: moving from from-old-site to develop
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 7c882ef7efc2fc133c68974039f483a3626106c8 geoffrey jost <geoffrey@jostwebwerks.com> 1512595776 -0800	checkout: moving from develop to master
7c882ef7efc2fc133c68974039f483a3626106c8 4e6707db177f0455da56c1c6dcdf42fbd781779e geoffrey jost <geoffrey@jostwebwerks.com> 1512595842 -0800	commit (merge): Merge branch 'from-old-site'
4e6707db177f0455da56c1c6dcdf42fbd781779e b43fe5b6d33aec13d5a597075e818cb0b3930824 geoffrey jost <geoffrey@jostwebwerks.com> 1512596554 -0800	commit (merge): Merge branch 'develop'
b43fe5b6d33aec13d5a597075e818cb0b3930824 5f3c42fceeb0cbff27a018b1ff35702df9b4cab4 geoffrey jost <geoffrey@jostwebwerks.com> 1522264434 -0700	pull: Fast-forward
5f3c42fceeb0cbff27a018b1ff35702df9b4cab4 160f8daeec85c700f063a5781d522c6db09a5edc geoffrey jost <geoffrey@jostwebwerks.com> 1522265386 -0700	commit: VERSION: 2.0.6
160f8daeec85c700f063a5781d522c6db09a5edc f927fcacf5f89987b9f209ac83377ccdca2fbd54 geoffrey jost <geoffrey@jostwebwerks.com> 1522270011 -0700	commit: conf: required fields from newer ddr-cmdln
f927fcacf5f89987b9f209ac83377ccdca2fbd54 eb434fa343cebc4f75814f9c706d204d7f5e7ff6 geoffrey jost <geoffrey@jostwebwerks.com> 1522270038 -0700	commit: forms: update imports bc of ddr-defs refactor
eb434fa343cebc4f75814f9c706d204d7f5e7ff6 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1522270094 -0700	commit: VERSION: 2.0.7
34baf15cff65fdec2361a670b0e1bd16e1d61626 160f8daeec85c700f063a5781d522c6db09a5edc geoffrey jost <geoffrey@jostwebwerks.com> 1522272108 -0700	checkout: moving from master to 160f8da
160f8daeec85c700f063a5781d522c6db09a5edc 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1522272123 -0700	checkout: moving from 160f8daeec85c700f063a5781d522c6db09a5edc to master
34baf15cff65fdec2361a670b0e1bd16e1d61626 b43fe5b6d33aec13d5a597075e818cb0b3930824 geoffrey jost <geoffrey@jostwebwerks.com> 1522272194 -0700	checkout: moving from master to b43fe5b
b43fe5b6d33aec13d5a597075e818cb0b3930824 b43fe5b6d33aec13d5a597075e818cb0b3930824 geoffrey jost <geoffrey@jostwebwerks.com> 1522275843 -0700	checkout: moving from b43fe5b6d33aec13d5a597075e818cb0b3930824 to ddrpublic-support
b43fe5b6d33aec13d5a597075e818cb0b3930824 7a704012028f279a0ddbd1d45fa3fa7ba84e7d5b geoffrey jost <geoffrey@jostwebwerks.com> 1522354169 -0700	commit: added ddrpublic.docstore
7a704012028f279a0ddbd1d45fa3fa7ba84e7d5b cbcb3dc5add2f862cef36a9c72ec27c198db9c5d geoffrey jost <geoffrey@jostwebwerks.com> 1522354279 -0700	commit: forms: update imports bc of ddr-defs refactor
cbcb3dc5add2f862cef36a9c72ec27c198db9c5d 4ee9266c41ffe4f095d28765f69351cbcfd8c521 geoffrey jost <geoffrey@jostwebwerks.com> 1522354304 -0700	commit: api: fixed file download link
4ee9266c41ffe4f095d28765f69351cbcfd8c521 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1522354346 -0700	checkout: moving from ddrpublic-support to master
34baf15cff65fdec2361a670b0e1bd16e1d61626 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1522354378 -0700	checkout: moving from master to master
34baf15cff65fdec2361a670b0e1bd16e1d61626 11aca58d2969572a92f80d6b9801bbaf0e75ce90 geoffrey jost <geoffrey@jostwebwerks.com> 1522787801 -0700	checkout: moving from master to develop
11aca58d2969572a92f80d6b9801bbaf0e75ce90 a63c92f7d15580c60616908dc4c2d94a5a66efc6 geoffrey jost <geoffrey@jostwebwerks.com> 1522787824 -0700	merge master: Merge made by the 'recursive' strategy.
a63c92f7d15580c60616908dc4c2d94a5a66efc6 a63c92f7d15580c60616908dc4c2d94a5a66efc6 geoffrey jost <geoffrey@jostwebwerks.com> 1522789054 -0700	checkout: moving from develop to ddrpub-static
a63c92f7d15580c60616908dc4c2d94a5a66efc6 546ec7706a6f5717ca797c8651d53c41b198f4ae geoffrey jost <geoffrey@jostwebwerks.com> 1523300677 -0700	commit: refactor: remove DDR.docstore,identifier from most detail,list code
546ec7706a6f5717ca797c8651d53c41b198f4ae f8f262d0e54ab0dae36df6c7cd9bc4ef034058e7 geoffrey jost <geoffrey@jostwebwerks.com> 1523300725 -0700	commit (amend): removed DDR.docstore,identifier from most detail,list views
f8f262d0e54ab0dae36df6c7cd9bc4ef034058e7 b4184dc3ada8e786d8840daef541e0573db8760b geoffrey jost <geoffrey@jostwebwerks.com> 1523300755 -0700	commit (amend): removed DDR.docstore,identifier from most detail,list views
b4184dc3ada8e786d8840daef541e0573db8760b 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1523465471 -0700	checkout: moving from ddrpub-static to master
34baf15cff65fdec2361a670b0e1bd16e1d61626 4ee9266c41ffe4f095d28765f69351cbcfd8c521 geoffrey jost <geoffrey@jostwebwerks.com> 1523465480 -0700	checkout: moving from master to ddrpublic-support
4ee9266c41ffe4f095d28765f69351cbcfd8c521 4ee9266c41ffe4f095d28765f69351cbcfd8c521 geoffrey jost <geoffrey@jostwebwerks.com> 1523466315 -0700	checkout: moving from ddrpublic-support to ddrpublic-support
4ee9266c41ffe4f095d28765f69351cbcfd8c521 9cc2db730eb202dfbb2f818bfe15a44afb796eef geoffrey jost <geoffrey@jostwebwerks.com> 1523466515 -0700	commit: reverse changes to repo_models import in commit cbcb3dc
9cc2db730eb202dfbb2f818bfe15a44afb796eef b3bf46f34ed7da59ca4aee0a38b88ca6c12f5265 geoffrey jost <geoffrey@jostwebwerks.com> 1523468212 -0700	commit: api: (re)added basename_orig to SEARCH_RETURN_FIELDS
b3bf46f34ed7da59ca4aee0a38b88ca6c12f5265 c7c2a75d40d5114cadc12325cb54aa9fe14f2a31 geoffrey jost <geoffrey@jostwebwerks.com> 1523468681 -0700	commit: api: listitem=False in format_list_items
c7c2a75d40d5114cadc12325cb54aa9fe14f2a31 b4184dc3ada8e786d8840daef541e0573db8760b geoffrey jost <geoffrey@jostwebwerks.com> 1523474082 -0700	checkout: moving from ddrpublic-support to ddrpub-static
b4184dc3ada8e786d8840daef541e0573db8760b 7abf4068bba09829afbfbfde74ce4f4338ced457 geoffrey jost <geoffrey@jostwebwerks.com> 1523478084 -0700	commit: api._object_children: better handling of models and sorting.
7abf4068bba09829afbfbfde74ce4f4338ced457 4b2028985e58d7c45294d36df01df9f4808f32e0 geoffrey jost <geoffrey@jostwebwerks.com> 1523478146 -0700	commit: api.children: select objects with parent_id of specified object
4b2028985e58d7c45294d36df01df9f4808f32e0 2bb654068ece2f3f73e71ad320630ca821df4b0c geoffrey jost <geoffrey@jostwebwerks.com> 1523478164 -0700	commit (amend): api.children: select objects with parent_id of specified object
2bb654068ece2f3f73e71ad320630ca821df4b0c 409e3c38d2780f91d787241407232058a8cf4364 geoffrey jost <geoffrey@jostwebwerks.com> 1523478250 -0700	commit: api.format_object_detail2: better handle optional fields, segments
409e3c38d2780f91d787241407232058a8cf4364 5033619b211455bc3a003ead8683483567913c77 geoffrey jost <geoffrey@jostwebwerks.com> 1523478294 -0700	commit (amend): api.format_object_detail2: better handle optional fields, segments
5033619b211455bc3a003ead8683483567913c77 df41f0bacd2be03ca7530ffd783a1bda98e5ea27 geoffrey jost <geoffrey@jostwebwerks.com> 1523478380 -0700	commit (amend): api.format_object_detail2: better handle optional fields, segments
df41f0bacd2be03ca7530ffd783a1bda98e5ea27 8683caeb3095cc5d027ec1b42dbf611fbc6b366c geoffrey jost <geoffrey@jostwebwerks.com> 1523480676 -0700	commit: api: object classes use common functions for .get,.children
8683caeb3095cc5d027ec1b42dbf611fbc6b366c 4a701547dd0d2676ccac74999f0b569e979a00de geoffrey jost <geoffrey@jostwebwerks.com> 1523480902 -0700	commit: templates: fixed segment breadcrumbs
4a701547dd0d2676ccac74999f0b569e979a00de b4184dc3ada8e786d8840daef541e0573db8760b geoffrey jost <geoffrey@jostwebwerks.com> 1523481001 -0700	rebase -i (start): checkout HEAD~6
b4184dc3ada8e786d8840daef541e0573db8760b 7e0c4ba209979f5cde9043bfc92fd074a35c291e geoffrey jost <geoffrey@jostwebwerks.com> 1523481001 -0700	rebase -i (pick): templates: fixed segment breadcrumbs
7e0c4ba209979f5cde9043bfc92fd074a35c291e 72bad066cfcc6d57686f94246b16b49e87ec0620 geoffrey jost <geoffrey@jostwebwerks.com> 1523481001 -0700	rebase -i (pick): api._object_children: better handling of models and sorting.
72bad066cfcc6d57686f94246b16b49e87ec0620 45b05467a11c9bb039bfec82167dc0d784ba052c geoffrey jost <geoffrey@jostwebwerks.com> 1523481001 -0700	rebase -i (pick): api.children: select objects with parent_id of specified object
45b05467a11c9bb039bfec82167dc0d784ba052c ecf75762a1cd711aa3834199f3060da8e7febbe7 geoffrey jost <geoffrey@jostwebwerks.com> 1523481001 -0700	rebase -i (pick): api.format_object_detail2: better handle optional fields, segments
ecf75762a1cd711aa3834199f3060da8e7febbe7 d5461e74f112f90c363525bc56a2359f7f238217 geoffrey jost <geoffrey@jostwebwerks.com> 1523481001 -0700	rebase -i (pick): api: object classes use common functions for .get,.children
d5461e74f112f90c363525bc56a2359f7f238217 d5461e74f112f90c363525bc56a2359f7f238217 geoffrey jost <geoffrey@jostwebwerks.com> 1523481001 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
d5461e74f112f90c363525bc56a2359f7f238217 b4184dc3ada8e786d8840daef541e0573db8760b geoffrey jost <geoffrey@jostwebwerks.com> 1523481007 -0700	rebase -i (start): checkout HEAD~6
b4184dc3ada8e786d8840daef541e0573db8760b 8877f1d41a834f118ad67d1bc4f6e677641f9f4f geoffrey jost <geoffrey@jostwebwerks.com> 1523481007 -0700	rebase -i (squash): removed DDR.docstore,identifier from most detail,list views
8877f1d41a834f118ad67d1bc4f6e677641f9f4f 2329637dfd30279b5daf2c0d57a02b8b04a079c8 geoffrey jost <geoffrey@jostwebwerks.com> 1523481011 -0700	rebase -i (pick): api._object_children: better handling of models and sorting.
2329637dfd30279b5daf2c0d57a02b8b04a079c8 7681ff6c8c8dff2a03a0de38795aab05d9d4a1ca geoffrey jost <geoffrey@jostwebwerks.com> 1523481011 -0700	rebase -i (pick): api.children: select objects with parent_id of specified object
7681ff6c8c8dff2a03a0de38795aab05d9d4a1ca 1fd6b2e312ea652dfb4a3f9a927a0131397f82c3 geoffrey jost <geoffrey@jostwebwerks.com> 1523481011 -0700	rebase -i (pick): api.format_object_detail2: better handle optional fields, segments
1fd6b2e312ea652dfb4a3f9a927a0131397f82c3 745db71f531b5a1907734c95c642015086a28259 geoffrey jost <geoffrey@jostwebwerks.com> 1523481011 -0700	rebase -i (pick): api: object classes use common functions for .get,.children
745db71f531b5a1907734c95c642015086a28259 745db71f531b5a1907734c95c642015086a28259 geoffrey jost <geoffrey@jostwebwerks.com> 1523481011 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
745db71f531b5a1907734c95c642015086a28259 5a35d07d857419f30a7d6bdec401e0b0cdaa3440 geoffrey jost <geoffrey@jostwebwerks.com> 1523481215 -0700	commit: api: added segment to CHILDREN list
5a35d07d857419f30a7d6bdec401e0b0cdaa3440 d0dfc2a9703f1594f82dc3e42ce7cd1ed57a174b geoffrey jost <geoffrey@jostwebwerks.com> 1523481246 -0700	commit: views: use proper object for getting segment parent
d0dfc2a9703f1594f82dc3e42ce7cd1ed57a174b 4e74847474e4f469599b3f573a9295d7ed523ddf geoffrey jost <geoffrey@jostwebwerks.com> 1523481329 -0700	commit: api,views: get entity segment transcritps w/o identifier
4e74847474e4f469599b3f573a9295d7ed523ddf b660907a1dc8281186735321803f92e8388b4f91 geoffrey jost <geoffrey@jostwebwerks.com> 1523481425 -0700	commit: models.cached_query: fixed doctype arg for Docstore().search
b660907a1dc8281186735321803f92e8388b4f91 c7c2a75d40d5114cadc12325cb54aa9fe14f2a31 geoffrey jost <geoffrey@jostwebwerks.com> 1523488326 -0700	checkout: moving from ddrpub-static to ddrpublic-support
c7c2a75d40d5114cadc12325cb54aa9fe14f2a31 ba4c06f664bbdb42bc0dc5403219e0677a7101b3 geoffrey jost <geoffrey@jostwebwerks.com> 1523488336 -0700	checkout: moving from ddrpublic-support to 65-hotfix-ui-narrgallery
ba4c06f664bbdb42bc0dc5403219e0677a7101b3 c7c2a75d40d5114cadc12325cb54aa9fe14f2a31 geoffrey jost <geoffrey@jostwebwerks.com> 1523488504 -0700	checkout: moving from 65-hotfix-ui-narrgallery to ddrpublic-support
c7c2a75d40d5114cadc12325cb54aa9fe14f2a31 504a9e0a39ff18deb651a3a7e0f8c37b642fee34 geoffrey jost <geoffrey@jostwebwerks.com> 1523488510 -0700	merge 65-hotfix-ui-narrgallery: Merge made by the 'recursive' strategy.
504a9e0a39ff18deb651a3a7e0f8c37b642fee34 f0f41e4135f8d283ee86fa08f5947f37dee83b66 geoffrey jost <geoffrey@jostwebwerks.com> 1523563427 -0700	commit: get Git commit info from local lib not from DDR
f0f41e4135f8d283ee86fa08f5947f37dee83b66 ac946eb8b1ac7352b1e534aa6f9a56d23112d93c geoffrey jost <geoffrey@jostwebwerks.com> 1523564871 -0700	commit: templates: object.identifier.breadcrumbs > object.breadcrumbs
ac946eb8b1ac7352b1e534aa6f9a56d23112d93c 5466429f33a045801d18f55db2705e8f7aa69d5d geoffrey jost <geoffrey@jostwebwerks.com> 1523564940 -0700	commit: templates: object.identifier.id > object.id
5466429f33a045801d18f55db2705e8f7aa69d5d c1a934bbcc6807c5dfb9e72ab8b185bd2a9b53de geoffrey jost <geoffrey@jostwebwerks.com> 1523565025 -0700	commit (amend): templates: object.identifier.id > object.id
c1a934bbcc6807c5dfb9e72ab8b185bd2a9b53de ac946eb8b1ac7352b1e534aa6f9a56d23112d93c geoffrey jost <geoffrey@jostwebwerks.com> 1523565079 -0700	reset: moving to HEAD~1
ac946eb8b1ac7352b1e534aa6f9a56d23112d93c f0f41e4135f8d283ee86fa08f5947f37dee83b66 geoffrey jost <geoffrey@jostwebwerks.com> 1523565087 -0700	reset: moving to HEAD~1
f0f41e4135f8d283ee86fa08f5947f37dee83b66 504a9e0a39ff18deb651a3a7e0f8c37b642fee34 geoffrey jost <geoffrey@jostwebwerks.com> 1523565093 -0700	reset: moving to HEAD~1
504a9e0a39ff18deb651a3a7e0f8c37b642fee34 b660907a1dc8281186735321803f92e8388b4f91 geoffrey jost <geoffrey@jostwebwerks.com> 1523565108 -0700	checkout: moving from ddrpublic-support to ddrpub-static
b660907a1dc8281186735321803f92e8388b4f91 39d4732b36163d4e8e623677a46a25441c3057a3 geoffrey jost <geoffrey@jostwebwerks.com> 1523571616 -0700	commit: get Git commit locally instead of from DDR.dvcs
39d4732b36163d4e8e623677a46a25441c3057a3 9aadc6925b771f556ac00425beb93362fdc5d5dc geoffrey jost <geoffrey@jostwebwerks.com> 1523571690 -0700	commit: settings: replace DDR.config.NoConfigError with Exception
9aadc6925b771f556ac00425beb93362fdc5d5dc b5c67370decf604b8bfb43be6b84b53a5d47565a geoffrey jost <geoffrey@jostwebwerks.com> 1523571732 -0700	commit: templates: object.identifier.breadcrumbs > object.breadcrumbs
b5c67370decf604b8bfb43be6b84b53a5d47565a f72b5266c7bf523a40b86346d55882e745383cf8 geoffrey jost <geoffrey@jostwebwerks.com> 1523571754 -0700	commit: templates: object.identifier.id > object.id
f72b5266c7bf523a40b86346d55882e745383cf8 813b857e74876fc7ea365222878977bae0f3c576 geoffrey jost <geoffrey@jostwebwerks.com> 1523571926 -0700	commit: forms: remove vocabs import from ddr-defs (hardcoded!)
813b857e74876fc7ea365222878977bae0f3c576 16a0dbd8e5ef6a9b827f301960785388db247b51 geoffrey jost <geoffrey@jostwebwerks.com> 1523572446 -0700	commit: views: remove remaining Identifier references
16a0dbd8e5ef6a9b827f301960785388db247b51 bf9860ca3ea44b090b385920a9b815d944b5f6d8 geoffrey jost <geoffrey@jostwebwerks.com> 1523573285 -0700	commit: api: cp MODEL_CLASSES from ddr-defs (hardcoded!)
bf9860ca3ea44b090b385920a9b815d944b5f6d8 16a0dbd8e5ef6a9b827f301960785388db247b51 geoffrey jost <geoffrey@jostwebwerks.com> 1523573478 -0700	reset: moving to HEAD~1
16a0dbd8e5ef6a9b827f301960785388db247b51 540bdd69d1b4a184660241d312fda2d619237b7a geoffrey jost <geoffrey@jostwebwerks.com> 1523573740 -0700	commit: templatetags: get MODELS_CLASSES from models
540bdd69d1b4a184660241d312fda2d619237b7a 78315f92e3b62421c90c962dc414c4a48b5ca6a3 geoffrey jost <geoffrey@jostwebwerks.com> 1523573759 -0700	commit (amend): templatetags: get MODELS_CLASSES from models
78315f92e3b62421c90c962dc414c4a48b5ca6a3 ae72f0812127131cd324104a5ff6448705dee154 geoffrey jost <geoffrey@jostwebwerks.com> 1523574860 -0700	commit: api: rm final identifier import
ae72f0812127131cd324104a5ff6448705dee154 ff0a18613f9212fa8e8b6ddedbfadee47ea1e179 geoffrey jost <geoffrey@jostwebwerks.com> 1523641228 -0700	commit: views: get organization, narrator w/o identifier
ff0a18613f9212fa8e8b6ddedbfadee47ea1e179 9a850ea9d7fa488e20d07bfa6856b4972b4457e9 geoffrey jost <geoffrey@jostwebwerks.com> 1523641774 -0700	commit: api.Narrator methods use similar code to rest of API
9a850ea9d7fa488e20d07bfa6856b4972b4457e9 7925e408a5b28ce83de2230775bda1ebc1029d38 geoffrey jost <geoffrey@jostwebwerks.com> 1523641835 -0700	commit: ui.models.massage_query_results: rm Identifier
7925e408a5b28ce83de2230775bda1ebc1029d38 5b55e20470df723b60403118efd131735c23502b geoffrey jost <geoffrey@jostwebwerks.com> 1523641878 -0700	commit: context_processors: leave out models.Organization
5b55e20470df723b60403118efd131735c23502b 9175485503b4dc24f4d0074ba9b6e0c47da2217c geoffrey jost <geoffrey@jostwebwerks.com> 1523648223 -0700	commit: narrator stuff
9175485503b4dc24f4d0074ba9b6e0c47da2217c 9a850ea9d7fa488e20d07bfa6856b4972b4457e9 geoffrey jost <geoffrey@jostwebwerks.com> 1523648247 -0700	rebase -i (start): checkout HEAD~5
9a850ea9d7fa488e20d07bfa6856b4972b4457e9 5702b0d8943a35bd5d8974739034958f8898bb58 geoffrey jost <geoffrey@jostwebwerks.com> 1523648247 -0700	rebase -i (pick): narrator stuff
5702b0d8943a35bd5d8974739034958f8898bb58 12a435f134028081e7e14b7703be8d18f9d0fde3 geoffrey jost <geoffrey@jostwebwerks.com> 1523648247 -0700	rebase -i (pick): ui.models.massage_query_results: rm Identifier
12a435f134028081e7e14b7703be8d18f9d0fde3 bb0a1508ea99eb25d1189fe6f60d177af532b7f1 geoffrey jost <geoffrey@jostwebwerks.com> 1523648247 -0700	rebase -i (pick): context_processors: leave out models.Organization
bb0a1508ea99eb25d1189fe6f60d177af532b7f1 bb0a1508ea99eb25d1189fe6f60d177af532b7f1 geoffrey jost <geoffrey@jostwebwerks.com> 1523648247 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
bb0a1508ea99eb25d1189fe6f60d177af532b7f1 9a850ea9d7fa488e20d07bfa6856b4972b4457e9 geoffrey jost <geoffrey@jostwebwerks.com> 1523648252 -0700	rebase -i (start): checkout HEAD~5
9a850ea9d7fa488e20d07bfa6856b4972b4457e9 59bcf01f0ee267b0cd117422019029e004488166 geoffrey jost <geoffrey@jostwebwerks.com> 1523648252 -0700	rebase -i (squash): api.Narrator methods use similar code to rest of API
59bcf01f0ee267b0cd117422019029e004488166 04e100a7d60155ea4fd3840975efc7eff6fa06ea geoffrey jost <geoffrey@jostwebwerks.com> 1523648255 -0700	rebase -i (pick): ui.models.massage_query_results: rm Identifier
04e100a7d60155ea4fd3840975efc7eff6fa06ea 011d9a70ade7d529d84bb09b2e6ee0b32f700501 geoffrey jost <geoffrey@jostwebwerks.com> 1523648255 -0700	rebase -i (pick): context_processors: leave out models.Organization
011d9a70ade7d529d84bb09b2e6ee0b32f700501 011d9a70ade7d529d84bb09b2e6ee0b32f700501 geoffrey jost <geoffrey@jostwebwerks.com> 1523648255 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
011d9a70ade7d529d84bb09b2e6ee0b32f700501 ff0a18613f9212fa8e8b6ddedbfadee47ea1e179 geoffrey jost <geoffrey@jostwebwerks.com> 1523648333 -0700	rebase -i (start): checkout HEAD~5
ff0a18613f9212fa8e8b6ddedbfadee47ea1e179 fd3d9a0090e28d6e2b2aba0ce3743098af6b0282 geoffrey jost <geoffrey@jostwebwerks.com> 1523648334 -0700	rebase -i (pick): ui.models.massage_query_results: rm Identifier
fd3d9a0090e28d6e2b2aba0ce3743098af6b0282 f8fa388aeccabf03ed115e56da79e4491ff21e84 geoffrey jost <geoffrey@jostwebwerks.com> 1523648334 -0700	rebase -i (pick): context_processors: leave out models.Organization
f8fa388aeccabf03ed115e56da79e4491ff21e84 4bb1375eae52092b85cffc844e69ea679fc5e9f3 geoffrey jost <geoffrey@jostwebwerks.com> 1523648334 -0700	rebase -i (pick): api.Narrator methods use similar code to rest of API
4bb1375eae52092b85cffc844e69ea679fc5e9f3 4bb1375eae52092b85cffc844e69ea679fc5e9f3 geoffrey jost <geoffrey@jostwebwerks.com> 1523648334 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
4bb1375eae52092b85cffc844e69ea679fc5e9f3 f8fa388aeccabf03ed115e56da79e4491ff21e84 geoffrey jost <geoffrey@jostwebwerks.com> 1523648347 -0700	reset: moving to HEAD~1
f8fa388aeccabf03ed115e56da79e4491ff21e84 f6fef4b6a893fb02900f4fe05bc8da641ff114f7 geoffrey jost <geoffrey@jostwebwerks.com> 1523648781 -0700	commit: api: refactor narrators code like rest of api; interviews api view
f6fef4b6a893fb02900f4fe05bc8da641ff114f7 ece82d7b0a48a10d55e8de87cf984d48cd2c9223 geoffrey jost <geoffrey@jostwebwerks.com> 1523904499 -0700	commit: api: Narrators.interviews only gets entities (not segments)
ece82d7b0a48a10d55e8de87cf984d48cd2c9223 a88b3ae34820835b1a5d485539ee530d72f6209f geoffrey jost <geoffrey@jostwebwerks.com> 1523907854 -0700	commit: docstore: added .count method
a88b3ae34820835b1a5d485539ee530d72f6209f cbaad55629364c2e259b87ad5bb6031d4f942324 geoffrey jost <geoffrey@jostwebwerks.com> 1523907927 -0700	commit: api: add segment counts for Narrators.interviews
cbaad55629364c2e259b87ad5bb6031d4f942324 742bc731c09f66e5ae649a175347bf3627941353 geoffrey jost <geoffrey@jostwebwerks.com> 1523907952 -0700	commit: api: include creation,location fields in Narrator.interviews
742bc731c09f66e5ae649a175347bf3627941353 3f61a36f8381460f1b03efbe9db0faa26bf579bb geoffrey jost <geoffrey@jostwebwerks.com> 1523907998 -0700	commit: urls: ui-api-narrator-interviews view
3f61a36f8381460f1b03efbe9db0faa26bf579bb 742bc731c09f66e5ae649a175347bf3627941353 geoffrey jost <geoffrey@jostwebwerks.com> 1523908412 -0700	rebase -i (start): checkout HEAD~5
742bc731c09f66e5ae649a175347bf3627941353 ab43d78f09e05bd942ccd9960a3acde32c98c8b9 geoffrey jost <geoffrey@jostwebwerks.com> 1523908412 -0700	rebase -i (squash): api: restore narrator interviews fields and segment counts
ab43d78f09e05bd942ccd9960a3acde32c98c8b9 ab43d78f09e05bd942ccd9960a3acde32c98c8b9 geoffrey jost <geoffrey@jostwebwerks.com> 1523908447 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
ab43d78f09e05bd942ccd9960a3acde32c98c8b9 cbaad55629364c2e259b87ad5bb6031d4f942324 geoffrey jost <geoffrey@jostwebwerks.com> 1523908456 -0700	rebase -i (start): checkout HEAD~5
cbaad55629364c2e259b87ad5bb6031d4f942324 f45eaffd4895576513aab5e569b174d4dfb07aed geoffrey jost <geoffrey@jostwebwerks.com> 1523908456 -0700	rebase -i (squash): api: restore narrator interviews fields and segment counts
f45eaffd4895576513aab5e569b174d4dfb07aed f45eaffd4895576513aab5e569b174d4dfb07aed geoffrey jost <geoffrey@jostwebwerks.com> 1523908461 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
f45eaffd4895576513aab5e569b174d4dfb07aed f6fef4b6a893fb02900f4fe05bc8da641ff114f7 geoffrey jost <geoffrey@jostwebwerks.com> 1523908474 -0700	rebase -i (start): checkout HEAD~5
f6fef4b6a893fb02900f4fe05bc8da641ff114f7 f8e87f86c4af55d69aacaedea09b3d16ac8a93c0 geoffrey jost <geoffrey@jostwebwerks.com> 1523908474 -0700	rebase -i (pick): docstore: added .count method
f8e87f86c4af55d69aacaedea09b3d16ac8a93c0 0c91a0da9af92955e94f4e6a12365ac6e7d29b54 geoffrey jost <geoffrey@jostwebwerks.com> 1523908474 -0700	rebase -i (pick): api: Narrators.interviews only gets entities (not segments)
0c91a0da9af92955e94f4e6a12365ac6e7d29b54 5b5924f225f6908704a9ef5feb54e46d5a41d980 geoffrey jost <geoffrey@jostwebwerks.com> 1523908474 -0700	rebase -i (pick): api: restore narrator interviews fields and segment counts
5b5924f225f6908704a9ef5feb54e46d5a41d980 5b5924f225f6908704a9ef5feb54e46d5a41d980 geoffrey jost <geoffrey@jostwebwerks.com> 1523908474 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
5b5924f225f6908704a9ef5feb54e46d5a41d980 0c91a0da9af92955e94f4e6a12365ac6e7d29b54 geoffrey jost <geoffrey@jostwebwerks.com> 1523908483 -0700	rebase -i (start): checkout HEAD~5
0c91a0da9af92955e94f4e6a12365ac6e7d29b54 e999582b01a95c8bc94f90a62f94af6e68647eac geoffrey jost <geoffrey@jostwebwerks.com> 1523908483 -0700	rebase -i (squash): api: restore narrator interviews fields and segment counts
e999582b01a95c8bc94f90a62f94af6e68647eac e999582b01a95c8bc94f90a62f94af6e68647eac geoffrey jost <geoffrey@jostwebwerks.com> 1523908490 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
e999582b01a95c8bc94f90a62f94af6e68647eac 8b9cec91a7cf0d5c7ea2db0e3762d4fa35abc685 geoffrey jost <geoffrey@jostwebwerks.com> 1523908702 -0700	commit: api: rm old format_object_detail
8b9cec91a7cf0d5c7ea2db0e3762d4fa35abc685 1111c0b2d3207559f0bd0fd6e937025fb64b399c geoffrey jost <geoffrey@jostwebwerks.com> 1523925273 -0700	commit: api: format_facet,format_term
1111c0b2d3207559f0bd0fd6e937025fb64b399c ed1d3df83945fc741f46e845f325e561c08957bf geoffrey jost <geoffrey@jostwebwerks.com> 1523925292 -0700	commit (amend): api: update format_facet,format_term
ed1d3df83945fc741f46e845f325e561c08957bf c3d6375e42be66001685416afa7c526080c88138 geoffrey jost <geoffrey@jostwebwerks.com> 1523925390 -0700	commit: api: refactor facets code like rest of api
c3d6375e42be66001685416afa7c526080c88138 301722ded90726ae74a2b2ab6be04b0e9748813b geoffrey jost <geoffrey@jostwebwerks.com> 1523925408 -0700	commit (amend): api: refactor facets code like rest of api
301722ded90726ae74a2b2ab6be04b0e9748813b fcd23eb84c46452e12af075dd41da85417f603ab geoffrey jost <geoffrey@jostwebwerks.com> 1523986262 -0700	commit: urls: added ui-api-term-objects
fcd23eb84c46452e12af075dd41da85417f603ab 8b9cec91a7cf0d5c7ea2db0e3762d4fa35abc685 geoffrey jost <geoffrey@jostwebwerks.com> 1523988274 -0700	checkout: moving from ddrpub-static to 8b9cec9
8b9cec91a7cf0d5c7ea2db0e3762d4fa35abc685 fcd23eb84c46452e12af075dd41da85417f603ab geoffrey jost <geoffrey@jostwebwerks.com> 1523988310 -0700	checkout: moving from 8b9cec91a7cf0d5c7ea2db0e3762d4fa35abc685 to ddrpub-static
fcd23eb84c46452e12af075dd41da85417f603ab 3417c95fe091232ae08a683f3f63c8ffd2f02f73 geoffrey jost <geoffrey@jostwebwerks.com> 1523989652 -0700	commit: models: replaced MODEL_CLASSES with MODEL_PLURALS
3417c95fe091232ae08a683f3f63c8ffd2f02f73 3c6a1bff231e20d8652377e2c95c07c3b9eaa080 geoffrey jost <geoffrey@jostwebwerks.com> 1523989805 -0700	commit: models: removed old models code
3c6a1bff231e20d8652377e2c95c07c3b9eaa080 062dbcc8cfe7e7c9a6b6a6bd44d514e8f0e93622 geoffrey jost <geoffrey@jostwebwerks.com> 1523989985 -0700	commit: docstore: moved minor support functions from models
062dbcc8cfe7e7c9a6b6a6bd44d514e8f0e93622 f777a175de7a332dace4bfea69e127b897fdc34f geoffrey jost <geoffrey@jostwebwerks.com> 1523990024 -0700	commit: identifier: removed identifier module
f777a175de7a332dace4bfea69e127b897fdc34f ce0263cd438dcc4a0425eb147f259c220bde7121 geoffrey jost <geoffrey@jostwebwerks.com> 1523991022 -0700	commit: api,docstore: moved functions to docstore
ce0263cd438dcc4a0425eb147f259c220bde7121 cbd06aa3249c780343e731e280232bdc2a21f928 geoffrey jost <geoffrey@jostwebwerks.com> 1524081926 -0700	commit: move models code from api to models
cbd06aa3249c780343e731e280232bdc2a21f928 c689bc0eaf03f3579fbb42e24cc63200004bceb8 geoffrey jost <geoffrey@jostwebwerks.com> 1524082154 -0700	commit: api: removed unused code
c689bc0eaf03f3579fbb42e24cc63200004bceb8 f777a175de7a332dace4bfea69e127b897fdc34f geoffrey jost <geoffrey@jostwebwerks.com> 1524084468 -0700	rebase -i (start): checkout HEAD~3
f777a175de7a332dace4bfea69e127b897fdc34f c689bc0eaf03f3579fbb42e24cc63200004bceb8 geoffrey jost <geoffrey@jostwebwerks.com> 1524084477 -0700	rebase: aborting
c689bc0eaf03f3579fbb42e24cc63200004bceb8 ce0263cd438dcc4a0425eb147f259c220bde7121 geoffrey jost <geoffrey@jostwebwerks.com> 1524084484 -0700	rebase -i (start): checkout HEAD~3
ce0263cd438dcc4a0425eb147f259c220bde7121 c689bc0eaf03f3579fbb42e24cc63200004bceb8 geoffrey jost <geoffrey@jostwebwerks.com> 1524084486 -0700	rebase: aborting
c689bc0eaf03f3579fbb42e24cc63200004bceb8 4c96e43097557571fb23996bc2f7b83729f6be97 geoffrey jost <geoffrey@jostwebwerks.com> 1524088283 -0700	commit: update api.* references to models.*
4c96e43097557571fb23996bc2f7b83729f6be97 2b7d50185c09bf412a216ead520eb8a9b67f9d87 geoffrey jost <geoffrey@jostwebwerks.com> 1524093632 -0700	commit (amend): update api.* references to models.*
2b7d50185c09bf412a216ead520eb8a9b67f9d87 ad51d90217694af7745f2ca8124e9554e3eae2e0 geoffrey jost <geoffrey@jostwebwerks.com> 1524093673 -0700	commit: forms,models: move search form choices to models
ad51d90217694af7745f2ca8124e9554e3eae2e0 936aaa66f656d259155e0bf01cba573fe900a292 geoffrey jost <geoffrey@jostwebwerks.com> 1524093722 -0700	commit (amend): forms,models: move search form choices to models
936aaa66f656d259155e0bf01cba573fe900a292 1c27586356f0af781e1a19df579ad1f741abb738 geoffrey jost <geoffrey@jostwebwerks.com> 1524093952 -0700	commit: views.entities: fix segment object oid reference
1c27586356f0af781e1a19df579ad1f741abb738 0ef40f3e20f7171e2b6630f18d3b35631dc82a7b geoffrey jost <geoffrey@jostwebwerks.com> 1524094631 -0700	commit: remove unused imports
0ef40f3e20f7171e2b6630f18d3b35631dc82a7b 71514af613e4a1b958d148c579f94e41dbd015b0 geoffrey jost <geoffrey@jostwebwerks.com> 1524172899 -0700	commit: api: move facet,terms views around
71514af613e4a1b958d148c579f94e41dbd015b0 b0db544308c4af25f3d6efb4cf413a26ccdceef1 geoffrey jost <geoffrey@jostwebwerks.com> 1524172971 -0700	commit: facets,terms: fixed various issues
b0db544308c4af25f3d6efb4cf413a26ccdceef1 6e22a750b8af6ff629b2fec10c4722d3aa253464 geoffrey jost <geoffrey@jostwebwerks.com> 1524180654 -0700	commit: models.format_term: better variable naming
6e22a750b8af6ff629b2fec10c4722d3aa253464 6070d4cae1017f22cff143b38e092b3853d9220e geoffrey jost <geoffrey@jostwebwerks.com> 1524180785 -0700	commit: models: term ancestors may not always be present
6070d4cae1017f22cff143b38e092b3853d9220e f8070be298a58d239dfdd145fa77791f94899329 geoffrey jost <geoffrey@jostwebwerks.com> 1524181598 -0700	commit: models: adapted topics tree to refactored Facet model
f8070be298a58d239dfdd145fa77791f94899329 930f97f44bcbb8816dec62f14a07b14659d2d63e geoffrey jost <geoffrey@jostwebwerks.com> 1524517149 -0700	commit: models: fixed facet term objects
930f97f44bcbb8816dec62f14a07b14659d2d63e 2d6d170dff51960251f4a66ccff0d6fa80187e78 geoffrey jost <geoffrey@jostwebwerks.com> 1524517179 -0700	commit: templates: fixed entity topics,facility links
2d6d170dff51960251f4a66ccff0d6fa80187e78 2daac28e90db631efaf95cce90571a0a7d683a1e geoffrey jost <geoffrey@jostwebwerks.com> 1524777919 -0700	commit: added search module from ddr-local
2daac28e90db631efaf95cce90571a0a7d683a1e 5db72e577e141de7df9ac0ac3245109c847df2be geoffrey jost <geoffrey@jostwebwerks.com> 1524782970 -0700	commit: models: updated topics,facility term aggregations code
5db72e577e141de7df9ac0ac3245109c847df2be 03acf5b017a758f237c36087f2d4b2641dc3620f geoffrey jost <geoffrey@jostwebwerks.com> 1524783349 -0700	commit (amend): models: updated topics,facility term aggregations code
03acf5b017a758f237c36087f2d4b2641dc3620f 708b4e57558bc06054036b0f8a7fe61ee9931026 geoffrey jost <geoffrey@jostwebwerks.com> 1524783675 -0700	commit: models: term_aggregations refer to aggs term_id instead of 'id'
708b4e57558bc06054036b0f8a7fe61ee9931026 2d6d170dff51960251f4a66ccff0d6fa80187e78 geoffrey jost <geoffrey@jostwebwerks.com> 1524783793 -0700	rebase -i (start): checkout HEAD~5
2d6d170dff51960251f4a66ccff0d6fa80187e78 51c6877839f183994f52afe89b1b95a902b3aee0 geoffrey jost <geoffrey@jostwebwerks.com> 1524783793 -0700	rebase -i (pick): models: term_aggregations refer to aggs term_id instead of 'id'
51c6877839f183994f52afe89b1b95a902b3aee0 5be6c1c6714742677ab6275d4b8fecbaf24663df geoffrey jost <geoffrey@jostwebwerks.com> 1524783793 -0700	rebase -i (pick): added search module from ddr-local
5be6c1c6714742677ab6275d4b8fecbaf24663df f2d215b0987e6789b1fd76d648a759c609be5de9 geoffrey jost <geoffrey@jostwebwerks.com> 1524783793 -0700	rebase -i (pick): models: updated topics,facility term aggregations code
f2d215b0987e6789b1fd76d648a759c609be5de9 f2d215b0987e6789b1fd76d648a759c609be5de9 geoffrey jost <geoffrey@jostwebwerks.com> 1524783793 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
f2d215b0987e6789b1fd76d648a759c609be5de9 2d35a36c3cdccd798ec263b3db7774827d9f9d19 geoffrey jost <geoffrey@jostwebwerks.com> 1524785089 -0700	commit (amend): models: updated topics,facility term aggregations code
2d35a36c3cdccd798ec263b3db7774827d9f9d19 0fb82766f975c2ef8f06ab36a2292156b08727d0 geoffrey jost <geoffrey@jostwebwerks.com> 1524785175 -0700	commit (amend): models: updated topics,facility term aggregations code
0fb82766f975c2ef8f06ab36a2292156b08727d0 04a10deeeed8d5525304b2c28f398ba78e85cd14 geoffrey jost <geoffrey@jostwebwerks.com> 1524785761 -0700	commit (amend): models: updated topics,facility term aggregations code
04a10deeeed8d5525304b2c28f398ba78e85cd14 89633e18c1d2852755dce4ab959a8f46dea1de19 geoffrey jost <geoffrey@jostwebwerks.com> 1524785962 -0700	commit (amend): models: updated topics,facility term aggregations code
89633e18c1d2852755dce4ab959a8f46dea1de19 23f4d52b2d0bb56bf6f2464f1cf1147eef628303 geoffrey jost <geoffrey@jostwebwerks.com> 1524859941 -0700	commit: models: switched object.children to use Searcher,SearchResults
23f4d52b2d0bb56bf6f2464f1cf1147eef628303 7f8a73a46696fb1bac291b5256703a3179b297ac geoffrey jost <geoffrey@jostwebwerks.com> 1525213322 -0700	commit: more
7f8a73a46696fb1bac291b5256703a3179b297ac 23f4d52b2d0bb56bf6f2464f1cf1147eef628303 geoffrey jost <geoffrey@jostwebwerks.com> 1525213343 -0700	rebase -i (start): checkout HEAD~3
23f4d52b2d0bb56bf6f2464f1cf1147eef628303 2673628120729b03a2eb88fa5b782460aeb3dd10 geoffrey jost <geoffrey@jostwebwerks.com> 1525213343 -0700	rebase -i (squash): models: switched object.children to use Searcher,SearchResults
2673628120729b03a2eb88fa5b782460aeb3dd10 2673628120729b03a2eb88fa5b782460aeb3dd10 geoffrey jost <geoffrey@jostwebwerks.com> 1525213354 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
2673628120729b03a2eb88fa5b782460aeb3dd10 73fcfec080d3f6321f8d81926e9c85f7e970df83 geoffrey jost <geoffrey@jostwebwerks.com> 1525213838 -0700	commit: models: modded object.get to return elasticsearch_dsl Result
73fcfec080d3f6321f8d81926e9c85f7e970df83 8bdbcca6ac98ff838550241a2776e7d0b5d0901f geoffrey jost <geoffrey@jostwebwerks.com> 1525215004 -0700	commit: blat
8bdbcca6ac98ff838550241a2776e7d0b5d0901f 2673628120729b03a2eb88fa5b782460aeb3dd10 geoffrey jost <geoffrey@jostwebwerks.com> 1525215022 -0700	rebase -i (start): checkout HEAD~3
2673628120729b03a2eb88fa5b782460aeb3dd10 d0fae3d9007b892c1447cf460705920f9a34b143 geoffrey jost <geoffrey@jostwebwerks.com> 1525215022 -0700	rebase -i (pick): blat
d0fae3d9007b892c1447cf460705920f9a34b143 b619b6bf8b13dff36a4c8bb32d48fa48bbf7b418 geoffrey jost <geoffrey@jostwebwerks.com> 1525215022 -0700	rebase -i (pick): models: modded object.get to return elasticsearch_dsl Result
b619b6bf8b13dff36a4c8bb32d48fa48bbf7b418 b619b6bf8b13dff36a4c8bb32d48fa48bbf7b418 geoffrey jost <geoffrey@jostwebwerks.com> 1525215022 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
b619b6bf8b13dff36a4c8bb32d48fa48bbf7b418 2673628120729b03a2eb88fa5b782460aeb3dd10 geoffrey jost <geoffrey@jostwebwerks.com> 1525215050 -0700	rebase -i (start): checkout HEAD~3
2673628120729b03a2eb88fa5b782460aeb3dd10 ddfcc3da2b74d8ef74fcc8fec39a6e7664193800 geoffrey jost <geoffrey@jostwebwerks.com> 1525215050 -0700	rebase -i (squash): models: switched object.children to use Searcher,SearchResults
ddfcc3da2b74d8ef74fcc8fec39a6e7664193800 6cafda045fd5c8ddf8ef21731cf297626c6c6b5f geoffrey jost <geoffrey@jostwebwerks.com> 1525215054 -0700	rebase -i (pick): models: modded object.get to return elasticsearch_dsl Result
6cafda045fd5c8ddf8ef21731cf297626c6c6b5f 6cafda045fd5c8ddf8ef21731cf297626c6c6b5f geoffrey jost <geoffrey@jostwebwerks.com> 1525215055 -0700	rebase -i (finish): returning to refs/heads/ddrpub-static
6cafda045fd5c8ddf8ef21731cf297626c6c6b5f 89633e18c1d2852755dce4ab959a8f46dea1de19 geoffrey jost <geoffrey@jostwebwerks.com> 1525293992 -0700	reset: moving to HEAD~2
89633e18c1d2852755dce4ab959a8f46dea1de19 6cafda045fd5c8ddf8ef21731cf297626c6c6b5f geoffrey jost <geoffrey@jostwebwerks.com> 1525293999 -0700	checkout: moving from ddrpub-static to ddrpub-static-searchresults
6cafda045fd5c8ddf8ef21731cf297626c6c6b5f 89633e18c1d2852755dce4ab959a8f46dea1de19 geoffrey jost <geoffrey@jostwebwerks.com> 1525294017 -0700	checkout: moving from ddrpub-static-searchresults to ddrpub-static
89633e18c1d2852755dce4ab959a8f46dea1de19 384092d05d8551f798c5a8eb77fd8a4aefd96a7f geoffrey jost <geoffrey@jostwebwerks.com> 1525297015 -0700	commit: forms: disable topics,facility choices (causes import loop)
384092d05d8551f798c5a8eb77fd8a4aefd96a7f 3bb02208837b2631f0aa83751b1dcd94e562a46d geoffrey jost <geoffrey@jostwebwerks.com> 1525332371 -0700	commit: models: don't replace object.links.img with logo.png
3bb02208837b2631f0aa83751b1dcd94e562a46d bc0cb40f5941198790ccd380b81b53e0128b8653 geoffrey jost <geoffrey@jostwebwerks.com> 1525333279 -0700	commit: templates: breadcrumbs display entire collection ID
bc0cb40f5941198790ccd380b81b53e0128b8653 c0e622056146f398cf4c7ddca1837a98523d1a88 geoffrey jost <geoffrey@jostwebwerks.com> 1525338499 -0700	commit: views: use Entity.children to get child entities
c0e622056146f398cf4c7ddca1837a98523d1a88 65f7d06a94f8870619bdec0cd39b96d55abce190 geoffrey jost <geoffrey@jostwebwerks.com> 1525464236 -0700	commit: search: properly get query params from rest_framework Request
65f7d06a94f8870619bdec0cd39b96d55abce190 03a51b9c074ad6b6352f1b96132c523bc2c6e7ce geoffrey jost <geoffrey@jostwebwerks.com> 1525464371 -0700	commit: api: replace old search code with search.Searcher,.SearchResults
03a51b9c074ad6b6352f1b96132c523bc2c6e7ce 6cafda045fd5c8ddf8ef21731cf297626c6c6b5f geoffrey jost <geoffrey@jostwebwerks.com> 1525474779 -0700	checkout: moving from ddrpub-static to ddrpub-static-searchresults
6cafda045fd5c8ddf8ef21731cf297626c6c6b5f 03a51b9c074ad6b6352f1b96132c523bc2c6e7ce geoffrey jost <geoffrey@jostwebwerks.com> 1525474807 -0700	checkout: moving from ddrpub-static-searchresults to ddrpub-static
03a51b9c074ad6b6352f1b96132c523bc2c6e7ce 6cafda045fd5c8ddf8ef21731cf297626c6c6b5f geoffrey jost <geoffrey@jostwebwerks.com> 1525474971 -0700	checkout: moving from ddrpub-static to ddrpub-static-searchresults
6cafda045fd5c8ddf8ef21731cf297626c6c6b5f 03a51b9c074ad6b6352f1b96132c523bc2c6e7ce geoffrey jost <geoffrey@jostwebwerks.com> 1525476162 -0700	checkout: moving from ddrpub-static-searchresults to ddrpub-static
03a51b9c074ad6b6352f1b96132c523bc2c6e7ce 6cafda045fd5c8ddf8ef21731cf297626c6c6b5f geoffrey jost <geoffrey@jostwebwerks.com> 1525476301 -0700	checkout: moving from ddrpub-static to ddrpub-static-searchresults
6cafda045fd5c8ddf8ef21731cf297626c6c6b5f 03a51b9c074ad6b6352f1b96132c523bc2c6e7ce geoffrey jost <geoffrey@jostwebwerks.com> 1525476327 -0700	checkout: moving from ddrpub-static-searchresults to ddrpub-static
03a51b9c074ad6b6352f1b96132c523bc2c6e7ce 6cafda045fd5c8ddf8ef21731cf297626c6c6b5f geoffrey jost <geoffrey@jostwebwerks.com> 1525476373 -0700	checkout: moving from ddrpub-static to ddrpub-static-searchresults
6cafda045fd5c8ddf8ef21731cf297626c6c6b5f 03a51b9c074ad6b6352f1b96132c523bc2c6e7ce geoffrey jost <geoffrey@jostwebwerks.com> 1525476380 -0700	checkout: moving from ddrpub-static-searchresults to ddrpub-static
03a51b9c074ad6b6352f1b96132c523bc2c6e7ce 7b0ae194f4dbede77292a625fdb5f211224c4664 geoffrey jost <geoffrey@jostwebwerks.com> 1525818893 -0700	commit: mv MODULE/__init__.py functions to ui/misc.py
7b0ae194f4dbede77292a625fdb5f211224c4664 81558212a1059d3d92c1d945de4c3d988b0bb663 geoffrey jost <geoffrey@jostwebwerks.com> 1525982775 -0700	commit: docstore: ES cluster health and index_exists functions
81558212a1059d3d92c1d945de4c3d988b0bb663 d82a844c74eca4482151ae19186aa28efd97ce84 geoffrey jost <geoffrey@jostwebwerks.com> 1525982962 -0700	commit: search: make Searcher,SearchResults work w rest_framework Requests
d82a844c74eca4482151ae19186aa28efd97ce84 119e0cf6419e0cbfb156e379fcf271c07871d2e4 geoffrey jost <geoffrey@jostwebwerks.com> 1525982998 -0700	commit (amend): search: make Searcher,SearchResults also work w Requests
119e0cf6419e0cbfb156e379fcf271c07871d2e4 50182e70e0d41df7f6a7c0368c1d6d68eed13a54 geoffrey jost <geoffrey@jostwebwerks.com> 1525985367 -0700	commit: search view and form from ddr-local
50182e70e0d41df7f6a7c0368c1d6d68eed13a54 0286531dd58b9734428097b5c6751089bacf8a4c geoffrey jost <geoffrey@jostwebwerks.com> 1526000332 -0700	commit: templates: update search form filter field names
0286531dd58b9734428097b5c6751089bacf8a4c 8b2af9a1aa8cb5db3fc3552fafc25d455e9e31b2 geoffrey jost <geoffrey@jostwebwerks.com> 1526000824 -0700	commit: forms_search: aggregations labels and stuff
8b2af9a1aa8cb5db3fc3552fafc25d455e9e31b2 4c0ca25444cde081a83503b5d3fb0458d431ecf5 geoffrey jost <geoffrey@jostwebwerks.com> 1526001012 -0700	commit: search: add aggregations for simple/non-nested filter fields too
4c0ca25444cde081a83503b5d3fb0458d431ecf5 b486fc7874160a24296a554c8c6b8ed93b0a5d73 geoffrey jost <geoffrey@jostwebwerks.com> 1526001197 -0700	commit: views.searching: adapt from ddr-local
b486fc7874160a24296a554c8c6b8ed93b0a5d73 065c1c97c582682580e6900ffcd0a434193e097d geoffrey jost <geoffrey@jostwebwerks.com> 1526001271 -0700	commit: search: only get aggregations for the fields we want
065c1c97c582682580e6900ffcd0a434193e097d a6be342bc3d16e08edf65cb6177bec0d8cb20f8b geoffrey jost <geoffrey@jostwebwerks.com> 1526001424 -0700	commit: templatetags: gallery,list tags don't crash on off-by-one lists
a6be342bc3d16e08edf65cb6177bec0d8cb20f8b 87b41d0781197c5fb9d8e2af94f379ca6f3c95ef geoffrey jost <geoffrey@jostwebwerks.com> 1526001880 -0700	commit: urls: use new search view based on Searcher,SearchResults
87b41d0781197c5fb9d8e2af94f379ca6f3c95ef 4d002c7bc9d71ebe1cb3287fac4c6968a618d9ea geoffrey jost <geoffrey@jostwebwerks.com> 1526001939 -0700	commit: Makefile: remove ddr-cmdln, ddr-defs, ddr-manual
4d002c7bc9d71ebe1cb3287fac4c6968a618d9ea 167745beaf93bd4dc2a8a72431f80b316360f8ce geoffrey jost <geoffrey@jostwebwerks.com> 1526071420 -0700	commit: search: use denormalized 'topics_id','facility_id' for search
167745beaf93bd4dc2a8a72431f80b316360f8ce 7a9d466c90fca234cf5da32798c79e80bcf8982e geoffrey jost <geoffrey@jostwebwerks.com> 1526071502 -0700	commit: search: simple filter fields want to use 'term' instead of 'terms'
7a9d466c90fca234cf5da32798c79e80bcf8982e bfd24633437ade5f9ebceb92b5982594e1cc1db7 geoffrey jost <geoffrey@jostwebwerks.com> 1526323924 -0700	commit: views: honor page/offset param when displaying object children
bfd24633437ade5f9ebceb92b5982594e1cc1db7 bf0c3ae916e53a071de1e7d13386f722ceedc4c8 geoffrey jost <geoffrey@jostwebwerks.com> 1526326497 -0700	commit: views: exclude files from interview segments list
bf0c3ae916e53a071de1e7d13386f722ceedc4c8 e314e1a911014b9d7b9af992531e81ebe9e50251 geoffrey jost <geoffrey@jostwebwerks.com> 1526344108 -0700	commit: models: full-size download link for files
e314e1a911014b9d7b9af992531e81ebe9e50251 0281048818de83e3fa2f3c17ad9538f90d74be85 geoffrey jost <geoffrey@jostwebwerks.com> 1526502875 -0700	commit: templatetags: use default license tag if code is blank
0281048818de83e3fa2f3c17ad9538f90d74be85 abf701d6382dfac3df4e8921a6523c177e1c29bf geoffrey jost <geoffrey@jostwebwerks.com> 1526503927 -0700	commit (amend): templatetags: use defaults if template name inputs are blank
abf701d6382dfac3df4e8921a6523c177e1c29bf 504a9e0a39ff18deb651a3a7e0f8c37b642fee34 geoffrey jost <geoffrey@jostwebwerks.com> 1526664639 -0700	checkout: moving from ddrpub-static to ddrpublic-support
504a9e0a39ff18deb651a3a7e0f8c37b642fee34 a63c92f7d15580c60616908dc4c2d94a5a66efc6 geoffrey jost <geoffrey@jostwebwerks.com> 1527029238 -0700	checkout: moving from ddrpublic-support to develop
a63c92f7d15580c60616908dc4c2d94a5a66efc6 abf701d6382dfac3df4e8921a6523c177e1c29bf geoffrey jost <geoffrey@jostwebwerks.com> 1527029251 -0700	checkout: moving from develop to ddrpub-static
abf701d6382dfac3df4e8921a6523c177e1c29bf a63c92f7d15580c60616908dc4c2d94a5a66efc6 geoffrey jost <geoffrey@jostwebwerks.com> 1527029263 -0700	checkout: moving from ddrpub-static to develop
a63c92f7d15580c60616908dc4c2d94a5a66efc6 abf701d6382dfac3df4e8921a6523c177e1c29bf geoffrey jost <geoffrey@jostwebwerks.com> 1527029278 -0700	checkout: moving from develop to ddrpub-static
abf701d6382dfac3df4e8921a6523c177e1c29bf a63c92f7d15580c60616908dc4c2d94a5a66efc6 geoffrey jost <geoffrey@jostwebwerks.com> 1527101162 -0700	checkout: moving from ddrpub-static to develop
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 5f580d356a7b319a1c520fe36b5c51fd18686815 geoffrey jost <geoffrey@jostwebwerks.com> 1527113164 -0700	rebase -i (start): checkout HEAD~3
5f580d356a7b319a1c520fe36b5c51fd18686815 216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 geoffrey jost <geoffrey@jostwebwerks.com> 1527113164 -0700	rebase -i (squash): Makefile: separate deb8/deb8 targets; modernize like ddrlocal
216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 geoffrey jost <geoffrey@jostwebwerks.com> 1527113171 -0700	rebase -i (finish): returning to refs/heads/develop
216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 61f543ea5a3c9a65e8e318c4bb541e90a5257ec0 geoffrey jost <geoffrey@jostwebwerks.com> 1527198326 -0700	checkout: moving from develop to 79-hotfix-ui-cookienotice
61f543ea5a3c9a65e8e318c4bb541e90a5257ec0 216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 geoffrey jost <geoffrey@jostwebwerks.com> 1527198354 -0700	checkout: moving from 79-hotfix-ui-cookienotice to develop
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 61f543ea5a3c9a65e8e318c4bb541e90a5257ec0 geoffrey jost <geoffrey@jostwebwerks.com> 1527198794 -0700	checkout: moving from develop to 79-hotfix-ui-cookienotice
61f543ea5a3c9a65e8e318c4bb541e90a5257ec0 fc2f100736037e4f0322252fb19cfc99b1649750 geoffrey jost <geoffrey@jostwebwerks.com> 1527198832 -0700	commit: ui: add important missing character to cookie notice
fc2f100736037e4f0322252fb19cfc99b1649750 216b5a3b2d1b4e4df71d81ebfadbcf2ed4237ca2 geoffrey jost <geoffrey@jostwebwerks.com> 1527198886 -0700	checkout: moving from 79-hotfix-ui-cookienotice to develop
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 504a9e0a39ff18deb651a3a7e0f8c37b642fee34 geoffrey jost <geoffrey@jostwebwerks.com> 1527198971 -0700	checkout: moving from develop to ddrpublic-support
504a9e0a39ff18deb651a3a7e0f8c37b642fee34 fc2f100736037e4f0322252fb19cfc99b1649750 geoffrey jost <geoffrey@jostwebwerks.com> 1527198985 -0700	checkout: moving from ddrpublic-support to 79-hotfix-ui-cookienotice
fc2f100736037e4f0322252fb19cfc99b1649750 504a9e0a39ff18deb651a3a7e0f8c37b642fee34 geoffrey jost <geoffrey@jostwebwerks.com> 1527198993 -0700	checkout: moving from 79-hotfix-ui-cookienotice to ddrpublic-support
504a9e0a39ff18deb651a3a7e0f8c37b642fee34 244bafe6899775eb858da49cb9703655593f9ea2 geoffrey jost <geoffrey@jostwebwerks.com> 1527199000 -0700	merge 79-hotfix-ui-cookienotice: Merge made by the 'recursive' strategy.
244bafe6899775eb858da49cb9703655593f9ea2 abf701d6382dfac3df4e8921a6523c177e1c29bf geoffrey jost <geoffrey@jostwebwerks.com> 1527200091 -0700	checkout: moving from ddrpublic-support to ddrpub-static
abf701d6382dfac3df4e8921a6523c177e1c29bf 0922732c3046dd782b0a8dd851bf18c9d22f60f0 geoffrey jost <geoffrey@jostwebwerks.com> 1527200444 -0700	checkout: moving from ddrpub-static to develop
0922732c3046dd782b0a8dd851bf18c9d22f60f0 e128237d18b33a37eea0a967969d1defc8e455e0 geoffrey jost <geoffrey@jostwebwerks.com> 1527274637 -0700	rebase -i (start): checkout HEAD~3
e128237d18b33a37eea0a967969d1defc8e455e0 48eb343b35f68b2961acd0350ede16f696d20fb3 geoffrey jost <geoffrey@jostwebwerks.com> 1527274637 -0700	rebase -i (squash): ui: base.html edit to add cookie notice (79)
48eb343b35f68b2961acd0350ede16f696d20fb3 48eb343b35f68b2961acd0350ede16f696d20fb3 geoffrey jost <geoffrey@jostwebwerks.com> 1527274642 -0700	rebase -i (finish): returning to refs/heads/develop
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 973cc84c27d07d3718639a282f1620021aa9eb22 geoffrey jost <geoffrey@jostwebwerks.com> 1527808939 -0700	rebase -i (start): checkout HEAD~3
973cc84c27d07d3718639a282f1620021aa9eb22 18df57ec895a09edbeadfac6bf349c9910be68de geoffrey jost <geoffrey@jostwebwerks.com> 1527808939 -0700	cherry-pick: fast-forward
18df57ec895a09edbeadfac6bf349c9910be68de 7de9249e154c0ecefc3edc11b8bbf921d3425fa2 geoffrey jost <geoffrey@jostwebwerks.com> 1527808944 -0700	commit (amend): upgrade to Django 1.9
7de9249e154c0ecefc3edc11b8bbf921d3425fa2 8f1bdd0ee77f36ce013fcaae377c6c3784467bc7 geoffrey jost <geoffrey@jostwebwerks.com> 1527808956 -0700	rebase -i (pick): upgrade to Django 1.10
8f1bdd0ee77f36ce013fcaae377c6c3784467bc7 8f1bdd0ee77f36ce013fcaae377c6c3784467bc7 geoffrey jost <geoffrey@jostwebwerks.com> 1527808956 -0700	rebase -i (finish): returning to refs/heads/develop
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 8c2b6fdf8c75af25199af56424b3ef5588b68c0a geoffrey jost <geoffrey@jostwebwerks.com> 1527810694 -0700	rebase -i (start): checkout HEAD~3
8c2b6fdf8c75af25199af56424b3ef5588b68c0a f8cec11bc708004d24bcf5917bd2a868ef8d09fc geoffrey jost <geoffrey@jostwebwerks.com> 1527810694 -0700	cherry-pick: fast-forward
f8cec11bc708004d24bcf5917bd2a868ef8d09fc 7430ea31283f2b52b876af6cfe63693fe65815d3 geoffrey jost <geoffrey@jostwebwerks.com> 1527810697 -0700	commit (amend): upgrade to Django 1.11(LTS)
7430ea31283f2b52b876af6cfe63693fe65815d3 5795ddad75f09ec3fc67d1d05788c89309c7d016 geoffrey jost <geoffrey@jostwebwerks.com> 1527810706 -0700	rebase -i (pick): settings: re-enable Redis caching (disabled during upgrades)
5795ddad75f09ec3fc67d1d05788c89309c7d016 5795ddad75f09ec3fc67d1d05788c89309c7d016 geoffrey jost <geoffrey@jostwebwerks.com> 1527810706 -0700	rebase -i (finish): returning to refs/heads/develop
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 2d4027d3815d4865057fbb28c812cc7416842553 geoffrey jost <geoffrey@jostwebwerks.com> 1527859976 -0700	rebase -i (start): checkout HEAD~3
2d4027d3815d4865057fbb28c812cc7416842553 2ef02cc1933669f68c49ab5b1130d6383fd382b8 geoffrey jost <geoffrey@jostwebwerks.com> 1527859976 -0700	rebase -i (pick): requirements: upgrade djangorestframework to 3.6; add coreapi-cli
2ef02cc1933669f68c49ab5b1130d6383fd382b8 e41cec39c94a786f64c441c9b2388f6d2d152dda geoffrey jost <geoffrey@jostwebwerks.com> 1527859976 -0700	rebase -i (pick): VERSION: 3.0.2
e41cec39c94a786f64c441c9b2388f6d2d152dda e41cec39c94a786f64c441c9b2388f6d2d152dda geoffrey jost <geoffrey@jostwebwerks.com> 1527859976 -0700	rebase -i (finish): returning to refs/heads/develop
e41cec39c94a786f64c441c9b2388f6d2d152dda 2ef02cc1933669f68c49ab5b1130d6383fd382b8 geoffrey jost <geoffrey@jostwebwerks.com> 1527860012 -0700	reset: moving to HEAD~1
2ef02cc1933669f68c49ab5b1130d6383fd382b8 2ef02cc1933669f68c49ab5b1130d6383fd382b8 geoffrey jost <geoffrey@jostwebwerks.com> 1527860097 -0700	checkout: moving from develop to develop
2ef02cc1933669f68c49ab5b1130d6383fd382b8 2ef02cc1933669f68c49ab5b1130d6383fd382b8 geoffrey jost <geoffrey@jostwebwerks.com> 1527860115 -0700	checkout: moving from develop to 060-upgrade-django
2ef02cc1933669f68c49ab5b1130d6383fd382b8 b80e2d010d05df31ab64d444a501dc5d59be62aa geoffrey jost <geoffrey@jostwebwerks.com> 1527860126 -0700	reset: moving to HEAD~11
b80e2d010d05df31ab64d444a501dc5d59be62aa b80e2d010d05df31ab64d444a501dc5d59be62aa geoffrey jost <geoffrey@jostwebwerks.com> 1527860135 -0700	checkout: moving from 060-upgrade-django to 060-upgrade-django
b80e2d010d05df31ab64d444a501dc5d59be62aa 2ef02cc1933669f68c49ab5b1130d6383fd382b8 geoffrey jost <geoffrey@jostwebwerks.com> 1527860216 -0700	checkout: moving from 060-upgrade-django to 2ef02cc
2ef02cc1933669f68c49ab5b1130d6383fd382b8 b80e2d010d05df31ab64d444a501dc5d59be62aa geoffrey jost <geoffrey@jostwebwerks.com> 1527860231 -0700	checkout: moving from 2ef02cc1933669f68c49ab5b1130d6383fd382b8 to 060-upgrade-django
b80e2d010d05df31ab64d444a501dc5d59be62aa b80e2d010d05df31ab64d444a501dc5d59be62aa geoffrey jost <geoffrey@jostwebwerks.com> 1527860245 -0700	checkout: moving from 060-upgrade-django to 060-upgrade-django
b80e2d010d05df31ab64d444a501dc5d59be62aa 5c213aa1a268002ef03ea256b08f63511c72956e geoffrey jost <geoffrey@jostwebwerks.com> 1527860259 -0700	cherry-pick: Makefile: install namesdb in make task instead of pip requirements
5c213aa1a268002ef03ea256b08f63511c72956e 7222c88a78714e1b31091c9913c88aeb7eaf6d67 geoffrey jost <geoffrey@jostwebwerks.com> 1527860277 -0700	cherry-pick: requirements: update elasticsearch-py, elasticsearch-dsl
7222c88a78714e1b31091c9913c88aeb7eaf6d67 0d8e0637082b3501c2ac910b4f3ad70fa5c7c5b0 geoffrey jost <geoffrey@jostwebwerks.com> 1527860299 -0700	cherry-pick: namesdb: update to work with new Elasticsearch libs
0d8e0637082b3501c2ac910b4f3ad70fa5c7c5b0 4deccb75e27311ec9cf5bf1cb8eb2e50888c251a geoffrey jost <geoffrey@jostwebwerks.com> 1527860308 -0700	cherry-pick: requirements: update non-Django dependencies
4deccb75e27311ec9cf5bf1cb8eb2e50888c251a a667666eb252e3e939fd84914ef0f1cb68ead4f9 geoffrey jost <geoffrey@jostwebwerks.com> 1527860316 -0700	cherry-pick: upgrade to Django 1.9
a667666eb252e3e939fd84914ef0f1cb68ead4f9 03b907c5acc89cd72401f4686b7fd009f4e9a4be geoffrey jost <geoffrey@jostwebwerks.com> 1527860326 -0700	cherry-pick: upgrade to Django 1.10
03b907c5acc89cd72401f4686b7fd009f4e9a4be 7e2218cd08c5f12ae9309c7c4fd358ac6580bdde geoffrey jost <geoffrey@jostwebwerks.com> 1527860334 -0700	cherry-pick: upgrade to Django 1.11(LTS)
7e2218cd08c5f12ae9309c7c4fd358ac6580bdde 935f30f91b8c66801fc21efceab1fe679e852221 geoffrey jost <geoffrey@jostwebwerks.com> 1527860344 -0700	cherry-pick: settings: re-enable Redis caching (disabled during upgrades)
935f30f91b8c66801fc21efceab1fe679e852221 87bf12e8210ca19efd073d45eb10e327492dcb49 geoffrey jost <geoffrey@jostwebwerks.com> 1527860353 -0700	cherry-pick: requirements: move to a single file in project root
87bf12e8210ca19efd073d45eb10e327492dcb49 d4e977d5a409fef4651bd282de27174abf8882cf geoffrey jost <geoffrey@jostwebwerks.com> 1527860367 -0700	cherry-pick: requirements: upgrade djangorestframework to 3.6; add coreapi-cli
d4e977d5a409fef4651bd282de27174abf8882cf 45485f9af5ed49d05f8e2fd9a39ac937246c05fe geoffrey jost <geoffrey@jostwebwerks.com> 1527860374 -0700	cherry-pick: .gitignore *.deb package files
45485f9af5ed49d05f8e2fd9a39ac937246c05fe 0d4672c1d93889b82dd6c3827f14dbec2bdf7040 geoffrey jost <geoffrey@jostwebwerks.com> 1527862650 -0700	commit: Makefile: deb-* tasks place rest_framework assets
0d4672c1d93889b82dd6c3827f14dbec2bdf7040 2ef02cc1933669f68c49ab5b1130d6383fd382b8 geoffrey jost <geoffrey@jostwebwerks.com> 1527864785 -0700	checkout: moving from 060-upgrade-django to develop
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 0d4672c1d93889b82dd6c3827f14dbec2bdf7040 geoffrey jost <geoffrey@jostwebwerks.com> 1527864838 -0700	checkout: moving from develop to 060-upgrade-django
0d4672c1d93889b82dd6c3827f14dbec2bdf7040 1013fbbc6869907dfb94c686a86de899908b5d26 geoffrey jost <geoffrey@jostwebwerks.com> 1527864849 -0700	checkout: moving from 060-upgrade-django to develop
1013fbbc6869907dfb94c686a86de899908b5d26 bd549fa1b17f246b883bd68480270e0a81e60b10 geoffrey jost <geoffrey@jostwebwerks.com> 1527864878 -0700	commit: VERSION: 3.1.0
bd549fa1b17f246b883bd68480270e0a81e60b10 7ae0844f23696f689eeaa1b6a35b9e6125738a4b geoffrey jost <geoffrey@jostwebwerks.com> 1528396004 -0700	checkout: moving from develop to 66-hotfix-ui-iaplayer
7ae0844f23696f689eeaa1b6a35b9e6125738a4b bd549fa1b17f246b883bd68480270e0a81e60b10 geoffrey jost <geoffrey@jostwebwerks.com> 1528396305 -0700	checkout: moving from 66-hotfix-ui-iaplayer to develop
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
1b7b591c644bb5ec5163158a99c83dd1cee3bb61 1b7b591c644bb5ec5163158a99c83dd1cee3bb61 geoffrey jost <geoffrey@jostwebwerks.com> 1528402376 -0700	checkout: moving from develop to develop
1b7b591c644bb5ec5163158a99c83dd1cee3bb61 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1528403195 -0700	checkout: moving from develop to master
34baf15cff65fdec2361a670b0e1bd16e1d61626 1b7b591c644bb5ec5163158a99c83dd1cee3bb61 geoffrey jost <geoffrey@jostwebwerks.com> 1528403512 -0700	checkout: moving from master to develop
1b7b591c644bb5ec5163158a99c83dd1cee3bb61 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1528403587 -0700	checkout: moving from develop to master
34baf15cff65fdec2361a670b0e1bd16e1d61626 1b7b591c644bb5ec5163158a99c83dd1cee3bb61 geoffrey jost <geoffrey@jostwebwerks.com> 1528403595 -0700	merge develop: Fast-forward
1b7b591c644bb5ec5163158a99c83dd1cee3bb61 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1528403621 -0700	checkout: moving from master to master-v2
34baf15cff65fdec2361a670b0e1bd16e1d61626 1b7b591c644bb5ec5163158a99c83dd1cee3bb61 geoffrey jost <geoffrey@jostwebwerks.com> 1528403628 -0700	checkout: moving from master-v2 to master
1b7b591c644bb5ec5163158a99c83dd1cee3bb61 a77353e8366b753d6828ae21b060ca2450121826 geoffrey jost <geoffrey@jostwebwerks.com> 1528405223 -0700	commit: VERSION: 3.1.2
a77353e8366b753d6828ae21b060ca2450121826 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1528406385 -0700	checkout: moving from master to master-v2
34baf15cff65fdec2361a670b0e1bd16e1d61626 a77353e8366b753d6828ae21b060ca2450121826 geoffrey jost <geoffrey@jostwebwerks.com> 1528406449 -0700	checkout: moving from master-v2 to master
a77353e8366b753d6828ae21b060ca2450121826 34baf15cff65fdec2361a670b0e1bd16e1d61626 geoffrey jost <geoffrey@jostwebwerks.com> 1528406537 -0700	checkout: moving from master to master-v2
34baf15cff65fdec2361a670b0e1bd16e1d61626 a77353e8366b753d6828ae21b060ca2450121826 geoffrey jost <geoffrey@jostwebwerks.com> 1528406628 -0700	checkout: moving from master-v2 to master
a77353e8366b753d6828ae21b060ca2450121826 f54e8e75fa88dbf413aafb525e036fa436508191 geoffrey jost <geoffrey@jostwebwerks.com> 1529020223 -0700	commit: models: use proper base URL for link_download
f54e8e75fa88dbf413aafb525e036fa436508191 62ef42f045afe28bd125472889525fc8e1db5c61 geoffrey jost <geoffrey@jostwebwerks.com> 1529020259 -0700	commit: VERSION: 3.1.3
