 Chi Vinh Le
|
d4e02b620e
|
Typo
|
2018-03-22 23:19:50 +01:00 |
|
|
Chi Vinh Le
|
292e33c105
|
Implement AdminCommentContent for text and html
|
2018-03-22 23:15:21 +01:00 |
|
|
Chi Vinh Le
|
a1a867ec55
|
Add margin to contentEditable
|
2018-03-22 19:44:53 +01:00 |
|
|
Chi Vinh Le
|
19920deeda
|
Better detect tag ancestors
|
2018-03-22 18:03:13 +01:00 |
|
|
Kim Gardner
|
b65e7a0ad9
|
Merge pull request #1469 from coralproject/fix-typo
Fix typos
|
2018-03-21 19:15:48 -04:00 |
|
|
Kim Gardner
|
678f535500
|
Fix typos
|
2018-03-21 19:08:13 -04:00 |
|
|
Wyatt Johnson
|
47a2c5a174
|
Merge pull request #1463 from coralproject/update-default-plugins
Update default plugins
|
2018-03-21 16:43:54 -06:00 |
|
|
Kim Gardner
|
cb59d51a74
|
Merge branch 'master' into update-default-plugins
|
2018-03-21 18:33:08 -04:00 |
|
|
Wyatt Johnson
|
b9420406ed
|
removed rich text from defaults
|
2018-03-21 16:26:54 -06:00 |
|
|
Kim Gardner
|
5491ac034c
|
Merge branch 'update-default-plugins' of git+ssh://github.com/coralproject/talk into update-default-plugins
|
2018-03-21 18:26:26 -04:00 |
|
|
Kim Gardner
|
3799495929
|
Remove rich text from default for now
|
2018-03-21 18:25:47 -04:00 |
|
|
Kim Gardner
|
5463959347
|
Merge pull request #1468 from coralproject/docs
Updated Notifications Docs
|
2018-03-21 18:18:36 -04:00 |
|
|
Wyatt Johnson
|
eab17b4c1d
|
Merge branch 'master' into docs
|
2018-03-21 16:10:12 -06:00 |
|
|
Wyatt Johnson
|
ad1ea9a810
|
Updated Notifications Docs
|
2018-03-21 16:09:02 -06:00 |
|
|
Kim Gardner
|
5a2212846d
|
Merge branch 'master' into update-default-plugins
|
2018-03-21 17:40:18 -04:00 |
|
|
Kim Gardner
|
6ee4a258ff
|
Merge pull request #1460 from coralproject/rte-rework
Comment Drafting and Editing Refactor + Coral RTE
|
2018-03-21 17:39:56 -04:00 |
|
|
Kim Gardner
|
8e3395d0e8
|
Merge branch 'master' into rte-rework
|
2018-03-21 17:14:02 -04:00 |
|
|
Kim Gardner
|
5b436e3c4a
|
Merge pull request #1453 from coralproject/hackday-upvote-downvote-ama
Upvote and Downvote
|
2018-03-21 17:13:48 -04:00 |
|
|
Kim Gardner
|
9185d3df43
|
Merge branch 'master' into hackday-upvote-downvote-ama
|
2018-03-21 17:06:16 -04:00 |
|
|
Kim Gardner
|
822c605103
|
Merge pull request #1467 from coralproject/dep-fix
Fixed misplaced deps
|
2018-03-21 17:05:49 -04:00 |
|
|
Wyatt Johnson
|
273cc9927a
|
Fixed misplaced deps
|
2018-03-21 14:51:05 -06:00 |
|
|
Kim Gardner
|
bce56f2719
|
Merge branch 'master' into rte-rework
|
2018-03-21 16:42:54 -04:00 |
|
|
Kim Gardner
|
1928bc3819
|
Merge branch 'master' into update-default-plugins
|
2018-03-21 16:42:38 -04:00 |
|
|
Kim Gardner
|
11ca430ad9
|
Merge pull request #1465 from coralproject/mailer-template-fix
Mailer Template Fix
|
2018-03-21 16:42:26 -04:00 |
|
|
Kim Gardner
|
dc8f4a1765
|
Merge branch 'master' into mailer-template-fix
|
2018-03-21 16:35:34 -04:00 |
|
|
Kim Gardner
|
ec493f9a3a
|
Merge pull request #1466 from coralproject/dep-fix
Moved extract-text-webpack-plugin from devDependencies to dependencies
|
2018-03-21 16:33:35 -04:00 |
|
|
Kim Gardner
|
58899293af
|
Merge branch 'master' into rte-rework
|
2018-03-21 16:19:59 -04:00 |
|
|
Wyatt Johnson
|
bf37ab8c78
|
Moved extract-text-webpack-plugin from devDependencies to dependencies
|
2018-03-21 14:14:04 -06:00 |
|
|
Wyatt Johnson
|
881d7abfa6
|
replaced fs-extra call to fs
|
2018-03-21 13:58:22 -06:00 |
|
|
Wyatt Johnson
|
bf54959ef5
|
Fix for template rendering
|
2018-03-21 13:56:16 -06:00 |
|
|
Kim Gardner
|
937ee5ea67
|
Merge branch 'master' into update-default-plugins
|
2018-03-21 15:34:43 -04:00 |
|
|
Kim Gardner
|
5f526eb49c
|
Merge pull request #1456 from coralproject/docs
GraphQL Docs Fixes
|
2018-03-21 15:34:27 -04:00 |
|
|
Chi Vinh Le
|
f3b379922b
|
Merge branch 'rte-rework' of ssh://github.com/coralproject/talk into rte-rework
|
2018-03-21 20:12:48 +01:00 |
|
|
Belén Curcio
|
f23bdd91bf
|
Merge branch 'master' into hackday-upvote-downvote-ama
|
2018-03-21 16:12:05 -03:00 |
|
|
Chi Vinh Le
|
78eb92e3ab
|
Fix styling on admin site
|
2018-03-21 19:48:33 +01:00 |
|
|
Kim Gardner
|
f4575e2075
|
Merge branch 'master' into docs
|
2018-03-21 14:40:48 -04:00 |
|
|
Kim Gardner
|
694a9bb438
|
Merge branch 'master' into rte-rework
|
2018-03-21 14:40:08 -04:00 |
|
|
Chi Vinh Le
|
1aeae553e5
|
Add border radius
|
2018-03-21 19:24:36 +01:00 |
|
|
Kim Gardner
|
cc0dcc1620
|
Update default plugins
|
2018-03-21 14:12:44 -04:00 |
|
|
Chi Vinh Le
|
483c21990f
|
Merge branch 'rte-rework' of ssh://github.com/coralproject/talk into rte-rework
|
2018-03-21 18:56:25 +01:00 |
|
|
Kim Gardner
|
1f0630d875
|
Merge pull request #1461 from coralproject/force-notification-settings
Notification Settings Pane Controls
|
2018-03-21 13:52:19 -04:00 |
|
|
Belén Curcio
|
44a8e6eb8f
|
Merge branch 'master' into hackday-upvote-downvote-ama
|
2018-03-21 14:46:05 -03:00 |
|
|
Kim Gardner
|
96865be27a
|
Merge branch 'master' into force-notification-settings
|
2018-03-21 13:43:20 -04:00 |
|
|
Chi Vinh Le
|
99955b82f5
|
Blockquote styling
|
2018-03-21 18:41:27 +01:00 |
|
|
Wyatt Johnson
|
0b01700235
|
updated docs
|
2018-03-21 11:12:04 -06:00 |
|
|
Kim Gardner
|
92e910a53f
|
Merge branch 'master' into rte-rework
|
2018-03-21 13:10:34 -04:00 |
|
|
Kiwi
|
195bc1715b
|
Merge pull request #1452 from coralproject/context-perf
Context Performance
|
2018-03-21 18:07:48 +01:00 |
|
|
Wyatt Johnson
|
a43c173a12
|
Added support for forcing the notification settings pane
|
2018-03-21 11:04:41 -06:00 |
|
|
Kiwi
|
a3ea964c15
|
Merge branch 'master' into context-perf
|
2018-03-21 17:54:34 +01:00 |
|
|
Chi Vinh Le
|
68eddfa6bb
|
Merge branch 'rte-rework' of ssh://github.com/coralproject/talk into rte-rework
|
2018-03-21 17:43:17 +01:00 |
|