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
|
6ef3e5f37f
|
Merge branch 'dj18' into postdj18
|
2016-09-07 19:18:56 -07:00 |
Raymond Yee
|
29d8678646
|
update just.wsgi and regluit.wsgi to match please.wsgi
|
2016-09-07 19:18:21 -07:00 |
Raymond Yee
|
d191279033
|
DEBUGG->DEBUG
|
2016-09-07 15:15:23 -07:00 |
Raymond Yee
|
66f57c3869
|
DEBUGG -> DEBUG
|
2016-09-07 15:14:35 -07:00 |
Raymond Yee
|
c1c6b5ccbc
|
don't migrate on just or production
|
2016-09-07 11:46:41 -07:00 |
Raymond Yee
|
8aceb005c9
|
integrate vagrant changes for building please into dj18
|
2016-09-07 10:45:53 -07:00 |
Raymond Yee
|
11b975be67
|
making changes to build please using vagrant/ansible after dj18 and postdj18 merged
|
2016-09-07 10:17:24 -07:00 |
Raymond Yee
|
5716e04cd6
|
Merge branch 'master' into postdj18
|
2016-09-07 10:13:44 -07:00 |
Raymond Yee
|
24dc3c578d
|
Merge branch 'master' into dj18
|
2016-09-07 09:59:19 -07:00 |
Raymond Yee
|
96cabccafd
|
Merge pull request #623 from Gluejar/just_maintenance_mode
put just into MAINTENANCE_MODE
|
2016-09-07 09:38:50 -07:00 |
Raymond Yee
|
6a86ffae07
|
put just into MAINTENANCE_MODE
|
2016-09-07 09:37:54 -07:00 |
Raymond Yee
|
9138835be7
|
Merge branch 'dj18' into postdj18
|
2016-09-06 17:19:44 -07:00 |
Raymond Yee
|
62f44bee19
|
Merge branch 'master' into dj18
|
2016-09-06 17:18:28 -07:00 |
Raymond Yee
|
eebe41a30f
|
Merge pull request #622 from Gluejar/update_proddb
turn off maintenance mode on just and prod
|
2016-09-03 15:29:39 -07:00 |
Raymond Yee
|
4b8cd2228f
|
turn off maintenance mode on just and prod
|
2016-09-03 15:28:35 -07:00 |
Raymond Yee
|
d7f1ba9314
|
Merge pull request #621 from Gluejar/update_proddb
put production into maintenance mode
|
2016-09-03 14:57:31 -07:00 |
Raymond Yee
|
fe36cf83b5
|
Merge branch 'master' into update_proddb
|
2016-09-03 14:56:51 -07:00 |
Raymond Yee
|
f68377a5ec
|
put production into maintenance mode
|
2016-09-03 14:55:51 -07:00 |
Raymond Yee
|
d077a18488
|
Merge pull request #620 from Gluejar/update_proddb
put just in maintenance mode (to remind myself how to do so)
|
2016-09-03 14:52:51 -07:00 |
Raymond Yee
|
708634b99a
|
put just in maintenance mode (to remind myself how to do so) before doing so for production
|
2016-09-03 14:51:07 -07:00 |
Raymond Yee
|
60d3ae7ce9
|
Merge pull request #619 from Gluejar/justdb1
change just to connect to the justdb1 MySQL 5.6.27 RDS instance
|
2016-09-02 16:48:28 -07:00 |
Raymond Yee
|
766543d8ab
|
change just to connect to the justdb1 MySQL 5.6.27 RDS instance
|
2016-09-02 16:45:27 -07:00 |
Raymond Yee
|
e8198faad2
|
Merge pull request #618 from Gluejar/fix_dump
modify script used to dump sql to include table definition for core_key
|
2016-08-30 15:19:15 -07:00 |
Raymond Yee
|
5dbcee7213
|
modify script used to dump sql to include table definition for core_key
|
2016-08-30 13:26:11 -07:00 |
eric
|
b72091f5e4
|
Merge branch 'dj18' into postdj18
|
2016-08-26 13:37:39 -04:00 |
Raymond Yee
|
c1f553f113
|
syntax error fix
|
2016-08-25 17:17:18 -04:00 |
Raymond Yee
|
07025dc6d0
|
Merge pull request #616 from Gluejar/fix-unglueitar
unicode unglueitars were broken
|
2016-08-25 16:58:08 -04:00 |
eric
|
ccc8cd4fa8
|
unicode unglueitars were broken
|
2016-08-25 16:06:40 -04:00 |
eric
|
205af6876d
|
fix unicode unglueitar
|
2016-08-25 16:02:54 -04:00 |
Raymond Yee
|
d7a9bdb76e
|
Merge pull request #614 from Gluejar/updatepdf
update PyPDF2
|
2016-08-09 13:21:00 -07:00 |
Raymond Yee
|
006dc54c7b
|
remove extra pyasn dependency
|
2016-08-08 17:28:27 -07:00 |
eric
|
0600078c27
|
empty the repair migration
|
2016-07-29 18:49:08 -04:00 |
eric
|
33a1482cc7
|
refactor libraryauth
try to keep all the user reg stuff in libraryauth, in prep for
splitting it off
|
2016-07-28 15:28:05 -04:00 |
eric
|
4ff63359b3
|
migration to repair db
The migrations needed to migrate our db to django 1.8 are as follows:
django-admin.py migrate default 0001_initial --fake
django-admin.py migrate --fake-initial auth
django-admin.py migrate default 0002_add_related_name --fake
django-admin.py migrate core --fake
django-admin.py migrate libraryauth
django-admin.py migrate --fake-initial
|
2016-07-28 10:10:05 -04:00 |
eric
|
c7ddfa1fed
|
context_instance is deprecated
https://docs.djangoproject.com/en/1.9/releases/1.8/#dictionary-and-conte
xt-instance-arguments-of-rendering-functions
|
2016-07-27 14:49:10 -04:00 |
eric
|
006aeaf66f
|
reverse by path is deprecated
https://docs.djangoproject.com/en/1.9/releases/1.8/#s-id3
|
2016-07-27 14:01:22 -04:00 |
eric
|
827c33e7a0
|
Deprecated template settings
https://docs.djangoproject.com/en/1.9/releases/1.8/#s-template-related-s
ettings
|
2016-07-27 13:48:12 -04:00 |
eric
|
ac541ec1a0
|
patterns in urlpatterns are deprecated
https://docs.djangoproject.com/en/1.9/releases/1.8/#s-django-conf-urls-p
atterns
Also, moved edit_user to libraryauth module with the rest of our user
reg and auth.
|
2016-07-27 13:02:47 -04:00 |
eric
|
65007e1c9d
|
contenttypes.generic is deprecated
|
2016-07-26 17:43:19 -04:00 |
eric
|
7bf32de3f5
|
update PyPDF2
We have one ebook that fails adding an ask page. This update includes a
fix (submitted by me, I think.)
|
2016-07-26 16:58:44 -04:00 |
eric
|
4adf6917ff
|
refactor admin
|
2016-07-26 10:34:45 -04:00 |
eric
|
c457b268ec
|
modernize some heavily used templates
|
2016-07-25 14:50:19 -04:00 |
eric
|
06d240f5e4
|
Fix a TypeError raised by a thanks campaign with no ebook
https://docs.djangoproject.com/en/1.9/releases/1.7/#templates
|
2016-07-25 13:15:53 -04:00 |
eric
|
cd9e2cf8ea
|
fix more tests
|
2016-07-25 11:32:24 -04:00 |
eric
|
e6c3b226f9
|
REQUEST is deprecated
|
2016-07-25 11:32:04 -04:00 |
eric
|
8f4ca12483
|
fixed premium editing as validation is triggered by data
|
2016-07-24 18:50:48 -04:00 |
eric
|
09fe1a5d32
|
switch from deprecated get_model a app registry
|
2016-07-24 18:39:36 -04:00 |
eric
|
da7b3171ce
|
Use django's system check instead
|
2016-07-24 16:28:07 -04:00 |