d1eeb4fd889014353c6de4677068d14dce7e3488 609871bfcc652e6650a378deb0c5ae6636088fbf geoffrey jost <geoffrey@jostwebwerks.com> 1464977800 -0700	merge develop: Fast-forward
609871bfcc652e6650a378deb0c5ae6636088fbf aaf8b1b1e2c2fa31e1db4ff4ba046a912ada3042 geoffrey jost <geoffrey@jostwebwerks.com> 1464997949 -0700	commit: login: add IDSERVICE_API_BASE to login error messages
aaf8b1b1e2c2fa31e1db4ff4ba046a912ada3042 b751194fb66df5402de73aa7fb51c354e8912b7b geoffrey jost <geoffrey@jostwebwerks.com> 1464998041 -0700	commit: Makefile: rename conf files to ddrlocal.cfg,ddrlocal-local.cfg
b751194fb66df5402de73aa7fb51c354e8912b7b 82f14580c5bd953177019d712723bb91ed799e62 geoffrey jost <geoffrey@jostwebwerks.com> 1464998229 -0700	commit: Makefile: added ddrlocal/ prefix to /var/www/ddrlocal/media,static
82f14580c5bd953177019d712723bb91ed799e62 1d945a0e6a2de2dc103b538937f03c73787d9795 geoffrey jost <geoffrey@jostwebwerks.com> 1464998297 -0700	commit: Makefile: let make-status cmds fail without stopping whole task
1d945a0e6a2de2dc103b538937f03c73787d9795 c11832ac5b6b1cfcff6f6f37b61f4e39735d9154 geoffrey jost <geoffrey@jostwebwerks.com> 1464998895 -0700	commit: Makefile: mv repos dir symlink /var/www/media/ddr -> /var/www/ddr
c11832ac5b6b1cfcff6f6f37b61f4e39735d9154 609871bfcc652e6650a378deb0c5ae6636088fbf geoffrey jost <geoffrey@jostwebwerks.com> 1464999000 -0700	reset: moving to HEAD~5
609871bfcc652e6650a378deb0c5ae6636088fbf f6e9eb0c4a2db0c3751ef8b93401fc8ca5eed74a geoffrey jost <geoffrey@jostwebwerks.com> 1465243521 -0700	merge develop: Merge made by the 'recursive' strategy.
f6e9eb0c4a2db0c3751ef8b93401fc8ca5eed74a ff187377e2d804803800532a7c28ccac9eb074c5 geoffrey jost <geoffrey@jostwebwerks.com> 1465840333 -0700	pull: Fast-forward
ff187377e2d804803800532a7c28ccac9eb074c5 39128699ffde3dc9e2c3162da12110a883d9d843 geoffrey jost <geoffrey@jostwebwerks.com> 1466528637 -0700	pull: Fast-forward
39128699ffde3dc9e2c3162da12110a883d9d843 d45dcbbe1a14d992e70661a193e796ab99f65a4a geoffrey jost <geoffrey@jostwebwerks.com> 1466713218 -0700	pull: Fast-forward
d45dcbbe1a14d992e70661a193e796ab99f65a4a 94b0b32f07f9529c2d5c01e2c2b7ba00dbe2ff32 geoffrey jost <geoffrey@jostwebwerks.com> 1467743505 -0700	commit: tasks: use special logger object for Celery tasks
94b0b32f07f9529c2d5c01e2c2b7ba00dbe2ff32 fd44374c24f76c4a7827d10feebfdbbc501e2cd3 geoffrey jost <geoffrey@jostwebwerks.com> 1467744080 -0700	commit: models: log failed ES post when saving entities but don't crash
fd44374c24f76c4a7827d10feebfdbbc501e2cd3 8ac5d5d1660f45b8175c58a556e0d376d87f241a geoffrey jost <geoffrey@jostwebwerks.com> 1467744196 -0700	commit (amend): log errors instead of crashing if can't connect to ES (cont'd)
8ac5d5d1660f45b8175c58a556e0d376d87f241a 175278efc65fdf192b2daa844bcd69a34d6de572 geoffrey jost <geoffrey@jostwebwerks.com> 1467915077 -0700	commit: tasks: abbreviate XMP data in add_file logs
175278efc65fdf192b2daa844bcd69a34d6de572 062a039e7e73c081caaff4fcf804fa7009f9f82c geoffrey jost <geoffrey@jostwebwerks.com> 1467932650 -0700	commit: tasks: if new access file == old file, declare success and quit
062a039e7e73c081caaff4fcf804fa7009f9f82c b0f5286dc7ea4f5599a26c9ba928bd2b02e5d294 geoffrey jost <geoffrey@jostwebwerks.com> 1471562252 -0700	commit: batch: CSV export now uses batch export code
b0f5286dc7ea4f5599a26c9ba928bd2b02e5d294 71fe3c9d34a480a532bb0233875f6fd4e48976cf geoffrey jost <geoffrey@jostwebwerks.com> 1471562670 -0700	commit (amend): batch: CSV export now uses batch export code
71fe3c9d34a480a532bb0233875f6fd4e48976cf c0894b6e754469cab5b2334e69f475e0b2cfaede geoffrey jost <geoffrey@jostwebwerks.com> 1472580572 -0700	commit: Makefile: added setup-ddr-cmdln task
c0894b6e754469cab5b2334e69f475e0b2cfaede f017b9d74ab33d1bec8890c0c89a75bd1af1a2b2 geoffrey jost <geoffrey@jostwebwerks.com> 1473184985 -0700	commit: tasks: add_file,add_access now return just simple status dict
f017b9d74ab33d1bec8890c0c89a75bd1af1a2b2 2931d4eb5bb515a75f8b46640daf077c199756ad geoffrey jost <geoffrey@jostwebwerks.com> 1473186306 -0700	commit: get cmdln,local commits in settings file, print both in base tmplt
2931d4eb5bb515a75f8b46640daf077c199756ad cdc6c3f0dc2fb597e071769c75897a76a964ee43 geoffrey jost <geoffrey@jostwebwerks.com> 1473203380 -0700	commit: entity.form_post goes AFTER processing topics,facility fields
cdc6c3f0dc2fb597e071769c75897a76a964ee43 d780b176e112882d50704de93074f18f04c117ff geoffrey jost <geoffrey@jostwebwerks.com> 1485990097 -0800	commit: Makefile: rm pip --download-cache flag
d780b176e112882d50704de93074f18f04c117ff b3c5344baa624a9b934e1fef7af5f8bdc2825515 geoffrey jost <geoffrey@jostwebwerks.com> 1493837785 -0700	pull: Fast-forward
b3c5344baa624a9b934e1fef7af5f8bdc2825515 93be610dc6c2b752125c969f6cd5fe2225ec3aed geoffrey jost <geoffrey@jostwebwerks.com> 1493925703 -0700	commit: Makefile: INSTALL_DEFS instead of CONF_DEFS
93be610dc6c2b752125c969f6cd5fe2225ec3aed 6affd666ef0a3c02b498157c6c18602db8819470 geoffrey jost <geoffrey@jostwebwerks.com> 1493925859 -0700	commit: pass idservice API_BASE as arg, remove dependence on DDR.configs
6affd666ef0a3c02b498157c6c18602db8819470 d948d0c7ee110002b037a94f418e46beceeacb46 geoffrey jost <geoffrey@jostwebwerks.com> 1493927064 -0700	commit (amend): reduce dependence on DDR.configs
d948d0c7ee110002b037a94f418e46beceeacb46 dba88a08a6cf04645cd02cebbf9a2c72776c2edd geoffrey jost <geoffrey@jostwebwerks.com> 1493927831 -0700	commit (amend): reduce dependence on DDR.configs
dba88a08a6cf04645cd02cebbf9a2c72776c2edd 4415ffb711ef9a67a8d4fe02096ffff6080a34d4 geoffrey jost <geoffrey@jostwebwerks.com> 1493931570 -0700	commit: docstore: reduce dependance on DDR.config
4415ffb711ef9a67a8d4fe02096ffff6080a34d4 93be610dc6c2b752125c969f6cd5fe2225ec3aed geoffrey jost <geoffrey@jostwebwerks.com> 1493932021 -0700	reset: moving to HEAD~2
93be610dc6c2b752125c969f6cd5fe2225ec3aed d48b9a1f0299f98466b5a3f3142d0d058356fded geoffrey jost <geoffrey@jostwebwerks.com> 1493941734 -0700	commit: collections: removed 'signatures' link from footer
d48b9a1f0299f98466b5a3f3142d0d058356fded c3fc1b0d505f3e7a7e860f4bc9b96d20467d9d9c geoffrey jost <geoffrey@jostwebwerks.com> 1494023878 -0700	commit: Makefile: fresh installs of ddr-cmdln,defs,etc inside project dir
c3fc1b0d505f3e7a7e860f4bc9b96d20467d9d9c 6a1c952abfe624a050f96650c56b93f5ec27811b geoffrey jost <geoffrey@jostwebwerks.com> 1494032789 -0700	commit: Makefile: support both Debian 7 and 8
6a1c952abfe624a050f96650c56b93f5ec27811b c205c348d4e4e63c115ef193f38379c626f566e0 geoffrey jost <geoffrey@jostwebwerks.com> 1494267261 -0700	commit: Makefile: bpython dependencies on wheezy
c205c348d4e4e63c115ef193f38379c626f566e0 a606f0d60c75a343970998fe4613b0892c44774a geoffrey jost <geoffrey@jostwebwerks.com> 1494285383 -0700	commit: Makefile: missing bpython dependencies on jessie
a606f0d60c75a343970998fe4613b0892c44774a 626a9ea9ce33951a156b9c35162d5a87a7912bbd geoffrey jost <geoffrey@jostwebwerks.com> 1494287447 -0700	commit: Makefile: more missing bpython dependencies on jessie
626a9ea9ce33951a156b9c35162d5a87a7912bbd bd1f9482119d3b91a260321315e1a79abbcd18bd geoffrey jost <geoffrey@jostwebwerks.com> 1494962008 -0700	cherry-pick: views.entities: fixed reverse('webui-entity-files-dedupe')
bd1f9482119d3b91a260321315e1a79abbcd18bd 464c76c47ac1481e703be84a53389f13b86967cf geoffrey jost <geoffrey@jostwebwerks.com> 1494963091 -0700	commit: revise entity-files-dedupe template text, add link to filesystem
464c76c47ac1481e703be84a53389f13b86967cf fd839918b7e2b9a6543c59d257d80c7401964cc1 geoffrey jost <geoffrey@jostwebwerks.com> 1494963274 -0700	commit: cgit URL for entity-detail
fd839918b7e2b9a6543c59d257d80c7401964cc1 d03d2aa7685cd73d62c35635f7f142ecd4f282e7 geoffrey jost <geoffrey@jostwebwerks.com> 1499882311 -0700	commit: Makefile: add note about location of virtualenv
d03d2aa7685cd73d62c35635f7f142ecd4f282e7 9daa6693c0e17dc6eddc75fc2bd30f504684ff4f geoffrey jost <geoffrey@jostwebwerks.com> 1499882334 -0700	commit: Makefile: rm install-virtualenv from setup-ddr-cmdln (faster)
9daa6693c0e17dc6eddc75fc2bd30f504684ff4f 3b1510160c94dc0825d00af13c2d9104c969473e geoffrey jost <geoffrey@jostwebwerks.com> 1499882358 -0700	commit: templates/base: display path to ddr-defs in pi menu
3b1510160c94dc0825d00af13c2d9104c969473e cec03d6fb0a230486a8d1ecb15d9fd17e9b56ac1 geoffrey jost <geoffrey@jostwebwerks.com> 1499882382 -0700	commit (amend): templates/base: display path to ddr-defs in footer pi menu
cec03d6fb0a230486a8d1ecb15d9fd17e9b56ac1 d5999a44ac5d8d97e88e3158be78cf753b8cadb3 geoffrey jost <geoffrey@jostwebwerks.com> 1500062296 -0700	commit: views.entities: mod TagManager to retain term ancestors AKA paths
d5999a44ac5d8d97e88e3158be78cf753b8cadb3 e2af8a770d9cd24b3bc011d3b6f7d44240850614 geoffrey jost <geoffrey@jostwebwerks.com> 1500935548 -0700	merge fix-211-save-new-ids: Merge made by the 'recursive' strategy.
e2af8a770d9cd24b3bc011d3b6f7d44240850614 f0cef3e77e30c42bd1765d11d2515ac8449a97dd geoffrey jost <geoffrey@jostwebwerks.com> 1500940733 -0700	merge fix-211-save-new-ids: Merge made by the 'recursive' strategy.
f0cef3e77e30c42bd1765d11d2515ac8449a97dd b40f1d6c118f53522fcd39af7a5c1745484798ba geoffrey jost <geoffrey@jostwebwerks.com> 1504210715 -0700	merge develop: Merge made by the 'recursive' strategy.
