okbel
935ba6e9fe
Merge branch 'party-bugsa' of github.com:coralproject/talk into party-bugsa
...
* 'party-bugsa' of github.com:coralproject/talk:
Fixed up clean script
Moved loadable to the markdown editor
swapped manual dynamic chunked loader with readt-loadable
improved static template resolve in development
improved introspection
2018-03-23 16:54:13 -03:00
okbel
4881c33942
Calc added
2018-03-23 16:52:38 -03:00
Kim Gardner and GitHub
1b233e8cb6
Merge branch 'master' into party-bugsa
2018-03-23 13:54:52 -04:00
Kim Gardner and GitHub
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
okbel
5e259af72b
Merge branch 'master' of github.com:coralproject/talk into party-bugsa
...
* 'master' of github.com:coralproject/talk:
Verification link copy
2018-03-23 14:17:46 -03:00
Wyatt Johnson
d7cf733a42
Moved loadable to the markdown editor
2018-03-23 11:15:47 -06: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
Belén Curcio and GitHub
e66a2eb8e0
Merge branch 'master' into party-bugsa
2018-03-22 16:27:17 -03:00
okbel
61836423ac
Adding CommentNotFound Component
2018-03-22 16:21:13 -03:00
Kim Gardner and GitHub
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
okbel
b0ea4960e3
Working
2018-03-22 15:40:04 -03:00
okbel
36988d7e20
Forbidden component
2018-03-22 15:29:56 -03:00
Kim Gardner and GitHub
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 and GitHub
47a2c5a174
Merge pull request #1463 from coralproject/update-default-plugins
...
Update default plugins
2018-03-21 16:43:54 -06:00
Kim Gardner and GitHub
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 and GitHub
5463959347
Merge pull request #1468 from coralproject/docs
...
Updated Notifications Docs
2018-03-21 18:18:36 -04:00
Wyatt Johnson and GitHub
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 and GitHub
5a2212846d
Merge branch 'master' into update-default-plugins
2018-03-21 17:40:18 -04:00
Kim Gardner and GitHub
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 and GitHub
8e3395d0e8
Merge branch 'master' into rte-rework
2018-03-21 17:14:02 -04:00
Kim Gardner and GitHub
5b436e3c4a
Merge pull request #1453 from coralproject/hackday-upvote-downvote-ama
...
Upvote and Downvote
2018-03-21 17:13:48 -04:00
Kim Gardner and GitHub
9185d3df43
Merge branch 'master' into hackday-upvote-downvote-ama
2018-03-21 17:06:16 -04:00
Kim Gardner and GitHub
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 and GitHub
bce56f2719
Merge branch 'master' into rte-rework
2018-03-21 16:42:54 -04:00
Kim Gardner and GitHub
1928bc3819
Merge branch 'master' into update-default-plugins
2018-03-21 16:42:38 -04:00
Kim Gardner and GitHub
11ca430ad9
Merge pull request #1465 from coralproject/mailer-template-fix
...
Mailer Template Fix
2018-03-21 16:42:26 -04:00
Kim Gardner and GitHub
dc8f4a1765
Merge branch 'master' into mailer-template-fix
2018-03-21 16:35:34 -04:00
Kim Gardner and GitHub
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 and GitHub
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 and GitHub
937ee5ea67
Merge branch 'master' into update-default-plugins
2018-03-21 15:34:43 -04:00
Kim Gardner and GitHub
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 and GitHub
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 and GitHub
f4575e2075
Merge branch 'master' into docs
2018-03-21 14:40:48 -04:00
Kim Gardner and GitHub
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
okbel