b4a03a5133
Merge branch 'master' into design-pass-tweaks
2017-02-02 07:55:41 -03:00
17eefeea15
Merge branch 'master' into mobile-width-fix
2017-02-01 12:16:57 -05:00
bc6c77176e
Fixing error in styling.
2017-02-01 12:11:12 -05:00
3ca263bcfb
Updating mock article template to support mobile widths.
2017-01-31 14:23:15 -05:00
3d83c246f7
simplify email text
2017-01-31 12:08:59 -07:00
e63e1f3428
Merge branch 'master'
...
Conflicts:
errors.js
test/routes/api/auth/index.js
2017-01-31 12:05:16 -07:00
7a227dff91
Notification in the CommentStream Working
2017-01-30 15:11:16 -03:00
5e521b832c
add a confirm-email landing page
2017-01-27 15:04:42 -07:00
f06edec6a2
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
2017-01-26 16:38:43 -05:00
c4256fd27b
Ditch console logs
2017-01-25 17:44:21 -05:00
31abe57cb2
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
...
Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
2017-01-25 17:15:12 -05:00
1f1b1d43ae
Add useful links
2017-01-25 15:27:38 -05:00
29e69a66bb
Add basic index page for assets
2017-01-25 15:23:02 -05:00
ad9684acd9
Create load stream by id route
2017-01-25 14:08:19 -05:00
7c3f566202
Handling links inside of iframe in via Pym.
2017-01-24 16:21:49 -05:00
ce73118f53
Loading history links in parent page.
2017-01-24 16:04:03 -05:00
9e22c100f0
Added admin login form (naive approach)
2017-01-23 16:31:37 -07:00
e69262c665
Community Section Ready
2017-01-13 17:11:46 -03:00
4a4affad70
More Design Tweaks
2017-01-12 09:16:23 -03:00
a2704e3099
Updating user email address.
2017-01-09 18:15:25 -05:00
226af72ac9
Adding Roboto
2017-01-09 12:54:28 -03:00
0f24ab6b28
Merge branch 'master' of github.com:coralproject/talk into moderate-bio
2017-01-06 15:56:03 -05:00
565e34e09d
Adding endpoint for admins to send transactional e-mail.
2017-01-06 14:29:50 -05:00
4eb7c72ae2
Merge branch 'master' into email-confirm
2017-01-05 18:45:06 -07:00
cabe546ecf
Added email send on new user if enabled for confirming
2017-01-05 17:19:38 -07:00
a7680ae5d9
Initial pass at email confirmation
2017-01-03 17:35:58 -07:00
ec3e9d1cd4
Merge branch 'master' into csrf
2016-12-22 14:23:01 -08:00
652a41971b
Merge branch 'master'
...
Conflicts:
client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
2016-12-20 14:51:36 -07:00
16a4daaeb3
Merge branch 'master' into csrf
2016-12-20 13:46:08 -08:00
706cefad9e
simplify wordlist ui further
2016-12-19 16:49:05 -07:00
123ba07b63
add tag package to simplify wordlist ui
2016-12-19 16:43:00 -07:00
67aeb223d6
Login tests
2016-12-18 13:07:16 -03:00
d8d30e512b
Only on POST check for CSRF.
2016-12-16 16:02:45 -08:00
d229d5a96f
Updating route to davidjay.
2016-12-09 19:28:19 -05:00
b2b9b0ec42
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
2016-11-30 17:55:39 -05:00
ef172cabfc
Scroll to comment ( #92 )
...
* host pym locally
* host pym. fix some permalink styles
* get url from parent document
* reset copy dialog timeout
* use pym.parentUrl instead of depending on the parent document
* use a simpler method to find the url
* add some horrible setInterval code
* add some awesome polling
* merge master
* bail out of comment look up after 10 seconds
* re-update permalink attrs
* re-add my listeners to article.ejs
* allow for overriding the talk db name in an environment var
2016-11-29 17:19:56 -05:00
3c903ddd6d
Merge branch 'master' into stream-e2e
2016-11-29 10:41:50 -07:00
b0f01cf00f
Initial commit of asset queuing ( #97 )
...
* Initial commit of asset queuing
* Addresssing comments
2016-11-28 13:29:39 -05:00
a022ef8a52
Restore embed/stream.ejs
2016-11-25 10:50:30 -05:00
93cd4ea74c
Remove non-standard stream embed template
2016-11-25 10:43:32 -05:00
3030bf4f22
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
2016-11-22 15:04:36 -05:00
dd060c5fd1
Signing in via e2e and posting comment.
2016-11-21 21:23:48 -05:00
ae1002fbbf
update to root url
2016-11-21 16:36:07 -07:00
a0469301bb
add password reset form
2016-11-21 16:32:07 -07:00
b1824cdc01
Merge branch 'master' of github.com:coralproject/talk into passport
2016-11-18 06:08:23 -03:00
c967587b95
Pym and Iframe support embed
2016-11-17 11:40:11 -03:00
f1320c7f04
Merge branch 'master' of github.com:coralproject/talk into passport
2016-11-17 10:54:16 -03:00
6e932b840e
merge master. load reset password template from a view
2016-11-16 15:32:44 -07:00
9a2eacabb3
Adding faux multi-article functionality
2016-11-16 12:25:33 -05:00
a5b8856905
Add moderation link to sample page
2016-11-16 12:00:46 -05:00
Belén Curcio