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
|
fc4ca7dbc0
|
refine do_migrate for production in Vagrantfile
|
2016-09-08 17:52:25 -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
|
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
|
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 |
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
|
3a8cdccd36
|
Merge pull request #624 from Gluejar/fix_just_setting
DEBUGG -> DEBUG (don't know how this bug got in)
|
2016-09-07 14:40:31 -07:00 |
Raymond Yee
|
d44159e7db
|
DEBUGG -> DEBUG (don't know how this bug got in)
|
2016-09-07 14:39:55 -07:00 |
Raymond Yee
|
5996010642
|
Merge pull request #613 from Gluejar/dj18
Update to Django 1.8
|
2016-09-07 11:50:23 -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 |