 Chi Vinh Le
|
4d89db931e
|
Integrate MarkdownEditor
|
2017-03-30 20:49:18 +07:00 |
|
|
Chi Vinh Le
|
2d0208046b
|
Implement MarkdownEditor
|
2017-03-30 20:49:18 +07:00 |
|
|
David Erwin
|
1e80991614
|
Merge pull request #445 from coralproject/dynamic-email-templates
hot-load email templates during development
|
2017-03-29 15:38:42 -04:00 |
|
|
Wyatt Johnson
|
ebcb3b4b02
|
Merge branch 'master' into dynamic-email-templates
|
2017-03-29 13:09:31 -06:00 |
|
|
Kim Gardner
|
f80f253b98
|
Merge pull request #452 from coralproject/bump-version-1-4-0
Bump version to 1.4.0
|
2017-03-29 14:49:02 -04:00 |
|
|
Kim Gardner
|
71d2baa010
|
Bump version to 1.4.0
|
2017-03-29 14:43:19 -04:00 |
|
|
Kim Gardner
|
6548a76bfb
|
Merge pull request #451 from coralproject/username-fix
Fixes issues with wordlist and usernames
|
2017-03-29 14:28:57 -04:00 |
|
|
riley
|
009b381744
|
Merge branch 'master' into dynamic-email-templates
|
2017-03-29 12:28:14 -06:00 |
|
|
Kim Gardner
|
57c1e58bc3
|
Merge branch 'master' into username-fix
|
2017-03-29 14:10:24 -04:00 |
|
|
Kim Gardner
|
0726603a4e
|
Merge pull request #447 from coralproject/total-counts
show the total comment count instead of the parent count
|
2017-03-29 14:10:05 -04:00 |
|
|
Kim Gardner
|
9d59c95cdf
|
Merge branch 'master' into total-counts
|
2017-03-29 13:55:21 -04:00 |
|
|
Kiwi
|
771f99cee8
|
Merge pull request #450 from coralproject/rm_duplicate_css
Remove duplicate material.css
|
2017-03-30 00:52:28 +07:00 |
|
|
Chi Vinh Le
|
00a74f05cb
|
Use standard mdl theme
|
2017-03-30 00:44:26 +07:00 |
|
|
Wyatt Johnson
|
8680d6cab8
|
Fixes issues with wordlist and usernames
- Ensure that the wordlist can't contain emoji's
- Ensure that username checks user the correct tokenizer
|
2017-03-29 10:57:12 -06:00 |
|
|
Riley Davis
|
184b6c00a6
|
Merge branch 'master' into total-counts
|
2017-03-29 10:06:41 -06:00 |
|
|
Riley Davis
|
870fcac3b1
|
Merge branch 'master' into dynamic-email-templates
|
2017-03-29 09:31:24 -06:00 |
|
|
Chi Vinh Le
|
d80ed467f1
|
Remove duplicate material.css
|
2017-03-29 21:41:22 +07:00 |
|
|
Kim Gardner
|
8435358879
|
Merge pull request #448 from pablocubico/patch-1
Found some typos on the spanish side :)
|
2017-03-29 07:53:24 -04:00 |
|
|
Pablo Cúbico
|
5092b849b3
|
Found some typos on the spanish side :)
|
2017-03-28 23:22:12 -03:00 |
|
|
Riley Davis
|
daa6ce60ab
|
show the total comment count instead of the parent count
|
2017-03-28 15:41:27 -06:00 |
|
|
Wyatt Johnson
|
e7c0c5b638
|
adjusted path
|
2017-03-28 09:54:27 -06:00 |
|
|
Belén Curcio
|
4ff683b3af
|
Merge branch 'master' into dynamic-email-templates
|
2017-03-28 11:20:22 -03:00 |
|
|
David Erwin
|
4f1f85d127
|
Merge pull request #443 from coralproject/community-flags
Community flags
|
2017-03-28 10:19:37 -04:00 |
|
|
Gabriela Rodríguez Berón
|
155be523ff
|
Merge branch 'master' into community-flags
|
2017-03-28 07:14:30 -07:00 |
|
|
Riley Davis
|
3a47dd4c4b
|
Merge branch 'master' into dynamic-email-templates
|
2017-03-27 12:44:52 -06:00 |
|
|
Riley Davis
|
2ec5b243fb
|
hot-load email templates during development
|
2017-03-27 12:43:03 -06:00 |
|
|
Kim Gardner
|
0769a836d1
|
Merge pull request #444 from coralproject/fix-typo
Fix typo
|
2017-03-27 14:16:11 -04:00 |
|
|
Kim Gardner
|
68584cf2cf
|
Fix typo
|
2017-03-27 13:59:45 -04:00 |
|
|
Kim Gardner
|
8a8700ebb2
|
Merge pull request #442 from coralproject/dep-upgrade
Package upgrades
|
2017-03-27 11:19:05 -04:00 |
|
|
Kim Gardner
|
542a261e5e
|
Merge branch 'master' into dep-upgrade
|
2017-03-27 11:15:11 -04:00 |
|
|
Kim Gardner
|
d539e23c00
|
Merge pull request #441 from coralproject/auto-close-comment-toggle
Auto close comment toggle
|
2017-03-27 11:07:40 -04:00 |
|
|
Belén Curcio
|
a4dabd0308
|
Merge branch 'master' into dep-upgrade
|
2017-03-27 08:41:17 -03:00 |
|
|
Riley Davis
|
c35043f799
|
Merge branch 'master' into auto-close-comment-toggle
|
2017-03-24 16:50:47 -06:00 |
|
|
gaba
|
a6fa9a22c3
|
It refresh the page after editing name.
|
2017-03-24 13:57:10 -07:00 |
|
|
Kim Gardner
|
a1f200de37
|
Merge pull request #436 from coralproject/translations
Translations
v1.3.0
|
2017-03-24 16:46:21 -04:00 |
|
|
gaba
|
a2551a499f
|
Adds a few more font-sizes.
|
2017-03-24 12:58:45 -07: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 |
|
|
gaba
|
b5d86a3380
|
Merge branch 'master' into community-flags
|
2017-03-24 11:19:30 -07:00 |
|
|
gaba
|
9eaed90318
|
Revert "Revert "Story 138187767 - Moderate Flag User Names""
This reverts commit 903aa23f19.
|
2017-03-24 11:15:42 -07:00 |
|
|
Riley Davis
|
2b90f2f588
|
Merge branch 'master' into auto-close-comment-toggle
|
2017-03-24 11:33:17 -06:00 |
|
|
Riley Davis
|
8114608626
|
put the mongoose update opts in the right place
|
2017-03-24 11:33:06 -06: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 |
|
|
riley
|
701994f8f7
|
pass lint
|
2017-03-24 10:42:31 -06:00 |
|
|
riley
|
5d5ad2585d
|
autoclose an article toggle
|
2017-03-24 10:40:12 -06:00 |
|
|
Wyatt Johnson
|
05efbc4ded
|
Updated lockfile
|
2017-03-24 10:15:03 -06:00 |
|
|
gaba
|
323749915a
|
CSS alignments
|
2017-03-24 08:59:43 -07:00 |
|