Commit Graph

2480 Commits

Author SHA1 Message Date
Belen Curcio d218979ee6 Show Story, show and hide Moderate 2017-03-03 11:46:09 -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
Kim Gardner f7d19dcd68 Merge pull request #371 from coralproject/bugfix-e2e-permalink
Fix e2e
2017-03-02 16:34:50 -05:00
Kim Gardner da6d5d58b3 Merge branch 'master' into bugfix-e2e-permalink 2017-03-02 16:26:54 -05:00
David Jay 57a7000e59 Animating transition in mod queue. 2017-03-02 16:08:24 -05:00
David Jay d554bf5211 Adding single view and restyling selected comment. 2017-03-02 16:03:18 -05:00
David Jay 1146f22613 Accepting and rejecting comments w/ keystrokes. 2017-03-02 15:41:51 -05:00
David Jay 78be17ec6d Adding keyboard selection of comments. 2017-03-02 15:19:33 -05:00
David Jay 7be3b05f22 Re-enabling keyboard shortcut menu. 2017-03-02 14:51:51 -05:00
Riley Davis 51b8f660b2 Merge pull request #373 from coralproject/node-gyp-fix
node-gyp fix
2017-03-02 12:47:52 -07:00
Wyatt Johnson 3b21026526 Merge branch 'master' into node-gyp-fix 2017-03-02 12:38:38 -07:00
Wyatt Johnson 6ae7a89642 Merge pull request #375 from coralproject/un-jank
only trigger a re-flow when the height actually changes
2017-03-02 12:38:25 -07:00
Riley Davis a6c7fe85b9 remove querySelector call 2017-03-02 12:34:10 -07:00
Riley Davis 2246728c80 only trigger a re-flow when the height actually changes 2017-03-02 12:27:31 -07:00
Wyatt Johnson 6c4db2d4ca Merge branch 'master' into node-gyp-fix 2017-03-02 12:10:39 -07:00
Wyatt Johnson d04b230b3f Merge pull request #372 from coralproject/session-timeout-extension
Adjusted session timeouts
2017-03-02 12:10:29 -07:00
Wyatt Johnson daf0d38c26 fixes #362 2017-03-02 12:07:42 -07:00
David Jay 06f9c12f5e Updating comment count. 2017-03-02 13:11:16 -05:00
David Jay 609af767e8 Merge branch 'master' of github.com:coralproject/talk into bugfix-e2e-permalink 2017-03-02 13:04:32 -05:00
David Jay acda388d4e Updating e2e tests. 2017-03-02 13:00:54 -05:00
Wyatt Johnson 21783edbfe Adjusted session details 2017-03-02 10:59:19 -07:00
Wyatt Johnson ec09f1ca44 Merge branch 'master' into 138617379_best_comments 2017-03-01 16:47:03 -07:00
Wyatt Johnson 2c98aa2097 Merge pull request #368 from coralproject/asset-name-fixes
Asset Name + Profile Tab Bugs
v1.0.0
2017-03-01 16:46:41 -07:00
Wyatt Johnson 23540cb2c2 Merge branch 'master' into asset-name-fixes 2017-03-01 16:43:25 -07:00
Wyatt Johnson 5114b64935 Merge pull request #367 from coralproject/move-config-around
removing dead code
2017-03-01 16:43:16 -07:00
Wyatt Johnson e08d737a69 Merge branch 'master' into asset-name-fixes 2017-03-01 16:42:37 -07:00
Wyatt Johnson 57fc4b8a3f Fixed test 2017-03-01 16:40:47 -07:00
Kim Gardner ca635a34cc Merge branch 'master' into move-config-around 2017-03-01 18:39:09 -05:00
Kim Gardner 4cb796e54f Merge pull request #366 from coralproject/reply-no-reply
make sure reply box works
2017-03-01 18:38:49 -05:00
Wyatt Johnson cefe872bf0 Fixed queries 2017-03-01 16:38:27 -07:00
Riley Davis 5aabf2b177 Merge branch 'master' into move-config-around 2017-03-01 16:36:31 -07:00
Riley Davis a839596c20 Merge branch 'master' into reply-no-reply 2017-03-01 16:34:42 -07:00
Riley Davis ed0df4b738 make sure reply box works 2017-03-01 16:32:01 -07:00
Kim Gardner 36b707f213 Merge pull request #365 from coralproject/config-wordz
add some missing translations
2017-03-01 18:08:55 -05:00
Riley Davis fa5a94c4be add some missing translations 2017-03-01 16:00:42 -07:00
Wyatt Johnson 472b087a6c Merge pull request #364 from coralproject/embed-stream-fixes
Touched up embed + stream query
2017-03-01 15:54:46 -07:00
Wyatt Johnson 3d13380fcc Touched up embed + stream query 2017-03-01 15:49:39 -07:00
Kim Gardner eeb82ff7bb Merge pull request #363 from coralproject/move-config-around
re-organize settings so they make a bit more sense
2017-03-01 17:30:56 -05:00
riley c4edbd4db4 removing dead code 2017-03-01 15:28:44 -07:00
Riley Davis 0c89dd6d98 sam's feedback 2017-03-01 15:23:17 -07:00
Riley Davis 97496f8b3d Merge branch 'master' into move-config-around 2017-03-01 14:44:27 -07:00
Riley Davis 62793f5947 keepin' it DRY 2017-03-01 14:40:10 -07:00
Kim Gardner 9b9715f39f Merge pull request #360 from coralproject/bugfix-suspect-reporting
Comments with suspect words should not show up as "Reported" by the user who posted them.
2017-03-01 16:10:18 -05:00