 Belén Curcio
|
a4dabd0308
|
Merge branch 'master' into dep-upgrade
|
2017-03-27 08:41:17 -03:00 |
|
|
Kim Gardner
|
a1f200de37
|
Merge pull request #436 from coralproject/translations
Translations
v1.3.0
|
2017-03-24 16:46:21 -04:00 |
|
|
gaba
|
680919dd0e
|
Making more sense.
|
2017-03-24 11:53:51 -07:00 |
|
|
Gabriela Rodríguez Berón
|
c51a4ff228
|
Merge branch 'master' into translations
|
2017-03-24 11:33:16 -07:00 |
|
|
Kim Gardner
|
596b7f538a
|
Merge pull request #439 from coralproject/highlighter-wordz
highlight suspect, banned words and links
|
2017-03-24 13:19:26 -04:00 |
|
|
Wyatt Johnson
|
228fdeac4d
|
Removed root .babelrc file, upgrades
- Upgraded packages
- Fixed sourcemaps
- Moved .babelrc config into client folder
- Created .babelrc in tests folder for client tests
|
2017-03-24 11:12:57 -06:00 |
|
|
Kim Gardner
|
67da144391
|
Merge branch 'master' into highlighter-wordz
|
2017-03-24 12:58:24 -04:00 |
|
|
Kim Gardner
|
deb1d558fe
|
Merge pull request #438 from coralproject/keep-on-keeping-on
always show moderation link to admins
|
2017-03-24 12:55:50 -04:00 |
|
|
Wyatt Johnson
|
05efbc4ded
|
Updated lockfile
|
2017-03-24 10:15:03 -06:00 |
|
|
riley
|
6b6d3d8bbb
|
highlight suspect, banned words and links
|
2017-03-23 16:09:36 -06:00 |
|
|
Riley Davis
|
7f1b993ea6
|
always show moderation link to admins
|
2017-03-23 13:04:37 -06:00 |
|
|
Riley Davis
|
c1baccae5a
|
Merge pull request #435 from coralproject/reset-password-redirect
redirect to the parent url when resetting your password
|
2017-03-23 12:59:31 -06:00 |
|
|
Riley Davis
|
984514d7eb
|
check whitelist before redirecting
|
2017-03-23 12:46:20 -06:00 |
|
|
Riley Davis
|
67e04bf156
|
Merge branch 'master' into reset-password-redirect
|
2017-03-23 10:29:05 -06:00 |
|
|
David Erwin
|
7e65ba6371
|
Merge pull request #437 from coralproject/revert-370-story-138187767-mod-flag-names
Revert "Story 138187767 - Moderate Flag User Names"
|
2017-03-23 11:22:28 -04:00 |
|
|
David Erwin
|
903aa23f19
|
Revert "Story 138187767 - Moderate Flag User Names"
|
2017-03-23 11:18:55 -04:00 |
|
|
David Erwin
|
03aebd7840
|
Merge pull request #432 from coralproject/my-comments-ux
My Comments / Profile Tab UX
|
2017-03-23 10:57:40 -04:00 |
|
|
David Erwin
|
53ba313f57
|
Merge branch 'master' into my-comments-ux
|
2017-03-23 10:53:47 -04:00 |
|
|
David Erwin
|
da8e632fd3
|
Merge pull request #433 from coralproject/design-more
Design UX - #141430305
|
2017-03-23 10:53:32 -04:00 |
|
|
David Erwin
|
6c83b2e60d
|
Merge branch 'master' into design-more
|
2017-03-23 10:49:26 -04:00 |
|
|
David Erwin
|
ae457f1951
|
Merge branch 'master' into my-comments-ux
|
2017-03-23 10:40:00 -04:00 |
|
|
David Erwin
|
907f7173fb
|
Merge pull request #430 from coralproject/admin-ux
Admin UX
|
2017-03-23 10:39:18 -04:00 |
|
|
David Erwin
|
a01c6f0f78
|
Merge branch 'master' into admin-ux
|
2017-03-23 09:04:36 -04:00 |
|
|
Belen Curcio
|
23833886bb
|
missing tab name
|
2017-03-23 09:51:26 -03:00 |
|
|
Belen Curcio
|
464539d6a3
|
missing tab name
|
2017-03-23 09:50:18 -03:00 |
|
|
Riley Davis
|
375ff08584
|
Merge branch 'master' into reset-password-redirect
|
2017-03-22 18:45:40 -06:00 |
|
|
Gabriela Rodríguez Berón
|
849be3d5fd
|
Merge branch 'master' into translations
|
2017-03-22 17:31:28 -07:00 |
|
|
gaba
|
35c8e1b5f9
|
Check spanish translations
|
2017-03-22 17:27:43 -07:00 |
|
|
gaba
|
4cbd6ebad2
|
Mooore translations.
|
2017-03-22 16:21:40 -07:00 |
|
|
Gabriela Rodríguez Berón
|
ae96cb1e44
|
Merge branch 'master' into my-comments-ux
|
2017-03-22 16:18:45 -07:00 |
|
|
Riley Davis
|
4b0d0fed53
|
unused variable
|
2017-03-22 17:10:11 -06:00 |
|
|
Riley Davis
|
fb2f8ef074
|
redirect to the parent url when resetting your password
|
2017-03-22 16:49:34 -06:00 |
|
|
Riley Davis
|
c6401a2d08
|
Merge pull request #434 from coralproject/asset-url
asset_url and canonical link tags
|
2017-03-22 15:51:08 -06:00 |
|
|
Riley Davis
|
7af16471cd
|
if the asset_url is not present, attempt to find the canonical link tag. if not, warn the user and strip the query params.
|
2017-03-22 15:41:06 -06:00 |
|
|
gaba
|
27a8c994a8
|
Fixing more translations
|
2017-03-22 13:19:08 -07:00 |
|
|
Belen Curcio
|
0bae6fe76c
|
design tweaks
|
2017-03-22 17:06:41 -03:00 |
|
|
Belén Curcio
|
1e54a997d6
|
Merge branch 'master' into my-comments-ux
|
2017-03-22 16:25:06 -03:00 |
|
|
Belen Curcio
|
85d235bf37
|
Merge branch 'my-comments-ux' of github.com:coralproject/talk into my-comments-ux
|
2017-03-22 16:23:00 -03:00 |
|
|
Riley Davis
|
d8e92968a5
|
Merge branch 'master' into admin-ux
|
2017-03-22 13:22:21 -06:00 |
|
|
Belen Curcio
|
4f50e8f19c
|
Removing tests for now until we find a better solution for this
|
2017-03-22 16:19:05 -03:00 |
|
|
gaba
|
78e7951ad7
|
Merge branch 'master' into translations
|
2017-03-22 12:11:52 -07:00 |
|
|
Gabriela Rodríguez Berón
|
82068cd20e
|
Merge pull request #370 from coralproject/story-138187767-mod-flag-names
Story 138187767 - Moderate Flag User Names
|
2017-03-22 12:10:43 -07:00 |
|
|
gaba
|
72e714a42c
|
Translations into json
|
2017-03-22 11:59:33 -07:00 |
|
|
gaba
|
54015691fe
|
Merge branch 'master' into translations
|
2017-03-22 11:46:09 -07:00 |
|
|
gaba
|
d9af09d2a3
|
Email templates
|
2017-03-22 11:43:03 -07:00 |
|
|
Belén Curcio
|
ae672d038c
|
Merge branch 'master' into my-comments-ux
|
2017-03-22 15:37:48 -03:00 |
|
|
Belen Curcio
|
5729b03656
|
my-comments-ux
|
2017-03-22 15:35:40 -03:00 |
|
|
gaba
|
046cea5043
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-22 11:33:25 -07:00 |
|
|
Gabriela Rodríguez Berón
|
d7ccfa4eda
|
Merge pull request #431 from coralproject/remove-express-dep
remove express dep from mailer service
|
2017-03-22 11:32:36 -07:00 |
|
|
gaba
|
ac6a116896
|
Only the name for the template.
|
2017-03-22 11:21:41 -07:00 |
|