Commit Graph

1429 Commits (036a69b00637e383cbb88f1d7803e9ee0f53657f)

Author SHA1 Message Date
Nick Sergeant 036a69b006 Update nginx conf. 2014-10-06 11:11:20 -04:00
Nick Sergeant a867601fa9 Merge pull request #144 from ehazlett/control-updates-proxy
use custom snipt/proxy image
2014-10-06 10:50:03 -04:00
Evan Hazlett 81a560bec8
use custom snipt/proxy image 2014-10-06 10:48:04 -04:00
Nick Sergeant 0372224c28 Add underscore subdomain redirect back in nginx.conf. 2014-10-06 10:18:08 -04:00
Nick Sergeant c59801fd70 Fabfile update. 2014-09-30 16:06:12 -04:00
Nick Sergeant 0a7f18d068 Merge pull request #143 from ehazlett/env-updates
env for deploy
2014-09-26 12:12:13 -04:00
Evan Hazlett 0c845316ed
env for deploy 2014-09-26 12:11:18 -04:00
Nick Sergeant d5fa60445c Merge pull request #142 from ehazlett/env-updates
env for deploy
2014-09-26 12:07:03 -04:00
Evan Hazlett 941bcc416b
env for deploy 2014-09-26 12:02:06 -04:00
Nick Sergeant 2bf407f364 Fix host. 2014-09-26 12:01:23 -04:00
Nick Sergeant e26f095c45 Fabfile updates. 2014-09-26 11:49:09 -04:00
Nick Sergeant af53d76702 Fabfile updates. 2014-09-26 11:46:15 -04:00
Nick Sergeant 718c7423fa Merge pull request #141 from ehazlett/docker-updates
control updates for docker
2014-09-26 11:17:46 -04:00
Evan Hazlett b97bcab2f6
control updates for docker 2014-09-26 11:09:41 -04:00
Nick Sergeant 4dfadb11b8 Merge pull request #140 from ehazlett/control-updates
minor control updates
2014-09-26 10:30:20 -04:00
Evan Hazlett a7f778176d
minor control updates 2014-09-26 02:54:23 -04:00
Nick Sergeant b64e48521c Merge pull request #139 from ehazlett/snipt-deploy
snipt deploy
2014-09-26 02:21:01 -04:00
Nick Sergeant bbcc96f6a6 Merge pull request #138 from ehazlett/settings-ext
optional settings_local.py creation
2014-09-26 02:20:48 -04:00
Evan Hazlett d324837f53
snipt deploy 2014-09-26 02:20:27 -04:00
Evan Hazlett af5de163ae
optional settings_local.py creation 2014-09-26 02:16:58 -04:00
Nick Sergeant c5e6170351 Merge pull request #137 from ehazlett/favicon
fixed favicon link in nginx
2014-09-26 01:15:46 -04:00
Evan Hazlett a7431a5014
fixed favicon link in nginx 2014-09-26 01:13:10 -04:00
Nick Sergeant bfb7385be6 Merge pull request #136 from ehazlett/deploy-updates
restart proxy on deploy
2014-09-26 00:48:19 -04:00
Evan Hazlett e6b70cfb64
restart proxy on deploy 2014-09-26 00:47:44 -04:00
Nick Sergeant 24aa099200 Merge pull request #135 from ehazlett/control
added control scripts and updated deploy
2014-09-26 00:44:18 -04:00
Evan Hazlett f93fd521c1
added control scripts and updated deploy 2014-09-26 00:42:28 -04:00
Nick Sergeant fcb591c4c3 Merge pull request #134 from ehazlett/docker
dockerize
2014-09-25 23:28:36 -04:00
Evan Hazlett 7ad39d7235 initial work on docker support 2014-09-25 23:17:29 -04:00
Nick Sergeant 775a28f0f3 Intercom SHA tag and padding.: 2014-08-18 12:01:33 -04:00
Nick Sergeant e594401130 Remove Intercom widget. 2014-08-18 11:11:23 -04:00
Nick Sergeant 9c8eaa8c8f Intercom SHA tag. 2014-08-18 11:10:15 -04:00
Nick Sergeant d8850a087a Intercom. 2014-08-18 11:08:49 -04:00
Nick Sergeant c4cf6140b5 Cache bust. 2014-08-18 11:03:07 -04:00
Nick Sergeant fd96a1cdc8 Fix button. 2014-08-18 11:02:45 -04:00
Nick Sergeant 39b0e10a6a Promos for signup/Pro. 2014-08-18 11:00:49 -04:00
Nick Sergeant e87f0d2147 Installing @nicksergeant/humanitybox. 2014-07-30 00:03:05 -04:00
Nick Sergeant e1989b85d0 Don't show Olark for non-trial/non-pro users. 2014-07-29 15:54:15 -04:00
Nick Sergeant 47d63b0e6c Don't show Olark for non-trial/non-pro users. 2014-07-28 09:39:58 -04:00
Nick Sergeant d06b6ab180 Custom data for Olark. 2014-07-21 11:04:35 -04:00
Nick Sergeant cd84a1c868 Custom data for Olark. 2014-07-21 11:04:19 -04:00
Nick Sergeant 8a18b95884 Show Olark for everyone. 2014-07-21 10:37:45 -04:00
Nick Sergeant a004d49470 Switching from Intercom to Olark. 2014-07-21 10:36:51 -04:00
Nick Sergeant f456539993 Make Pro Adams blog theme the default. 2014-07-11 10:43:09 -04:00
Nick Sergeant f1239d2a9b Pro copy update. 2014-07-07 13:36:16 -04:00
Nick Sergeant 94562feb77 Move intercom pro_date. 2014-06-27 10:27:51 -04:00
Nick Sergeant c0db7657a7 Move intercom pro_date. 2014-06-27 10:26:17 -04:00
Nick Sergeant 2fac6bfc83 Migration for pro_date. 2014-06-27 10:24:48 -04:00
Nick Sergeant 48373f1fa9 Record when a user goes Pro. 2014-06-27 10:24:35 -04:00
Nick Sergeant 606a080fb2 What the fuck. 2014-06-27 10:16:38 -04:00
Nick Sergeant 60473baa0a JSmin. 2014-06-23 23:55:41 -04:00