 Wyatt Johnson
|
21783edbfe
|
Adjusted session details
|
2017-03-02 10:59:19 -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 |
|
|
Kim Gardner
|
fb68bc3d48
|
Merge branch 'master' into bugfix-suspect-reporting
|
2017-03-01 16:06:08 -05:00 |
|
|
Wyatt Johnson
|
4461f47428
|
Merge pull request #361 from coralproject/yarn-docker
Yarn fixes for Docker
|
2017-03-01 14:03:20 -07:00 |
|
|
Wyatt Johnson
|
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 Gardner
|
09eb2edb32
|
Merge branch 'master' into bugfix-suspect-reporting
|
2017-03-01 15:44:51 -05:00 |
|
|
Kim Gardner
|
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 Gardner
|
58e803223f
|
Merge branch 'master' into bugfix-suspect-reporting
|
2017-03-01 15:41:22 -05:00 |
|
|
Kim Gardner
|
285430e1ce
|
Merge branch 'master' into bugfix-premod-optimistic
|
2017-03-01 15:40:52 -05:00 |
|
|
Kim Gardner
|
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 Gardner
|
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 |
|
|
David Jay
|
0085d2bb04
|
Preventing premod comments from being posted optimistically.
|
2017-03-01 14:21:03 -05:00 |
|
|
Wyatt Johnson
|
2f05cec380
|
Removed yarn install (already has yarn!)
|
2017-03-01 11:50:32 -07:00 |
|
|
Wyatt Johnson
|
f87525d0a4
|
Merge pull request #358 from coralproject/version-pin
Pinning to 7.6 until upstream issues resolved
|
2017-03-01 11:43:30 -07:00 |
|
|
Kim Gardner
|
e56a04abf1
|
Merge branch 'master' into admin-login-upgrade
|
2017-03-01 13:42:56 -05:00 |
|
|
Riley Davis
|
4e5bcbc27f
|
even more design updates
|
2017-03-01 11:42:03 -07:00 |
|
|
Wyatt Johnson
|
af8c926296
|
Pinning to 7.6 until upstream issues resolved, see #357
|
2017-03-01 11:37:29 -07:00 |
|
|
Kim Gardner
|
4b39587837
|
Merge pull request #356 from coralproject/make-links-less-linky
Make links less linky
|
2017-03-01 13:31:44 -05:00 |
|
|
Kim Gardner
|
70c69e3752
|
Merge branch 'master' into make-links-less-linky
|
2017-03-01 13:27:13 -05:00 |
|
|
riley
|
b346083d11
|
Merged master into admin-login-upgrade
|
2017-03-01 11:19:48 -07:00 |
|
|
Kim Gardner
|
23917944b2
|
Merge pull request #353 from coralproject/bugfix-user-state
Refetching on login and logout.
|
2017-03-01 13:14:26 -05:00 |
|
|
Riley Davis
|
00b2bf37ee
|
fix height of the table
|
2017-03-01 11:14:13 -07:00 |
|
|
David Jay
|
3b04dab0d5
|
Merge branch 'master' into bugfix-user-state
|
2017-03-01 12:57:40 -05:00 |
|
|
Wyatt Johnson
|
45b14d026d
|
Added more conditional checks to exclusion
|
2017-03-01 10:49:47 -07:00 |
|
|
Riley Davis
|
bbf70aedab
|
put it back to 5 minutes
|
2017-03-01 10:47:31 -07:00 |
|
|
Riley Davis
|
045fa3e2a9
|
also ignore this
|
2017-03-01 10:42:01 -07:00 |
|
|
Riley Davis
|
58870e1630
|
Merged branch master into admin-login-upgrade
|
2017-03-01 10:40:51 -07:00 |
|