Commit Graph

5829 Commits (f725998dd83ee3f62958dcd47f418bd6f56b9439)

Author SHA1 Message Date
eric 2c79a31933 fix bug in choice-freeform entry 2016-10-05 16:59:34 -04:00
eric b0663d435b Merge branch 'master' into questionnaire_export 2016-10-05 15:43:51 -04:00
eric 0e7320d4e8 integrate exports into unglue.it surveys 2016-10-05 15:36:20 -04:00
eric e623f6d31f allow export to be customized 2016-10-05 15:35:44 -04:00
Raymond Yee 8c502513ea Merge pull request #637 from Gluejar/fix-ebook-notifications
tighten ebook notifications
2016-10-04 15:11:07 -07:00
eric 6c4874c3b2 tighten ebook notifications
The 0006_auto_20160818_1809 migration created inactive ebooks for
campaign books. These new ebooks triggered user notifications. Now the
new ebook notification is only sent if there's a new ebook. Also, it's
been a known issue #76568402 that we should stop notifying ebooks for
users who fave newly available ebooks.
2016-10-04 13:22:01 -04:00
Raymond Yee 98d6283b5f Merge pull request #636 from Gluejar/update-django-registration
fix cleanupregistration
2016-10-03 16:26:12 -07:00
eric 0a37ac2bba fix cleanupregistration
we're lucky we didn't lose any user data!
2016-10-03 13:27:25 -04:00
eric 23439bebe8 fix missing import 2016-09-30 17:55:27 -04:00
Raymond Yee 599ac8dc69 Merge pull request #635 from Gluejar/versions-relations-ednotes
Versions relations ednotes [merge into master not dj18]
2016-09-30 11:08:53 -07:00
eric 2761d28fed normalize runid
duplicating runid in three tables was bad practice and made filtering
very difficult
2016-09-30 14:04:41 -04:00
Raymond Yee 4405b4ee73 change regluit.core.tests.BookLoaderTests.test_add_related to test whether every WorkRelation points back properly 2016-09-29 15:15:46 -07:00
Raymond Yee 2e9ff2bf1c got regluit.core.tests.BookLoaderTests.test_add_related to work now -- but have to check
with Eric to see whether it's exactly the right test
2016-09-29 15:02:27 -07:00
Raymond Yee e0e96da968 Merge branch 'master' into versions-relations-ednotes 2016-09-29 14:02:23 -07:00
eric fada8e0222 correct comments 2016-09-29 10:57:15 -04:00
eric 4ba5104e06 move UnicodeWriter to utils 2016-09-28 18:42:55 -04:00
eric fc56744371 FileWrapper not needed, is broken 2016-09-28 18:40:57 -04:00
eshellman ee0e8be670 Merge pull request #634 from Gluejar/fix_lockss
[WIP] work.authors() returns list of all authors
2016-09-23 15:35:56 -04:00
eric 5fc4d631ff split version into label and iter 2016-09-23 14:53:58 -04:00
Raymond Yee 81524ac5f0 work.authors() returns list of all authors 2016-09-23 10:16:26 -07:00
Raymond Yee e8d4ab82be add comments to this migration 2016-09-22 14:28:49 -07:00
Raymond Yee eebd00ccd9 Merge pull request #633 from Gluejar/fix-missing-pass-reset-template
copy html template to txt
2016-09-20 08:07:09 -07:00
eric c730d70ea1 copy html template to txt 2016-09-20 08:18:38 -04:00
Raymond Yee 0e75a750ab an extra migration produced by `makemigrations` 2016-09-15 11:50:31 -07:00
Raymond Yee 298dca48b3 clean up .pyc and empty directories with software update 2016-09-12 11:30:25 -07:00
Raymond Yee 243e7d8029 fix error:
======================================================================
ERROR: test_nix (regluit.api.tests.FeedTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/api/tests.py", line 173, in test_nix
    r = self.client.get('/api/onix/by/')
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/test/client.py", line 500, in get
    **extra)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/test/client.py", line 303, in get
    return self.generic('GET', path, secure=secure, **r)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/test/client.py", line 379, in generic
    return self.request(**r)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/test/client.py", line 466, in request
    six.reraise(*exc_info)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/core/handlers/base.py", line 132, in get_response
    response = wrapped_callback(request, *callback_args, **callback_kwargs)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/views/generic/base.py", line 71, in view
    return self.dispatch(request, *args, **kwargs)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/views/generic/base.py", line 89, in dispatch
    return handler(request, *args, **kwargs)
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/api/views.py", line 208, in get
    return HttpResponse(onix.onix_feed(facet_class, max),
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/api/onix.py", line 25, in onix_feed
    editions = facet.facet_object.filter_model("Edition",editions).distinct()
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/core/facets.py", line 44, in filter_model
    return model_filter( self._filter_model(model, query_set))
  File "/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit/core/facets.py", line 147, in edition_license_filter
    return query_set.filter(ebooks__rights=cc.ccinfo(facet_name))
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/query.py", line 679, in filter
    return self._filter_or_exclude(False, *args, **kwargs)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/query.py", line 697, in _filter_or_exclude
    clone.query.add_q(Q(*args, **kwargs))
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1310, in add_q
    clause, require_inner = self._add_q(where_part, self.used_aliases)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1338, in _add_q
    allow_joins=allow_joins, split_subq=split_subq,
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/django/db/models/sql/query.py", line 1177, in build_filter
    if isinstance(value, Iterator):
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/abc.py", line 144, in __instancecheck__
    return cls.__subclasscheck__(subtype)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/abc.py", line 180, in __subclasscheck__
    if issubclass(subclass, scls):
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/abc.py", line 161, in __subclasscheck__
    ok = cls.__subclasshook__(subclass)
  File "/Users/raymondyee/anaconda/envs/regluit613/lib/python2.7/site-packages/backports_abc.py", line 66, in __subclasshook__
    mro = C.__mro__
AttributeError: class ccinfo has no attribute '__mro__'
2016-09-12 10:42:12 -07:00
Raymond Yee a2cb58800c Merge branch 'master' into versions-relations-ednotes 2016-09-12 09:27:08 -07:00
Raymond Yee ee32ea3940 Merge pull request #632 from Gluejar/dj18
turn maintenance mode off for prod
2016-09-08 18:57:02 -07:00
Raymond Yee ba09e40f72 Merge branch 'dj18' of github.com:Gluejar/regluit into dj18 2016-09-08 18:56:02 -07:00
Raymond Yee aed8549156 turn maintenance for prod off 2016-09-08 18:55:39 -07:00
Raymond Yee 2bbbd14940 Merge pull request #631 from Gluejar/dj18
merge postdj18 stuff into master
2016-09-08 18:48:14 -07:00
Raymond Yee ea2cf838e4 Merge pull request #615 from Gluejar/postdj18
empty the repair migration
2016-09-08 18:46:50 -07:00
Raymond Yee b75193ee1d Merge pull request #630 from Gluejar/dj18
put production into maintenance
2016-09-08 18:29:51 -07:00
Raymond Yee a844747b65 Merge branch 'dj18' into postdj18 2016-09-08 18:28:55 -07:00
Raymond Yee 40971359a7 put production into maintenance 2016-09-08 18:28:33 -07:00
Raymond Yee 1335fe59d2 Merge branch 'dj18' into postdj18 2016-09-08 17:54:15 -07:00
Raymond Yee 412de90dc0 Merge pull request #629 from Gluejar/dj18
refine do_migrate for production in Vagrantfile
2016-09-08 17:53:17 -07:00
Raymond Yee fc4ca7dbc0 refine do_migrate for production in Vagrantfile 2016-09-08 17:52:25 -07:00
Raymond Yee b71ae06198 Merge pull request #628 from Gluejar/dj18
take just out of maintenance mode
2016-09-08 11:43:47 -07:00
Raymond Yee 314e7536ff Merge branch 'dj18' into postdj18 2016-09-08 11:43:07 -07:00
Raymond Yee f9b1129fee take just out of maintenance mode 2016-09-08 11:42:27 -07:00
Raymond Yee 455cf97d69 Merge branch 'dj18' into postdj18 2016-09-08 08:08:01 -07:00
Raymond Yee 46a37a0e36 Merge pull request #627 from Gluejar/dj18
hopefully, updating django-maintenancemode will fix dj 1.8 compatibility issue
2016-09-08 08:05:54 -07:00
Raymond Yee b8364e6278 hopefully, updating django-maintenancemode will fix problem related to https://github.com/shanx/django-maintenancemode/issues/8 2016-09-08 08:00:51 -07:00
Raymond Yee 1d38dd5ccf Merge pull request #626 from Gluejar/dj18
update update-just and update-prod
2016-09-07 19:28:30 -07:00
Raymond Yee 0e4792046b Merge branch 'master' into dj18 2016-09-07 19:27:45 -07:00
Raymond Yee 890983ee7c Merge branch 'master' into dj18 2016-09-07 19:27:14 -07:00
Raymond Yee c3b5240209 Merge branch 'dj18' into postdj18 2016-09-07 19:25:31 -07:00
Raymond Yee ef626c1b47 update update-just and update-prod 2016-09-07 19:24:47 -07:00
Raymond Yee cc0b6a7358 Merge pull request #625 from Gluejar/dj18
update just.wsgi and regluit.wsgi to match please.wsgi
2016-09-07 19:19:58 -07:00