eric
aeb07049da
delete core.marcrecord table
2014-11-03 14:52:43 -05:00
Raymond Yee
c713f790b9
Merge pull request #407 from Gluejar/marc_encoding
...
force utf8
2014-11-02 15:26:18 -08:00
eric
1a6422bec2
force utf8
2014-11-01 15:15:25 -04:00
Raymond Yee
a666427497
Merge pull request #404 from Gluejar/marc_package
...
Marc package
2014-10-31 12:55:46 -07:00
Raymond Yee
7d53b6a48a
Merge pull request #406 from Gluejar/fix_user_prefs
...
fix user pref display
2014-10-31 10:56:26 -07:00
eric
f9b785e69e
fix user pref display
...
also add link to librarian settings
2014-10-31 13:52:19 -04:00
eric
fafd37a973
Merge branch 'master' into marc_package
...
Conflicts:
core/marc.py
static/css/campaign2.css
2014-10-30 12:38:53 -04:00
Raymond Yee
1b792ed91b
Merge pull request #405 from Gluejar/ui_nits
...
Ui nits
2014-10-30 08:06:27 -07:00
eric
97e3260c2b
[ #29780355 ] no Why unglue this? if unglued
2014-10-29 15:41:51 -04:00
eric
5c23d888c7
always show GR, LT links
2014-10-29 15:21:06 -04:00
eric
c5bb7220f2
don't link cover to google books if own cover
2014-10-29 15:18:32 -04:00
eric
c7071e2f44
author names and years shouldn't look like links
2014-10-29 14:55:09 -04:00
eric
fa8f03eb0a
pass tests
2014-10-27 20:11:23 -04:00
eric
d0e305cfec
rip out code
2014-10-27 19:11:44 -04:00
eric
e1409ceac1
redo marc file upload
2014-10-27 16:57:35 -04:00
eric
3b4b836e6c
add marc download tools
2014-10-27 11:55:46 -04:00
eshellman
223d8bad9a
Merge pull request #403 from Gluejar/more_marc_fixes
...
a proposed fix for when edition.publisher_name is None
2014-10-27 10:55:52 -04:00
Raymond Yee
98b5af63cc
a proposed fix for when edition.publisher_name is None
2014-10-25 17:43:15 -07:00
Raymond Yee
bd2641e26a
Merge pull request #402 from Gluejar/patch_concatanate
...
one-line fix
2014-10-25 12:28:14 -07:00
eric
96a94378a2
on-line fix
2014-10-25 12:02:27 -04:00
Raymond Yee
f9d8683f64
Merge pull request #400 from Gluejar/stub-marc
...
Stub marc
2014-10-22 12:01:05 -07:00
Raymond Yee
78ddf22c18
Merge branch 'master' into stub-marc
2014-10-22 02:04:00 +00:00
eric
892b970ae1
can download all records
2014-10-20 23:30:20 -04:00
eric
0f6aaa4bf1
load from lc record
2014-10-20 23:30:03 -04:00
eric
2feda33c4f
records now served out of db
2014-10-20 16:57:46 -04:00
eric
73003ba1c2
stub loader
2014-10-20 16:57:20 -04:00
eric
a5d3dfdf4f
add_author method
2014-10-20 16:54:19 -04:00
Raymond Yee
e56e2b4110
Merge pull request #401 from Gluejar/increase_recharge_window
...
increase recharge_window from 7 to 14 days to allow people more time
2014-10-19 16:32:08 -07:00
Raymond Yee
a391826e5c
increase recharge_window from 7 to 14 days to allow people more time
2014-10-19 16:30:59 -07:00
eric
29baf69d3c
record spitting now works
2014-10-17 22:48:51 -04:00
eric
9de0474386
start moving marc code to its own package
2014-10-17 17:14:02 -04:00
eric
7bfd807a74
Merge branch 'stub-marc' into marc_package
2014-10-17 17:12:36 -04:00
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