 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 |
|
|
David Jay
|
0085d2bb04
|
Preventing premod comments from being posted optimistically.
|
2017-03-01 14:21:03 -05:00 |
|
|
Wyatt JohnsonandGitHub
|
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 GardnerandGitHub
|
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 GardnerandGitHub
|
4b39587837
|
Merge pull request #356 from coralproject/make-links-less-linky
Make links less linky
|
2017-03-01 13:31:44 -05:00 |
|
|
Kim GardnerandGitHub
|
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 GardnerandGitHub
|
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 JayandGitHub
|
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 |
|
|
Riley Davis
|
04ab00d053
|
ignore this
|
2017-03-01 10:40:40 -07:00 |
|
|
Riley Davis
|
1f70a2d3eb
|
Merged branch master into make-links-less-linky
|
2017-03-01 10:37:50 -07:00 |
|
|
Riley Davis
|
674585adeb
|
design updates
|
2017-03-01 10:37:39 -07:00 |
|
|
Wyatt JohnsonandGitHub
|
74c457a0b0
|
Merge pull request #349 from coralproject/production-mode
Routes Production mode
|
2017-03-01 09:58:53 -07:00 |
|
|
Wyatt Johnson
|
79296999c0
|
Merge branch 'master' into production-mode
|
2017-03-01 09:52:46 -07:00 |
|
|
Kim GardnerandGitHub
|
a984fc9beb
|
Merge pull request #355 from coralproject/comment-component
UX Comment Component
|
2017-03-01 11:03:54 -05:00 |
|
|
Belen Curcio
|
6cd0c12ba4
|
tweaks
|
2017-03-01 12:35:59 -03:00 |
|
|
Belen Curcio
|
545410b27e
|
renaming duplicate statement
|
2017-03-01 11:50:05 -03:00 |
|
|
Belen Curcio
|
453894be80
|
Merge
|
2017-03-01 11:46:28 -03:00 |
|
|
Belen Curcio
|
ea0602b7a5
|
Design Comment Component
|
2017-03-01 11:42:08 -03:00 |
|
|
Belen Curcio
|
c33ae1f7f8
|
Merge branch 'master' of github.com:coralproject/talk into comment-component
|
2017-03-01 11:08:46 -03:00 |
|
|
Kim GardnerandGitHub
|
87dddaf5b3
|
Merge branch 'master' into admin-login-upgrade
|
2017-03-01 09:01:15 -05:00 |
|
|
Kim GardnerandGitHub
|
0af08fcaea
|
Merge pull request #352 from coralproject/fix-permalink
Fix permalink
|
2017-03-01 09:00:59 -05:00 |
|
|
Kim GardnerandGitHub
|
945e576ce7
|
Merge branch 'master' into fix-permalink
|
2017-03-01 08:57:17 -05:00 |
|
|
Belen Curcio
|
42b380b942
|
Flag box
|
2017-02-28 22:35:37 -03:00 |
|
|
Belen Curcio
|
339aefa72a
|
Merge branch 'master' of github.com:coralproject/talk into comment-component
|
2017-02-28 21:26:57 -03:00 |
|
|
riley
|
7ccf77b1ad
|
add reset password link
|
2017-02-28 17:10:51 -07:00 |
|
|
Belén CurcioandGitHub
|
cc9de0b02c
|
Merge pull request #348 from coralproject/whizard-whitelist
Permitted Domains for Talk Install
|
2017-02-28 21:06:16 -03:00 |
|
|
Belen Curcio
|
dc81ec1e80
|
Merge branch 'whizard-whitelist' of github.com:coralproject/talk into whizard-whitelist
|
2017-02-28 20:44:55 -03:00 |
|
|
Belen Curcio
|
1db0a75010
|
Merge
|
2017-02-28 20:42:03 -03:00 |
|
|
Riley Davis
|
1f3eb5f516
|
Merged branch master into admin-login-upgrade
|
2017-02-28 16:31:49 -07:00 |
|
|
riley
|
8f23ca678d
|
add Alert component to coral-ui
|
2017-02-28 16:31:30 -07:00 |
|
|
David JayandGitHub
|
230488117f
|
Merge branch 'master' into bugfix-user-state
|
2017-02-28 18:20:00 -05:00 |
|
|
David Jay
|
d8117494d1
|
Cleaning up after merge conflict.
|
2017-02-28 18:18:17 -05:00 |
|
|
Wyatt JohnsonandGitHub
|
e6b7098a6c
|
Merge branch 'master' into production-mode
|
2017-02-28 16:10:27 -07:00 |
|
|
David JayandGitHub
|
e68358a211
|
Merge branch 'master' into fix-permalink
|
2017-02-28 18:07:31 -05:00 |
|
|
Kim GardnerandGitHub
|
7bd9411e73
|
Merge pull request #332 from coralproject/assets-by-like
Dashboard: Articles with most likes, articles with most flags
|
2017-02-28 16:57:47 -05:00 |
|
|
Riley Davis
|
b369fb9101
|
re-rename
|
2017-02-28 14:38:19 -07:00 |
|