Commit Graph

3586 Commits

Author SHA1 Message Date
Belen Curcio 5dc9811e06 Stable Version with reducers and actions 2017-03-29 16:24:09 -03:00
Wyatt Johnson ebcb3b4b02 Merge branch 'master' into dynamic-email-templates 2017-03-29 13:09:31 -06:00
Riley Davis f11a11cf67 show view more button on a permalinked comment if applicable 2017-03-29 13:04:28 -06:00
Kim Gardner c5d36a9f19 Merge branch 'master' into change-permalink-behavior 2017-03-29 14:49:21 -04: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
Wyatt Johnson dd3d1e9fe7 fix for session service 2017-03-29 12:45:57 -06:00
Kim Gardner 71d2baa010 Bump version to 1.4.0 2017-03-29 14:43:19 -04:00
Kim Gardner 55973859ef Merge branch 'master' into change-permalink-behavior 2017-03-29 14:29:16 -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
riley 3e00a4e842 Merge branch 'master' into change-permalink-behavior 2017-03-29 12:27:52 -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
Belen Curcio 6bb9d23fdc Stable Version with reducers and actions 2017-03-29 14:46:45 -03:00
Belen Curcio 520392829b Stable Version with reducers and actions 2017-03-29 14:45:59 -03: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
Wyatt Johnson ffbe976760 working websockets 2017-03-29 09:35:56 -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
Riley Davis b7ce669cfc add translations 2017-03-28 14:46:01 -06:00
Riley Davis e75663f5b9 Merge branch 'master' into change-permalink-behavior 2017-03-28 14:31:53 -06:00
Riley Davis 4e60689fa4 view a permalink thread in isolation 2017-03-28 14:31:43 -06:00
Belen Curcio 2513ef2df5 add plugins 2017-03-28 15:56:24 -03:00
Belen Curcio b76fa94354 Stable version 2017-03-28 14:21:06 -03:00
Belen Curcio 1a115e4f2c Stable version 2017-03-28 14:20:12 -03: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
Belen Curcio 697d2f0ec1 Importer, Slots and suport for multiple plugins and props! 2017-03-28 09:58:33 -03: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
Belen Curcio e85ebba21b Working plugin importer 2017-03-27 13:02:57 -03: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