 Riley DavisandGitHub
|
51b8f660b2
|
Merge pull request #373 from coralproject/node-gyp-fix
node-gyp fix
|
2017-03-02 12:47:52 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
3b21026526
|
Merge branch 'master' into node-gyp-fix
|
2017-03-02 12:38:38 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
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 JohnsonandGitHub
|
6c4db2d4ca
|
Merge branch 'master' into node-gyp-fix
|
2017-03-02 12:10:39 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
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 |
|
|
gaba
|
1899dcbb7e
|
Suspend User dialog.
|
2017-03-02 09:27:53 -08:00 |
|
|
gaba
|
3626d2678e
|
Accept button working. Add suspend user dialog.
|
2017-03-01 23:43:25 -08:00 |
|
|
Wyatt JohnsonandGitHub
|
ec09f1ca44
|
Merge branch 'master' into 138617379_best_comments
|
2017-03-01 16:47:03 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
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 JohnsonandGitHub
|
23540cb2c2
|
Merge branch 'master' into asset-name-fixes
|
2017-03-01 16:43:25 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
5114b64935
|
Merge pull request #367 from coralproject/move-config-around
removing dead code
|
2017-03-01 16:43:16 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
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 GardnerandGitHub
|
ca635a34cc
|
Merge branch 'master' into move-config-around
|
2017-03-01 18:39:09 -05:00 |
|
|
Kim GardnerandGitHub
|
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 DavisandGitHub
|
5aabf2b177
|
Merge branch 'master' into move-config-around
|
2017-03-01 16:36:31 -07:00 |
|
|
Riley DavisandGitHub
|
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 GardnerandGitHub
|
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 JohnsonandGitHub
|
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 GardnerandGitHub
|
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 |
|
|
gaba
|
acc9b2d9bf
|
Approve and Reject buttons. Still misssing suspending
|
2017-03-01 14:21:49 -08:00 |
|
|
Riley DavisandGitHub
|
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 GardnerandGitHub
|
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 |
|
|
Kim GardnerandGitHub
|
fb68bc3d48
|
Merge branch 'master' into bugfix-suspect-reporting
|
2017-03-01 16:06:08 -05:00 |
|
|
Wyatt JohnsonandGitHub
|
4461f47428
|
Merge pull request #361 from coralproject/yarn-docker
Yarn fixes for Docker
|
2017-03-01 14:03:20 -07:00 |
|
|
gaba
|
f5ef33d24e
|
Ban Button with graphql mutation.
|
2017-03-01 12:57:12 -08:00 |
|
|
Wyatt JohnsonandGitHub
|
9fb0f2f241
|
Merge branch 'master' into yarn-docker
|
2017-03-01 13:55:04 -07:00 |
|
|
Wyatt Johnson
|
fb96d432ee
|
Moved action creation upstream
|
2017-03-01 13:51:32 -07:00 |
|
|
Wyatt Johnson
|
49477ead6a
|
Fixed temp issue
|
2017-03-01 13:47:08 -07:00 |
|
|
Kim GardnerandGitHub
|
09eb2edb32
|
Merge branch 'master' into bugfix-suspect-reporting
|
2017-03-01 15:44:51 -05:00 |
|
|
Kim GardnerandGitHub
|
516a05eca0
|
Merge pull request #359 from coralproject/bugfix-premod-optimistic
Preventing premod comments from being posted optimistically.
|
2017-03-01 15:44:34 -05:00 |
|
|
Kim GardnerandGitHub
|
58e803223f
|
Merge branch 'master' into bugfix-suspect-reporting
|
2017-03-01 15:41:22 -05:00 |
|
|
Kim GardnerandGitHub
|
285430e1ce
|
Merge branch 'master' into bugfix-premod-optimistic
|
2017-03-01 15:40:52 -05:00 |
|
|
Kim GardnerandGitHub
|
fdb051c810
|
Merge pull request #354 from coralproject/admin-login-upgrade
Admin login upgrade - RIP Communicorn part deux
|
2017-03-01 15:39:03 -05:00 |
|
|
Kim GardnerandGitHub
|
43d2b29921
|
Merge branch 'master' into admin-login-upgrade
|
2017-03-01 15:35:01 -05:00 |
|
|
David Jay
|
9cb835b08b
|
Setting action user_id to null on suspect words.
|
2017-03-01 14:49:42 -05:00 |
|