 Kim Gardner
|
82e3d73d2d
|
Merge pull request #143 from coralproject/format-readme
Fix formatting
|
2016-12-08 13:38:03 -10:00 |
|
|
Riley Davis
|
0bbefa071e
|
Merge branch 'master' into format-readme
|
2016-12-08 13:17:23 -10:00 |
|
|
Gabriela Rodríguez Berón
|
cfb1b75b39
|
Merge pull request #137 from coralproject/payload-filtering
Add payload filtering and status_history updates
|
2016-12-08 13:08:12 -10:00 |
|
|
Gabriela Rodríguez Berón
|
be632ada47
|
Merge branch 'master' into payload-filtering
|
2016-12-08 13:05:14 -10:00 |
|
|
Kim Gardner
|
7ce44ccd8c
|
More formatting
|
2016-12-08 12:53:39 -10:00 |
|
|
Riley Davis
|
b129d91e9f
|
Merged branch payload-filtering into payload-filtering
|
2016-12-08 12:51:58 -10:00 |
|
|
Riley Davis
|
500dafbafa
|
riley being anal
|
2016-12-08 12:51:45 -10:00 |
|
|
Kim Gardner
|
c8d0fae097
|
Fix formatting
|
2016-12-08 12:50:12 -10:00 |
|
|
Kim Gardner
|
26e3f1d851
|
Merge pull request #136 from coralproject/update-talk-docs
Update config notes
|
2016-12-08 12:41:50 -10:00 |
|
|
Kim Gardner
|
501df52cf8
|
Merge branch 'master' into update-talk-docs
|
2016-12-08 12:37:05 -10:00 |
|
|
Wyatt Johnson
|
d95d9aa8e3
|
Merge branch 'master' into payload-filtering
|
2016-12-08 17:28:50 -05:00 |
|
|
Jeff Nelson
|
7ee4f3c7cb
|
Merge pull request #142 from coralproject/create-user-w-role
Create user with a role
|
2016-12-08 12:27:45 -10:00 |
|
|
Wyatt Johnson
|
c90c125dbd
|
Merge branch 'master' into create-user-w-role
|
2016-12-08 17:24:47 -05:00 |
|
|
Wyatt Johnson
|
bc88cd1e9d
|
Adjusted promise
|
2016-12-08 17:23:31 -05:00 |
|
|
Riley Davis
|
4572d8e68e
|
filter by premod status
|
2016-12-08 12:20:54 -10:00 |
|
|
gaba
|
a86b5f84ac
|
Adds a role option when creating the user.
|
2016-12-08 12:18:53 -10:00 |
|
|
gaba
|
413db123c4
|
Type on comment.
|
2016-12-08 12:18:19 -10:00 |
|
|
Kim Gardner
|
104a00a22f
|
Merge branch 'master' into update-talk-docs
|
2016-12-08 11:52:35 -10:00 |
|
|
Wyatt Johnson
|
df712e4efe
|
Merge branch 'master' into payload-filtering
|
2016-12-08 16:15:32 -05:00 |
|
|
Wyatt Johnson
|
42b2b5fd82
|
Merge pull request #139 from coralproject/revert-138-revert-128-status-history
Revert "Revert "Status history""
|
2016-12-08 16:15:24 -05:00 |
|
|
Wyatt Johnson
|
aaebbabef9
|
Revert "Revert "Status history""
|
2016-12-08 16:12:44 -05:00 |
|
|
Riley Davis
|
a81125ae09
|
Merge pull request #138 from coralproject/revert-128-status-history
Revert "Status history"
|
2016-12-08 11:09:17 -10:00 |
|
|
David Erwin
|
9ea6c66744
|
Revert "Status history"
|
2016-12-08 10:59:56 -10:00 |
|
|
Wyatt Johnson
|
aa7892ede7
|
Merge branch 'master' into payload-filtering
|
2016-12-08 15:58:51 -05:00 |
|
|
Wyatt Johnson
|
3d35183e67
|
Add payload filtering and status_history updates
|
2016-12-08 15:56:52 -05:00 |
|
|
Kim Gardner
|
1c5dffc94c
|
Add product links
|
2016-12-08 10:05:38 -10:00 |
|
|
Kim Gardner
|
7c4208fa16
|
Update config notes
|
2016-12-08 10:04:10 -10:00 |
|
|
David Erwin
|
e7fd77a45e
|
Merge pull request #135 from coralproject/arch-diag
Architecture Diagram.
|
2016-12-08 09:27:17 -10:00 |
|
|
gaba
|
74bef9dc94
|
Clean the text.
|
2016-12-08 09:13:34 -10:00 |
|
|
gaba
|
d52ff11f41
|
Architecture Diagram.
|
2016-12-08 09:02:45 -10:00 |
|
|
Belén Curcio
|
35a18c874b
|
Merge pull request #125 from coralproject/like-login-prompt
Adjusting height of login button to match current comment
|
2016-12-08 15:56:17 -03:00 |
|
|
Belén Curcio
|
0c050bdec9
|
Merge branch 'master' into like-login-prompt
|
2016-12-08 15:53:16 -03:00 |
|
|
David Jay
|
5e06560a99
|
Merge branch 'like-login-prompt' of github.com:coralproject/talk into like-login-prompt
|
2016-12-08 13:50:12 -05:00 |
|
|
David Jay
|
e91564f706
|
Merge branch 'master' of github.com:coralproject/talk into like-login-prompt
|
2016-12-08 13:49:15 -05:00 |
|
|
Riley Davis
|
5fbe1dee0b
|
Merge pull request #130 from coralproject/bugfix-for-permalink-path
restoring the scroll to comment functionality
|
2016-12-08 08:41:21 -10:00 |
|
|
Riley Davis
|
ab8f2b438f
|
Merge branch 'master' into bugfix-for-permalink-path
|
2016-12-07 16:16:09 -10:00 |
|
|
Kim Gardner
|
c9548e1d89
|
Merge pull request #132 from coralproject/smtp-settings-v2
add host and port because GCP is silly
|
2016-12-07 15:15:06 -10:00 |
|
|
Riley Davis
|
9f360cf780
|
make the provider an env var
|
2016-12-07 15:03:49 -10:00 |
|
|
Riley Davis
|
f7fa0ae866
|
make PORT and HOST optional
|
2016-12-07 15:01:07 -10:00 |
|
|
Riley Davis
|
5d4abf7269
|
add host and port because GCP is silly
|
2016-12-07 14:55:12 -10:00 |
|
|
Kim Gardner
|
bbf476a7ee
|
Merge pull request #131 from coralproject/pw-reset-logs
Pw reset logs
|
2016-12-07 14:09:32 -10:00 |
|
|
Riley Davis
|
a4af29cfa0
|
put things back
|
2016-12-07 11:32:42 -10:00 |
|
|
Riley Davis
|
25cc1ecb20
|
remove debug statements
|
2016-12-07 11:23:59 -10:00 |
|
|
Riley Davis
|
7012684c23
|
correct error logs
|
2016-12-07 11:06:09 -10:00 |
|
|
Riley Davis
|
1c2b2c142e
|
change the environment vars. can't use sendgrid connection string
|
2016-12-07 11:04:57 -10:00 |
|
|
Riley Davis
|
d2ba04def1
|
add a comma
|
2016-12-07 10:28:58 -10:00 |
|
|
Riley Davis
|
61c0af93e3
|
add some debug statements so we can figure out why pw reset doesn't work in staging
|
2016-12-07 10:28:01 -10:00 |
|
|
Riley Davis
|
e56583e250
|
Merge branch 'master' into bugfix-for-permalink-path
|
2016-12-07 09:11:22 -10:00 |
|
|
David Jay
|
0d97b91903
|
Merge pull request #126 from coralproject/i18n-var
Adds a variable to the possible translations.
|
2016-12-07 11:44:10 -05:00 |
|
|
Riley Davis
|
260d1bd9f4
|
restoring the scroll to comment functionality
|
2016-12-06 16:29:40 -10:00 |
|