 Belen Curcio
|
fa4ef2cab0
|
Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings
|
2016-12-08 19:34:10 -03:00 |
|
|
Belen Curcio
|
77ae7f1329
|
Merge branch 'asset-comment-settings' of github.com:coralproject/talk into asset-comment-settings
|
2016-12-08 19:33:39 -03: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 |
|
|
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 |
|
|
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 |
|
|
Belen Curcio
|
acbd465636
|
merge
|
2016-12-08 16:37:11 -03:00 |
|
|
Belen Curcio
|
59182e75d3
|
Translations
|
2016-12-08 16:32:39 -03:00 |
|
|
David Erwin
|
e7fd77a45e
|
Merge pull request #135 from coralproject/arch-diag
Architecture Diagram.
|
2016-12-08 09:27:17 -10:00 |
|
|
Belen Curcio
|
74e4771e17
|
new config
|
2016-12-08 16:21:07 -03: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 |
|
|
Belen Curcio
|
be721b85c6
|
204 response
|
2016-12-08 14:39:05 -03:00 |
|
|
Belen Curcio
|
c1ba2d432e
|
Replacing res.send by res.json
|
2016-12-08 13:43:21 -03:00 |
|
|
Riley Davis
|
ab8f2b438f
|
Merge branch 'master' into bugfix-for-permalink-path
|
2016-12-07 16:16:09 -10:00 |
|
|
Belén Curcio
|
fc79307e28
|
Merge branch 'master' into asset-comment-settings
|
2016-12-07 22:48:34 -03: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 |
|
|
Belen Curcio
|
ebf9754287
|
merge
|
2016-12-07 10:58:30 -03:00 |
|
|
Riley Davis
|
260d1bd9f4
|
restoring the scroll to comment functionality
|
2016-12-06 16:29:40 -10:00 |
|
|
Riley Davis
|
1201196566
|
un-sneaking in some stuff
|
2016-12-06 15:51:22 -10:00 |
|
|
Riley Davis
|
f2ded3f2a7
|
replace things multiple times
|
2016-12-06 14:34:27 -10:00 |
|
|
Riley Davis
|
31c87cb93f
|
make the translation function accept n arguments. ninja bugfix to permalink
|
2016-12-06 14:17:01 -10:00 |
|
|
Riley Davis
|
f2c751f9f0
|
Merge branch 'master' into i18n-var
|
2016-12-06 13:41:44 -10:00 |
|
|
David Jay
|
b88c413d09
|
Merge pull request #128 from coralproject/status-history
Status history
|
2016-12-06 12:43:14 -05:00 |
|
|
Belen Curcio
|
e751d91794
|
typo
|
2016-12-06 14:21:02 -03:00 |
|
|
Belen Curcio
|
8036b4790d
|
Notifications
|
2016-12-06 14:09:36 -03:00 |
|
|
Wyatt Johnson
|
5298efa89f
|
Adjusting based on PR feedback, added public filter to settings object
|
2016-12-06 11:55:15 -05:00 |
|
|
Wyatt Johnson
|
d2d4640eee
|
Merge branch 'master' into status-history
|
2016-12-06 11:08:00 -05:00 |
|