eric
|
28291d436e
|
Merge branch 'master' into isbn-in-search
|
2016-05-10 17:32:45 -04:00 |
|
eric
|
3f833c569d
|
patch for django-registration
|
2016-05-10 17:15:01 -04:00 |
|
eric
|
160e45aeec
|
patch email-change
|
2016-05-10 17:14:24 -04:00 |
Raymond Yee
|
f4663c1c58
|
Merge pull request #574 from Gluejar/sysadmin
fixes in Vagrantfile while creating prod2
|
2016-05-10 11:57:55 -07:00 |
|
Raymond Yee
|
6ad84101de
|
Merge pull request #573 from Gluejar/fix_payment_import
Decimal is imported as D
|
2016-05-10 11:28:23 -07:00 |
|
Raymond Yee
|
795364a86e
|
Decimal is imported as D
|
2016-05-10 11:27:24 -07:00 |
|
Raymond Yee
|
c77c5b1b16
|
fix Vagrantfile error
|
2016-05-10 11:23:42 -07:00 |
|
Raymond Yee
|
a7223e0e55
|
change setdns for just
|
2016-05-10 10:22:03 -07:00 |
|
Raymond Yee
|
bff6092565
|
Merge pull request #557 from Gluejar/dj16
Django 1.6+ compatibility
|
2016-05-10 09:22:19 -07:00 |
|
Raymond Yee
|
d76c8d0d42
|
Merge pull request #572 from Gluejar/dj16ry
Merge changes I've made in dj16ry into dj16
|
2016-05-10 09:20:46 -07:00 |
|
Raymond Yee
|
60389ff7e0
|
get rid of placeholder for jenkins
|
2016-05-10 09:18:03 -07:00 |
|
Raymond Yee
|
17178f9840
|
update to Python 2.7.11 and apply security upgrades
|
2016-05-09 22:40:29 -07:00 |
|
eric
|
af7d0e867c
|
add isbn querey
if query is a valid isbn, then search on the identifier table
|
2016-05-09 21:48:23 -04:00 |
|
Raymond Yee
|
b03eb0328a
|
Merge branch 'dj16' into dj16ry
|
2016-05-09 17:45:59 -07:00 |
|
Raymond Yee
|
34b9df63ff
|
Merge branch 'master' into dj16
|
2016-05-09 17:45:41 -07:00 |
|
eric
|
50930ce2b1
|
send kindle from s3
add file archiving code, because we needed it for push distribution.
Also use archive for kindle. tweak send-to-kindle docs.
|
2016-05-09 18:32:38 -04:00 |
|
Raymond Yee
|
4422e5b609
|
Merge pull request #570 from Gluejar/sysadmin
vagrant/ansible for prod
|
2016-05-09 14:55:35 -07:00 |
|
Raymond Yee
|
c0afa2cc95
|
fix output log for prod.conf: switch from logrotate to cronolog
|
2016-05-09 14:52:46 -07:00 |
|
Raymond Yee
|
7d6c57dfa8
|
prod2 added to Vagrantfile
|
2016-05-09 14:48:50 -07:00 |
|
Raymond Yee
|
de7aee305b
|
Merge branch 'master' into sysadmin
|
2016-05-09 14:46:57 -07:00 |
|
Raymond Yee
|
1699c8af7d
|
add dump_db_prod.sh
|
2016-05-09 14:32:58 -07:00 |
|
Raymond Yee
|
3f9a7b15e5
|
define migrate
|
2016-05-09 14:26:24 -07:00 |
|
Raymond Yee
|
8211e5d3af
|
first pass at getting vagrant/ansible working for prod
|
2016-05-09 14:11:49 -07:00 |
|
Raymond Yee
|
87b4a68d70
|
Merge branch 'master' into dj16ry
|
2016-05-07 16:06:57 -07:00 |
|
Raymond Yee
|
a1c1b3a80e
|
Merge branch 'master' into dj16
|
2016-05-07 16:06:31 -07:00 |
|
Raymond Yee
|
ff8e7b6c9b
|
Merge pull request #569 from Gluejar/sysadmin
update vagrant+ansible playbooks to dev.yml, a unification of various playbooks
|
2016-05-07 15:35:27 -07:00 |
|
Raymond Yee
|
1222d677dc
|
switch to master
|
2016-05-07 15:20:48 -07:00 |
|
Raymond Yee
|
761cafa110
|
need host_var for just2 and prod2 also -- eventually should use group_vars but this works for now.
|
2016-05-07 14:50:10 -07:00 |
|
Raymond Yee
|
83a36414d5
|
need to load campaign_starter.sql (not 2) for pre-Django 1.6
|
2016-05-07 13:56:19 -07:00 |
|
Raymond Yee
|
d67c1f1d3e
|
load data for please but deal with jenkins for just
|
2016-05-07 13:41:47 -07:00 |
|
Raymond Yee
|
a4e2a87b4c
|
Merge branch 'sysadmin' into dj16ry
|
2016-05-07 09:45:06 -07:00 |
|
Raymond Yee
|
6dc511a754
|
pick up changes from dj16ry that aren't about the shift to Django 1.6
|
2016-05-07 09:42:14 -07:00 |
|
Raymond Yee
|
85a699e280
|
Merge branch 'sysadmin' into dj16ry
|
2016-05-07 09:30:30 -07:00 |
|
Raymond Yee
|
d3b27af491
|
now I have code for adding SECRET_KEY to servers as well as encrypted SECRET_KEY for various servers
|
2016-05-06 16:06:50 -07:00 |
|
eric
|
ee0d19810c
|
delete files when deleting ebookfiles
apparently the behavior changed after django 1.2. Anyway, we should
delete files from s3 before we delete the referring object
|
2016-05-06 15:28:19 -04:00 |
|
Raymond Yee
|
8b04769ebd
|
move to unified ansible in dev.yml and open up naming in settings/please.py
|
2016-05-06 09:59:32 -07:00 |
|
Raymond Yee
|
57b55785e6
|
please.yml + Vagrantfile works now for ansible 2.0.2
|
2016-05-05 16:43:02 -07:00 |
|
Raymond Yee
|
d1a5b45ad6
|
Merge branch 'dj16' into dj16ry
|
2016-05-04 14:04:16 -07:00 |
|
Raymond Yee
|
ba516cd08d
|
Merge branch 'master' into dj16
|
2016-05-04 13:52:25 -07:00 |
|
Raymond Yee
|
e2edac78b4
|
working on using a-play-aws.sh to use an inventory directory that comprise both vagrant computed inventory and static jenkins file
|
2016-05-04 13:47:16 -07:00 |
|
Raymond Yee
|
93ae8bca12
|
move from logrotate to cronolog
|
2016-05-02 15:58:20 -07:00 |
|
Raymond Yee
|
ea01dd51b2
|
Merge branch 'master' into sysadmin
|
2016-05-02 15:40:54 -07:00 |
|
Raymond Yee
|
e5c795a294
|
more of cronolog in just and please
|
2016-05-02 15:40:07 -07:00 |
|
Raymond Yee
|
170ffcf1ec
|
attempt to move from logrotate to cronolog
|
2016-05-02 14:56:35 -07:00 |
|
Raymond Yee
|
a7ac628af1
|
Merge branch 'master' into dj16ry
|
2016-05-02 08:13:13 -07:00 |
|
eshellman
|
3c94d49342
|
Merge pull request #567 from Gluejar/fix_collectstatic
try removing DefaultStorageFinder -- will this break the questionnaire?
|
2016-04-29 15:45:26 -04:00 |
|
Raymond Yee
|
ddb53fc5e9
|
try removing DefaultStorageFinder -- will this break the questionnaire?
|
2016-04-29 12:37:26 -07:00 |
|
Raymond Yee
|
574854ec5a
|
Merge pull request #565 from Gluejar/add-questionnaire
add the questionnaire module
|
2016-04-29 09:57:00 -07:00 |
|
Raymond Yee
|
ad8eeba9b6
|
Merge pull request #566 from Gluejar/fix_locale
separate out failing test
|
2016-04-29 09:01:02 -07:00 |
|
Raymond Yee
|
7ec9a98206
|
separate out failing test
|
2016-04-29 08:55:12 -07:00 |