Commit Graph

7891 Commits

Author SHA1 Message Date
Kim Gardner c99411b8fd Merge pull request #1288 from coralproject/reply-on-hidden-comment
Replies to hidden/deleted comments
2018-01-18 11:18:53 -05:00
Kim Gardner 022a57479d Merge branch 'master' into reply-on-hidden-comment 2018-01-18 11:02:08 -05:00
Kim Gardner 56001d7780 Merge pull request #1284 from coralproject/action-index
Action index
2018-01-18 11:01:43 -05:00
Kim Gardner a010302242 Merge branch 'master' into reply-on-hidden-comment 2018-01-18 11:01:36 -05:00
Kim Gardner f306d54924 Merge branch 'master' into action-index 2018-01-18 10:53:45 -05:00
Kim Gardner 8ea3ab9c02 Merge pull request #1283 from coralproject/formatting
Adding format to admin comment - CommentFormatter
2018-01-18 10:51:50 -05:00
Kim Gardner ec9a57bede Merge branch 'master' into formatting 2018-01-18 10:42:56 -05:00
Wyatt Johnson 08b1cada7e Merge pull request #1293 from coralproject/deploy-script
Fixed deploy script
v4.0.0
2018-01-17 15:01:57 -07:00
Wyatt Johnson 4960b34748 fixed deploy script 2018-01-17 14:56:36 -07:00
Wyatt Johnson e048491221 Merge pull request #1291 from coralproject/webpack-sourcemaps
Webpack Sourcemap Configuration
2018-01-17 11:40:48 -07:00
Wyatt Johnson 68598d3c45 cleanup for logic 2018-01-17 11:34:09 -07:00
Wyatt Johnson 7ca89435c6 added configuration options for webpack 2018-01-17 11:24:36 -07:00
Kim Gardner 426d7dbfec Merge branch 'master' into formatting 2018-01-17 10:06:47 -05:00
Wyatt Johnson b11a730373 Merge branch 'master' into reply-on-hidden-comment 2018-01-16 14:13:13 -07:00
Wyatt Johnson b709cb485e refactored publicCreate 2018-01-16 14:11:24 -07:00
Kiwi 13fc91b355 Merge pull request #1287 from coralproject/ci-time-sync
CI Time Sync
2018-01-16 20:53:13 +01:00
Wyatt Johnson 9eec280868 added time syncing 2018-01-16 12:31:45 -07:00
Wyatt Johnson 45d4c79c26 added reply bug 2018-01-16 12:30:38 -07:00
Kiwi 1cf2bda36c Merge pull request #1286 from coralproject/e2e-pause
Add a little pause in e2e test
2018-01-16 19:44:21 +01:00
Chi Vinh Le b1adfe8c46 Add a little pause in e2e test 2018-01-16 19:33:07 +01:00
okbel 2684ac4933 missing brackets 2018-01-15 13:14:24 -03:00
okbel 1f0e9da5d0 Merge branch 'formatting' of github.com:coralproject/talk into formatting
* 'formatting' of github.com:coralproject/talk:
  prettier
  End of line
  More syncs
  Fix deselect bug of action menu in ff
2018-01-15 13:00:07 -03:00
okbel bfa2f6edb9 Updates 2018-01-15 12:59:39 -03:00
Kiwi ea7998257c Merge branch 'master' into action-index 2018-01-15 16:02:53 +01:00
Wyatt Johnson 25c178b267 Merge branch 'master' into formatting 2018-01-12 17:23:35 -07:00
Wyatt Johnson 7885b025ee Merge pull request #1262 from coralproject/firefox-actionmenu-deselect
Fix deselect bug of action menu in ff
2018-01-12 16:49:04 -07:00
Wyatt Johnson 3606726c4b Merge branch 'master' into firefox-actionmenu-deselect 2018-01-12 16:33:55 -07:00
Wyatt Johnson d69b1f98c8 Merge branch 'master' into action-index 2018-01-12 15:50:02 -07:00
okbel 77d83e04d5 Wrong name 2018-01-12 15:53:32 -03:00
okbel 86c4d70daf Adding changes to the comments on the User Drawer Detail 2018-01-12 15:51:49 -03:00
okbel e256b0da8a Adding format to admin comment - CommentFormatter 2018-01-12 15:47:09 -03:00
Wyatt Johnson 93bda87ad0 Merge pull request #1153 from coralproject/next
Release 4.0.0
2018-01-12 09:43:40 -07:00
Chi Vinh Le 1ccd36e9e9 prettier 2018-01-12 14:07:05 +01:00
Chi Vinh Le 9762f34324 End of line 2018-01-12 11:45:52 +01:00
Chi Vinh Le 9ce14acc9a More syncs 2018-01-12 11:23:29 +01:00
Wyatt Johnson c19a6c8b10 Merge branch 'next' into firefox-actionmenu-deselect 2018-01-11 20:25:18 -07:00
Wyatt Johnson 0abc2ca243 replaced eslint:recommended with prettier 2018-01-11 20:00:34 -07:00
Wyatt Johnson d56c19016a Merge pull request #1279 from coralproject/docs
Updated docs for 4.0
2018-01-11 17:53:12 -07:00
Kim Gardner bb9a93986e Small wording tweak 2018-01-11 19:41:45 -05:00
Kim Gardner c906b2df5e Merge branch 'next' into docs 2018-01-11 19:36:58 -05:00
Wyatt Johnson 204b442e2f added deprecation warning 2018-01-11 17:32:52 -07:00
Wyatt Johnson 876f4ef700 updated docs for 4.0 2018-01-11 16:51:08 -07:00
Wyatt Johnson 7f02d4f39c fixed circle.yml 2018-01-11 15:54:46 -07:00
Kim Gardner c1f5450b9a Merge branch 'master' into next 2018-01-11 17:43:43 -05:00
Wyatt Johnson 7f291cf056 Merge pull request #1276 from coralproject/email-send-fix
Missing Email Error
2018-01-11 15:28:18 -07:00
Wyatt Johnson 7706a0521c Merge branch 'next' into email-send-fix 2018-01-11 15:28:11 -07:00
Wyatt Johnson 81d2927c0f Merge pull request #1278 from coralproject/plugin-context
Plugin context
2018-01-11 15:27:50 -07:00
Wyatt Johnson f2698298f7 Merge branch 'next' into plugin-context 2018-01-11 15:27:04 -07:00
Wyatt Johnson a4e8ea93bc fixed import typo 2018-01-11 15:24:46 -07:00
Kim Gardner ca49b373bf Merge branch 'next' into email-send-fix 2018-01-11 17:23:42 -05:00