Commit Graph

3586 Commits

Author SHA1 Message Date
Belen Curcio d0e67592c0 Adding favicon :) 2017-03-06 16:05:56 -05:00
Riley Davis d9d086c61e remove a banned comment after it's confirmed as rejected 2017-03-06 13:53:56 -07:00
Riley Davis 832f3c8abc Merge branch 'master' into configure-bugs 2017-03-06 13:52:54 -07:00
Riley Davis aca2af44e2 Merge branch 'master' into notification-warning 2017-03-06 13:51:25 -07:00
Riley Davis b7fe4c6802 Merge pull request #390 from coralproject/password-reset-view-fix
Fix password reset view render path
2017-03-06 13:21:37 -07:00
Wyatt Johnson 1c81d0a04f Update index.js 2017-03-06 13:00:22 -07:00
David Jay 450f1fdbac Focusing on reply box when reply is clicked. 2017-03-06 13:25:01 -05:00
Riley Davis 5cb7172bbe Merge branch 'master'
Conflicts:
	client/coral-embed-stream/src/Embed.js
2017-03-06 11:01:37 -07:00
Riley Davis 000833509f remove notification reducer. have parent show notifications 2017-03-06 10:59:12 -07:00
Belen Curcio e80d6e7b0a Configure UX Style Polish! 2017-03-06 12:12:26 -05:00
David Jay 77386fb21d Merge pull request #385 from coralproject/version-endpoint-fix
Moved to correct route
2017-03-06 12:04:19 -05:00
Wyatt Johnson 56350ffe1a Moved to correct route 2017-03-06 09:58:21 -07:00
Belen Curcio 6cd75b57dc border box 2017-03-03 16:18:58 -05:00
David Jay 3280ed9ae5 Merge branch 'master' into premod-links 2017-03-03 16:17:40 -05:00
Belen Curcio ec4fc566c1 props 2017-03-03 16:15:30 -05:00
David Jay be8332da66 Switching link action from flag to premod. 2017-03-03 16:12:53 -05:00
David Jay b9488dc36c Updating moderation. 2017-03-03 16:09:34 -05:00
David Jay b912b60428 Removing unecessary log statement. 2017-03-03 16:01:53 -05:00
Belen Curcio 1f0d102115 new components!! textarea stuff and configure bugs 2017-03-03 15:53:53 -05:00
David Jay 2e5d453ea7 Updating link search and adding settings in admin panel. 2017-03-03 15:44:03 -05:00
Belen Curcio a1a45a7969 Styles and disable and enable things 2017-03-03 15:10:15 -05:00
David Jay cb88f0a9b7 Flagging links when settings are set appropriately. 2017-03-03 14:32:57 -05:00
Kim Gardner 6c4282128e Merge pull request #382 from coralproject/my_history_comments_reverse
Reverse chronological order for My Comment History
2017-03-03 13:45:08 -05:00
Kim Gardner 1d1aa9c30e Merge branch 'master' into my_history_comments_reverse 2017-03-03 13:41:18 -05:00
Belen Curcio bb05fa5325 Reverse chronos 2017-03-03 13:37:10 -05:00
Kim Gardner f8d7a94b76 Merge pull request #379 from coralproject/140895223
Stories and Moderate on individual steam comment components
2017-03-03 13:35:11 -05:00
Belén Curcio 740aa88958 Merge branch 'master' into 140895223 2017-03-03 13:30:39 -05:00
Kim Gardner 6b4c303012 Merge pull request #381 from coralproject/star
Best Comments - Heart to Star and Coral Icon added
2017-03-03 13:29:39 -05:00
Kim Gardner 74d9b5814f Merge branch 'master' into star 2017-03-03 13:24:32 -05:00
Belen Curcio 79102de9d2 Star and Coral UI added :D 2017-03-03 13:21:42 -05:00
Belén Curcio a21bdff12c Merge branch 'master' into 140895223 2017-03-03 13:14:10 -05:00
Wyatt Johnson 3a581941e9 Merge pull request #380 from coralproject/version-endpoint
Added Version endpoint
2017-03-03 11:13:57 -07:00
Belén Curcio 853a0ef8b0 Merge branch 'master' into 140895223 2017-03-03 13:12:40 -05:00
Wyatt Johnson 3fc349dbe4 Fixed endpoint... 2017-03-03 11:08:59 -07:00
Wyatt Johnson 840bfad06f Simplfied endpoint 2017-03-03 11:04:46 -07:00
Wyatt Johnson 646d1aa585 Added version endpoint 2017-03-03 11:03:11 -07:00
Belen Curcio 5da1af8387 Styles ready! 2017-03-03 13:00:22 -05:00
David Jay 45208b096f Correcting bug in prev keyboard shortcut. 2017-03-03 12:52:20 -05:00
David Jay 3ecb93365a Correcting bug in keyboard shortcut next and previous. 2017-03-03 12:50:39 -05:00
Wyatt Johnson 5e8ee8ccb6 Merge pull request #378 from coralproject/bump-version-110
Update for major release to include Best Comments
2017-03-03 10:04:58 -07:00
Belen Curcio d218979ee6 Show Story, show and hide Moderate 2017-03-03 11:46:09 -05:00
Kim Gardner d65fb64b7e Update for major release to include Best Comments 2017-03-03 11:28:22 -05:00
Kim Gardner 8ebf6cb35f Merge pull request #377 from coralproject/bump-version-101
Bump version for 1.0.1 release
2017-03-03 10:08:26 -05:00
Kim Gardner 9079756ec2 Merge branch 'master' into bump-version-101 2017-03-03 10:04:39 -05:00
Kim Gardner 03a4f246f5 Merge pull request #376 from coralproject/keyboard-shortcuts
Keyboard shortcuts
2017-03-03 10:03:52 -05:00
Kim Gardner b5653eca2d Merge branch 'master' into keyboard-shortcuts 2017-03-03 09:59:45 -05:00
Kim Gardner 65c9bc550e Merge branch 'master' into bump-version-101 2017-03-03 09:59:15 -05:00
Kim Gardner f40211031b Merge pull request #350 from gobengo/138617379_best_comments
Best Comments
2017-03-03 09:56:03 -05:00
Belén Curcio f30275e375 Merge branch 'master' into 138617379_best_comments 2017-03-03 09:51:25 -05:00
Kim Gardner edd694cfa5 Bump version for 1.0.1 release 2017-03-03 06:55:55 -05:00