 Kim Gardner
|
fa8d96b6be
|
Merge branch 'master' into edit-comment
|
2017-05-09 14:19:50 -04:00 |
|
|
Kim Gardner
|
d8e7b25d0e
|
Merge pull request #576 from coralproject/FE_Plugin_DOCS
FE Plugin Docs cleanup
|
2017-05-09 13:49:49 -04:00 |
|
|
Benjamin Goering
|
994b5006b6
|
Merge branch 'master' into edit-comment
|
2017-05-09 09:12:14 -07:00 |
|
|
Kim Gardner
|
a20bacd78d
|
Merge branch 'master' into FE_Plugin_DOCS
|
2017-05-09 12:07:27 -04:00 |
|
|
Kim Gardner
|
87bc3e0a72
|
Merge pull request #565 from coralproject/approve-reject-noop
Don't redo actions on comments
|
2017-05-09 12:06:21 -04:00 |
|
|
Kiwi
|
4eb20108b1
|
Merge branch 'master' into approve-reject-noop
|
2017-05-09 20:06:11 +07:00 |
|
|
Kim Gardner
|
42db896d33
|
Merge branch 'master' into FE_Plugin_DOCS
|
2017-05-09 08:09:36 -04:00 |
|
|
Kim Gardner
|
c0b526e98d
|
Fix typo
|
2017-05-09 08:03:18 -04:00 |
|
|
Kim Gardner
|
3129828f83
|
Merge pull request #575 from coralproject/suspect-partial
do not highlight partial word matches in admin since this is not how the backend works
|
2017-05-09 07:53:11 -04:00 |
|
|
Kiwi
|
6fb227eb72
|
Merge branch 'master' into approve-reject-noop
|
2017-05-09 17:49:30 +07:00 |
|
|
Benjamin Goering
|
8af7168f4f
|
Merge branch 'master' into edit-comment
|
2017-05-08 19:26:38 -07:00 |
|
|
Riley Davis
|
d77fcfe9de
|
Merge branch 'master' into suspect-partial
|
2017-05-08 17:13:50 -06:00 |
|
|
Riley Davis
|
2490e65981
|
merge master
|
2017-05-08 17:09:23 -06:00 |
|
|
Riley Davis
|
242f3ea5ea
|
do not highlight partial word matches in admin since this is not how the backend works
|
2017-05-08 17:01:36 -06:00 |
|
|
Kim Gardner
|
5625f5b4b8
|
Merge pull request #566 from coralproject/context-from-comment
open the comment in context when clicked
|
2017-05-08 17:38:42 -04:00 |
|
|
Kim Gardner
|
b2c8e3b254
|
Merge branch 'master' into context-from-comment
|
2017-05-08 17:34:55 -04:00 |
|
|
Kim Gardner
|
3dff07de40
|
Merge pull request #572 from coralproject/mod-is-main-tab
default view is moderate > all
|
2017-05-08 17:34:43 -04:00 |
|
|
Kim Gardner
|
19d7a3323e
|
Merge branch 'master' into mod-is-main-tab
|
2017-05-08 17:30:56 -04:00 |
|
|
Wyatt Johnson
|
dc86b87a62
|
Merge pull request #574 from coralproject/sub-fix
Fix for incorrect options passed to pubsub
|
2017-05-08 15:29:56 -06:00 |
|
|
Kim Gardner
|
6dd01b4334
|
Merge branch 'master' into mod-is-main-tab
|
2017-05-08 17:26:55 -04:00 |
|
|
Wyatt Johnson
|
b6e3796afe
|
Merge branch 'master' into sub-fix
|
2017-05-08 15:25:57 -06:00 |
|
|
Kim Gardner
|
34ee1c56ea
|
Merge pull request #573 from coralproject/move-queues
move approved tab to be next to rejected tab
|
2017-05-08 17:25:47 -04:00 |
|
|
Wyatt Johnson
|
85d634c221
|
Merge branch 'master' into sub-fix
|
2017-05-08 15:21:43 -06:00 |
|
|
Riley Davis
|
3e258b1787
|
move approved tab
|
2017-05-08 14:59:23 -06:00 |
|
|
Kim Gardner
|
e04bf7f9bc
|
Merge branch 'master' into approve-reject-noop
|
2017-05-08 16:22:42 -04:00 |
|
|
David Erwin
|
50d832c2f8
|
Remove pseudocode
|
2017-05-08 16:21:24 -04:00 |
|
|
Kim Gardner
|
0b06c233a8
|
Merge pull request #523 from coralproject/FE_Plugin_DOCS
Frontend Plugins DOCS
|
2017-05-08 16:20:27 -04:00 |
|
|
Kim Gardner
|
7a3b36433a
|
Merge branch 'master' into FE_Plugin_DOCS
|
2017-05-08 16:16:34 -04:00 |
|
|
Belén Curcio
|
d478910a81
|
Merge pull request #570 from coralproject/add-supported-browsers-docs
Supported Browsers (docs)
|
2017-05-08 17:15:16 -03:00 |
|
|
Riley Davis
|
c00e6c1ece
|
default view is moderate > all
|
2017-05-08 13:40:24 -06:00 |
|
|
Wyatt Johnson
|
bc3c73a992
|
Fix for incorrect options passed to pubsub
|
2017-05-08 13:26:07 -06:00 |
|
|
Benjamin Goering
|
295de61f36
|
Merge branch 'master' into edit-comment
|
2017-05-08 10:00:58 -07:00 |
|
|
Benjamin Goering
|
096025b72a
|
Add asset_id to editComment mutation to allow mongo query happy path to be atomic
|
2017-05-08 09:57:52 -07:00 |
|
|
David Erwin
|
e2ed21e113
|
Adding building block documentation
|
2017-05-08 12:00:22 -04:00 |
|
|
David Erwin
|
b019c5e180
|
Separate supported and experimental plugin guildes
|
2017-05-08 10:36:36 -04:00 |
|
|
Belén Curcio
|
c920c7e9bc
|
Merge branch 'master' into FE_Plugin_DOCS
|
2017-05-08 08:27:04 -03:00 |
|
|
Benjamin Goering
|
81879c9bb9
|
Move getEditableUntilDate into util file
|
2017-05-08 00:05:14 -07:00 |
|
|
Benjamin Goering
|
9fb76d35c8
|
shorten some syntax that could be shorter
|
2017-05-07 23:54:51 -07:00 |
|
|
Benjamin Goering
|
a7099295d6
|
CountdownSeconds component has its own file
|
2017-05-07 23:47:59 -07:00 |
|
|
Benjamin Goering
|
3d8c521928
|
CommentForm component is in its own file
|
2017-05-07 23:44:41 -07:00 |
|
|
Kim Gardner
|
70bb6f6632
|
Merge branch 'master' into approve-reject-noop
|
2017-05-05 16:53:14 -04:00 |
|
|
Kim Gardner
|
19d62a8c63
|
Merge branch 'master' into add-supported-browsers-docs
|
2017-05-05 16:46:21 -04:00 |
|
|
Kim Gardner
|
b15a2af38c
|
Update formatting of License info
|
2017-05-05 16:45:15 -04:00 |
|
|
Riley Davis
|
4ff42385e3
|
remove dead code
|
2017-05-05 14:41:19 -06:00 |
|
|
Kim Gardner
|
dc81a59908
|
Supported Browsers
|
2017-05-05 16:40:17 -04:00 |
|
|
Kim Gardner
|
fe5ddbe323
|
Merge pull request #569 from coralproject/ui-overlaps
Apply button overlapped text
|
2017-05-05 16:16:06 -04:00 |
|
|
Riley Davis
|
f8e8eef989
|
float: right; in css is just fine.
|
2017-05-05 14:05:52 -06:00 |
|
|
Riley Davis
|
8212a7e11b
|
Merge branch 'master' into approve-reject-noop
|
2017-05-05 13:56:38 -06:00 |
|
|
Riley Davis
|
3fc19df240
|
Merge branch 'master' into context-from-comment
|
2017-05-05 13:56:28 -06:00 |
|
|
Wyatt Johnson
|
d0cca476e6
|
Merge pull request #568 from coralproject/user-fix
Added privacy fix
|
2017-05-05 13:19:59 -06:00 |
|