Commit Graph

357 Commits

Author SHA1 Message Date
Andrew Brown
dab5d5f0ea Merge branch 'master' into rails5-upgrade 2018-08-15 16:31:37 -05:00
Andrew Brown
43528f6f61 Link deities to religions 2018-07-21 18:06:58 -05:00
Andrew Brown
a5784576b6 Add deity link to religions 2018-07-15 13:52:40 -05:00
Andrew Brown
59904a861d rails 5 prep 2018-07-05 01:10:52 -05:00
Tristan
01f58d99b8 restore routes 2018-07-04 20:48:40 -05:00
Tristan
52bac9fd48 restore i18n file 2018-07-04 20:47:38 -05:00
Tristan
3f3c3cb3e6 upgrade fixes 2018-07-04 20:46:21 -05:00
Tristan
79b626d9a2 rake rails:update 2018-07-04 20:14:51 -05:00
Tristan
63bdd37857 use new moderator flag 2018-06-19 21:17:02 -05:00
Tristan
0473c30a03 Gem upgrades 2018-06-05 21:41:46 -05:00
Andrew Brown
25b7cc9cc4 show unread counts 2018-02-11 17:00:41 -06:00
Andrew Brown
d9e4ccd500 Add race link to deity 2018-02-02 00:45:00 -06:00
Andrew Brown
7a5873603d Add deity and character siblings to deities 2018-02-02 00:19:14 -06:00
Andrew Brown
24f3f94f28 reorder fields on planet 2018-02-01 19:45:55 -06:00
Andrew Brown
e9ab0fe725 update landing page for new types 2018-02-01 18:11:39 -06:00
Andrew Brown
c8710951e5 add missing universe_id fields to new pages 2018-01-31 15:57:16 -06:00
Andrew Brown
a25d67a6ef context cards for everyone 2018-01-31 15:57:06 -06:00
Andrew Brown
786569315f add material uses to flora 2018-01-31 00:50:47 -06:00
Andrew Brown
9befdaad13 add classification to creatures 2018-01-31 00:47:22 -06:00
Andrew Brown
3ac56861d4 add requested relations 2018-01-31 00:39:08 -06:00
Andrew Brown
b0035ffdbe add magic link to items 2018-01-31 00:21:36 -06:00
Andrew Brown
a4ec437b06 new relations on locations 2018-01-31 00:18:32 -06:00
Andrew Brown
963c942779 new character relations 2018-01-31 00:09:15 -06:00
Andrew Brown
fdca8babe9 hook up deity, gov, and technologies relations 2018-01-30 23:47:44 -06:00
Andrew Brown
6969397b01 finalize planet relations 2018-01-30 22:53:34 -06:00
Andrew Brown
b4a56cacb1 Page type copy 2018-01-30 16:55:12 -06:00
Andrew Brown
9ce169ff61 new page type categories 2018-01-28 22:14:23 -06:00
Andrew Brown
7ee02b2e45 deity categories + rename universe technologies field to technology 2018-01-28 21:50:33 -06:00
Andrew Brown
9060f37e2a Sort sidebar premium pages alphabetically 2018-01-27 15:01:41 -06:00
Andrew Brown
55e7b9bfa9 Add government preconf 2018-01-27 14:32:43 -06:00
Andrew Brown
07e586d34c Add technology and deity 2018-01-27 14:22:36 -06:00
Andrew Brown
81c554450f Add Planet pre-configuring 2018-01-27 14:05:28 -06:00
Andrew Brown
12e20d7a24 Clean up export and frame planet page type 2018-01-27 13:47:54 -06:00
Andrew Brown
32a062e122 prep page create script 2018-01-27 13:19:25 -06:00
Andrew Brown
c6f94cf086 fix towns/countries/landmarks exports 2018-01-22 23:44:26 -06:00
Andrew Brown
4c5df18083 enable_starttls_auto for sendgrid and updated smtp port 2018-01-21 11:53:40 -06:00
Andrew Brown
fc87169ecc re-enable thredded emails 2018-01-20 09:14:44 -06:00
Andrew Brown
36a2448a27 re-enable forums 2018-01-19 13:44:16 -06:00
Andrew Brown
1234d0ac3d increase rack timeout from 5 to 20 seconds 2018-01-19 12:54:24 -06:00
Andrew Brown
73deb8ea95 disable prepared statements again 2018-01-18 23:31:53 -06:00
Andrew Brown
8f3c49b4b7 temporarily disable the forums 2018-01-18 22:40:07 -06:00
Andrew Brown
0457079965 decrease timeout to 5 sec 2018-01-18 21:19:55 -06:00
Andrew Brown
7c60c60fbc decrease rack timeout from 30 sec to 20 sec 2018-01-18 21:09:46 -06:00
Andrew Brown
6015971b50 Revert "disable prepared statements"
This reverts commit cdf1ffecb4.
2018-01-18 20:52:43 -06:00
Andrew Brown
2d5bb8a7c4 lower workers in main thread to 0???? 2018-01-18 20:02:10 -06:00
Andrew Brown
34d30bcac4 disable emails from the forums temporarily 2018-01-18 19:36:43 -06:00
Andrew Brown
cdf1ffecb4 disable prepared statements 2018-01-18 16:44:29 -06:00
Andrew Brown
72ee035b16 improve admin stats panel 2018-01-12 00:12:30 -06:00
Andrew Brown
22f7665aed Temporarily comment out triggers for sending payment-related emails 2018-01-09 00:25:58 -06:00
Ahmad Saleem
1525a6d0ea Fix typo. 2018-01-08 00:48:17 +05:00