eric
5d9b8ae389
stop ignoring marc directory
2014-10-17 17:12:24 -04:00
eric
be294aa8f0
Merge branch 'master' into stub-marc
2014-10-17 11:36:35 -04:00
eric
3e21430e13
# in MARC spec means blank space
2014-10-17 11:30:55 -04:00
Raymond Yee
333e2a6839
Merge pull request #399 from Gluejar/fix_requirements_pip
...
Fix requirements pip
2014-10-16 15:20:44 -07:00
Raymond Yee
2764d337ae
need to include --upgrade flag to pip install (doh)
2014-10-16 15:18:06 -07:00
Raymond Yee
b847771089
First pass at trying to fix problems in pip install -r requirements
2014-10-16 15:12:34 -07:00
eric
a085a5fcca
add more metadata from db
...
008, authors, publishers, isbn, pub date from db
2014-10-16 17:14:54 -04:00
eshellman
9ba17660e5
Merge pull request #392 from Gluejar/allow-http-id
...
Allow staff to enter books with an http id
2014-10-16 12:52:12 -04:00
Raymond Yee
b70d3bd9ff
Merge pull request #398 from Gluejar/poodle_patch
...
Turning off SSL v2 and SSL v3 from Apache to patch against POODLE vulnerabillity
2014-10-15 15:05:58 -07:00
Raymond Yee
685e827e44
Turning off SSL v2 and SSL v3 from Apache to patch against POODLE vulnerability: http://askubuntu.com/questions/537196/how-do-i-patch-workaround-sslv3-poodle-vulnerability-cve-2014-3566
2014-10-15 14:56:59 -07:00
Raymond Yee
64ff561b35
Merge pull request #397 from Gluejar/update_requests
...
need to update version of requests
2014-10-15 14:18:42 -07:00
Raymond Yee
f8be7677d5
need to update version of requests because we started getting error in accessing settings.BOOXTREAM_TEST_EPUB_URL
2014-10-15 14:14:18 -07:00
Raymond Yee
1dd114bc74
add to migration the change in default collation for core_identifier. One possible problem is that this code is mysql specific. In practice, not a problem for now since we're using mysql.
2014-10-15 07:46:50 -07:00
eric
d8d97faee2
change size of value column
...
This migration will throw an error unless the entire table has
collation utf8_bin because of the unique together constraint. Also, 250
is the largest size we can have with mySQL as back end (together with
the unique together index)
2014-10-14 15:42:57 -04:00
eric
fbe96bcfc7
basic stub records
2014-10-14 10:08:08 -04:00
Raymond Yee
bf40897f68
Merge branch 'allow-http-id' of github.com:Gluejar/regluit into allow-http-id
...
Conflicts:
frontend/forms.py
2014-10-13 16:26:30 -07:00
Raymond Yee
08e1806db2
As suggested by Eric, we'll use a regex from https://mathiasbynens.be/demo/url-regex ,
...
specifically the one by @imme_emosol
2014-10-13 16:21:30 -07:00
eshellman
e69a2cd1f8
forgot '/'
2014-10-13 16:43:42 -04:00
Raymond Yee
842c0e07e1
Merge branch 'master' into allow-http-id
2014-10-13 12:39:42 -07:00
Raymond Yee
1edadbe84f
Merge pull request #396 from Gluejar/fix_just_celery
...
the commands to link the celery config files belong in the startup
2014-10-10 17:30:34 -07:00
Raymond Yee
629527e3e0
the commands to link the celery config files belong in the startup
2014-10-10 17:28:59 -07:00
Raymond Yee
01ed969dc3
Merge pull request #395 from Gluejar/fix_just_celery
...
just was not configured properly for celery
2014-10-10 17:02:56 -07:00
Raymond Yee
9be8d2b3a7
just was not configured properly for celery
2014-10-10 17:00:28 -07:00
Raymond Yee
ce78b441e3
Merge pull request #394 from Gluejar/turn_on_test_email
...
Turn on a daily test email from production and just -- to give RY some d...
2014-10-10 12:41:46 -07:00
Raymond Yee
4b36988115
Turn on a daily test email from production and just -- to give RY some daily ping about celerybeat
2014-10-10 12:39:43 -07:00
Raymond Yee
73435e399c
Merge branch 'master' into allow-http-id
2014-10-09 15:21:34 -07:00
Raymond Yee
f4ccca4d65
Merge pull request #393 from Gluejar/fix-date-change
...
stop rounding the date!
2014-10-09 13:06:00 -07:00
eric
05aea1b40b
stop rounding the date!
2014-10-09 14:33:53 -04:00
eric
93c9b696b2
Allow staff to enter books with an http id
...
I'm finding LOTS of books that don't have ISBN or OCLCnum
2014-10-08 16:23:24 -04:00
Raymond Yee
b4f94e60c1
Merge pull request #391 from Gluejar/fix-pyepub
...
updated to current pyepub with namespace fix
2014-10-08 10:16:34 -07:00
eric
e1095f4955
updated to current pyepub with namespace fix
2014-10-06 17:20:46 -04:00
Raymond Yee
6628603a38
Merge pull request #390 from Gluejar/reactivate_ebooks
...
I forgot to update the fabfile/requirements file to match current seleni...
2014-10-06 11:50:49 -07:00
Raymond Yee
e0098baed9
I forgot to update the fabfile/requirements file to match current selenium library I use to run Se tests.
2014-10-06 11:48:30 -07:00
Raymond Yee
174548aa1c
Merge pull request #389 from Gluejar/reactivate_ebooks
...
ebook files activate and deactivate
2014-10-06 11:17:09 -07:00
eric
ef6c4a659e
ebook files activate and deactivate
...
when manager unselects 'add_ask', the system didn't revert to the files
without added ask. This fixes that. To test, toggle the add_ask
checkbox and save campaign.
2014-10-04 16:51:16 -04:00
Raymond Yee
0ddbdbc944
Merge pull request #384 from Gluejar/fix_optional_token
...
Fix optional token
2014-09-29 13:22:49 -07:00
Raymond Yee
a02463c117
Merge pull request #388 from Gluejar/fix-inactive-ebooks
...
let ebook go to default
2014-09-29 11:44:12 -07:00
Raymond Yee
a191dd752d
Merge pull request #387 from Gluejar/fix_campaign_save
...
fix the data instead of complaining [fix #79439034 ]
2014-09-27 09:38:03 -07:00
eric
5a6582ae66
let ebook go to default
2014-09-26 10:40:20 -04:00
eric
cd162905fa
fix the data instead of complaining
2014-09-25 13:32:01 -04:00
eshellman
2223446f36
Merge pull request #386 from Gluejar/pdf_ask
...
Insert Pdf/epub ask into served files [Take 2]
2014-09-17 04:48:46 -04:00
eric
93bba18b79
Merge branch 'master' into fix_optional_token
2014-09-13 16:24:22 -04:00
eric
b72e0a1fe1
made a form that doesn't have Stripe Token
2014-09-13 16:19:47 -04:00
Raymond Yee
9e970bfbab
Merge pull request #385 from Gluejar/generalize_marc
...
syntax error in generalize_marc
2014-09-12 14:46:54 -07:00
eric
6c9f4459b3
only set LC as source if LC is source
2014-09-12 17:44:41 -04:00
Raymond Yee
2651e79a3c
syntax error
2014-09-12 14:37:22 -07:00
Raymond Yee
dfbabdef7d
Merge pull request #383 from Gluejar/generalize_marc
...
fixed error when record is not from LC
2014-09-12 14:30:43 -07:00
eric
8423e5442b
fixed error when record is not from LC
2014-09-12 11:49:07 -04:00
eric
9ae4ce42da
this is even more correct, and the tests pass
2014-09-12 10:21:06 -04:00
eric
28434b06a1
now do the same for epubs
2014-09-05 16:35:57 -04:00