eric
|
4ba5104e06
|
move UnicodeWriter to utils
|
2016-09-28 18:42:55 -04:00 |
|
eric
|
fc56744371
|
FileWrapper not needed, is broken
|
2016-09-28 18:40:57 -04:00 |
|
eshellman
|
ee0e8be670
|
Merge pull request #634 from Gluejar/fix_lockss
[WIP] work.authors() returns list of all authors
|
2016-09-23 15:35:56 -04:00 |
Raymond Yee
|
81524ac5f0
|
work.authors() returns list of all authors
|
2016-09-23 10:16:26 -07:00 |
|
Raymond Yee
|
eebd00ccd9
|
Merge pull request #633 from Gluejar/fix-missing-pass-reset-template
copy html template to txt
|
2016-09-20 08:07:09 -07:00 |
|
eric
|
c730d70ea1
|
copy html template to txt
|
2016-09-20 08:18:38 -04:00 |
|
Raymond Yee
|
ee32ea3940
|
Merge pull request #632 from Gluejar/dj18
turn maintenance mode off for prod
|
2016-09-08 18:57:02 -07:00 |
|
Raymond Yee
|
ba09e40f72
|
Merge branch 'dj18' of github.com:Gluejar/regluit into dj18
|
2016-09-08 18:56:02 -07:00 |
|
Raymond Yee
|
aed8549156
|
turn maintenance for prod off
|
2016-09-08 18:55:39 -07:00 |
|
Raymond Yee
|
2bbbd14940
|
Merge pull request #631 from Gluejar/dj18
merge postdj18 stuff into master
|
2016-09-08 18:48:14 -07:00 |
|
Raymond Yee
|
ea2cf838e4
|
Merge pull request #615 from Gluejar/postdj18
empty the repair migration
|
2016-09-08 18:46:50 -07:00 |
|
Raymond Yee
|
b75193ee1d
|
Merge pull request #630 from Gluejar/dj18
put production into maintenance
|
2016-09-08 18:29:51 -07:00 |
|
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
|
412de90dc0
|
Merge pull request #629 from Gluejar/dj18
refine do_migrate for production in Vagrantfile
|
2016-09-08 17:53:17 -07:00 |
|
Raymond Yee
|
fc4ca7dbc0
|
refine do_migrate for production in Vagrantfile
|
2016-09-08 17:52:25 -07:00 |
|
Raymond Yee
|
b71ae06198
|
Merge pull request #628 from Gluejar/dj18
take just out of maintenance mode
|
2016-09-08 11:43:47 -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
|
46a37a0e36
|
Merge pull request #627 from Gluejar/dj18
hopefully, updating django-maintenancemode will fix dj 1.8 compatibility issue
|
2016-09-08 08:05:54 -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
|
1d38dd5ccf
|
Merge pull request #626 from Gluejar/dj18
update update-just and update-prod
|
2016-09-07 19:28:30 -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 |