 Kim Gardner
|
8a5118728b
|
Merge branch 'master' into patch-4
|
2018-03-23 16:10:35 -04:00 |
|
|
Kim Gardner
|
e39e0b7875
|
Merge pull request #1476 from coralproject/losowsky-patch-1
Create 'when you've installed talk' tutorial
|
2018-03-23 16:10:13 -04:00 |
|
|
Kim Gardner
|
d5df9ba8e4
|
Merge branch 'losowsky-patch-1' of git+ssh://github.com/coralproject/talk into losowsky-patch-1
|
2018-03-23 16:04:45 -04:00 |
|
|
Kim Gardner
|
e67aea48af
|
Merge branch 'master' of git+ssh://github.com/coralproject/talk into losowsky-patch-1
|
2018-03-23 16:04:28 -04:00 |
|
|
Wyatt Johnson
|
d80a2d84c5
|
Merge branch 'master' into patch-4
|
2018-03-23 13:08:18 -06:00 |
|
|
Kim Gardner
|
c9e5fd99b5
|
Merge branch 'master' into losowsky-patch-1
|
2018-03-23 14:02:30 -04:00 |
|
|
Kim Gardner
|
cd4d666a46
|
More tweaks to formatting
|
2018-03-23 14:02:03 -04:00 |
|
|
Kim Gardner
|
ab476f93b6
|
More formatting
|
2018-03-23 13:56:43 -04:00 |
|
|
Kim Gardner
|
c5536da565
|
Formatting updates and add to sidebar
|
2018-03-23 13:55:34 -04:00 |
|
|
Kim Gardner
|
2599000e60
|
Merge pull request #1479 from coralproject/mdeditor
Markdown Editor Fixes
|
2018-03-23 13:54:15 -04:00 |
|
|
Wyatt Johnson
|
8a3cbac442
|
Fixed up clean script
|
2018-03-23 11:45:38 -06:00 |
|
|
Wyatt Johnson
|
d7cf733a42
|
Moved loadable to the markdown editor
|
2018-03-23 11:15:47 -06:00 |
|
|
Mendel Konikov
|
f69163d9c2
|
Clarifying importance of order in plugins.json
|
2018-03-23 09:21:31 -04:00 |
|
|
Andrew Losowsky
|
8f727cc6db
|
Create 'when you've installed talk' tutorial
|
2018-03-22 19:47:29 -04:00 |
|
|
Wyatt Johnson
|
59982d4329
|
swapped manual dynamic chunked loader with readt-loadable
|
2018-03-22 17:29:38 -06:00 |
|
|
Wyatt Johnson
|
4f87c88e04
|
improved static template resolve in development
|
2018-03-22 17:29:07 -06:00 |
|
|
Wyatt Johnson
|
3ec7bf09bf
|
improved introspection
|
2018-03-22 17:28:44 -06:00 |
|
|
Kim Gardner
|
6844960300
|
Merge pull request #1473 from coralproject/email-verification
Email Verification Copy
|
2018-03-22 15:16:01 -04:00 |
|
|
Wyatt Johnson
|
34fa2fb891
|
Verification link copy
|
2018-03-22 12:50:37 -06: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 |
|