Commit Graph
6893 Commits
Author SHA1 Message Date
Kim GardnerandGitHub ed929fa2c6 Merge branch 'master' into viewing-options-bug 2017-10-25 14:32:07 +01:00
Kim GardnerandGitHub 2a90956a1d Merge pull request #1127 from coralproject/iefixes
IE & Edge fixes
2017-10-25 14:31:46 +01:00
Belen Curcio 833922f0aa Missing reference to the dropdownContainer class 2017-10-25 09:35:08 -03:00
KiwiandGitHub f6f9d380f1 Merge branch 'master' into iefixes 2017-10-25 14:22:06 +02:00
Chi Vinh Le 823bf18335 Add edge to ci 2017-10-25 14:19:13 +02:00
Chi Vinh Le 16bf887161 Add ie to ci testing 2017-10-25 13:06:00 +02:00
Chi Vinh Le 27eb159a75 Add special popup handling for ie 11 2017-10-25 13:04:41 +02:00
Kim GardnerandGitHub 327c87cda6 Merge pull request #1126 from coralproject/mailer-fix
Mail Service Fix
2017-10-24 18:17:15 +01:00
Wyatt Johnson 1dec169520 added port parsing for smtp 2017-10-24 11:03:15 -06:00
Kim GardnerandGitHub edce550587 Merge pull request #1099 from coralproject/email-verification
Email Verification Resend
2017-10-24 17:53:19 +01:00
Chi Vinh Le 934b630ce2 Simplified Spinner for IE and Edge for Spinner (using css hacks) 2017-10-24 18:47:55 +02:00
Wyatt JohnsonandGitHub 01c5bc4e26 Merge branch 'master' into email-verification 2017-10-24 10:09:52 -06:00
Wyatt Johnson dd7ca9fd0c added docs 2017-10-24 10:08:03 -06:00
Chi Vinh Le ca1ce9ba76 Dont cache auth 2017-10-24 17:23:10 +02:00
Kim GardnerandGitHub 5037af9100 Merge pull request #1125 from coralproject/userDetailBugs
Fix UserDetail bugs
2017-10-24 14:49:27 +01:00
Kim GardnerandGitHub 7ba42f059c Merge branch 'master' into userDetailBugs 2017-10-24 14:30:09 +01:00
Kim GardnerandGitHub cf2746fc28 Merge pull request #1124 from coralproject/fix-doc-formatting
Fix formatting typo in docs
2017-10-24 14:23:08 +01:00
Chi Vinh Le b7b9da9509 Change fetchPolicy 2017-10-24 15:16:45 +02:00
Kim Gardner 24ec898a15 Fix formatting 2017-10-24 14:14:26 +01:00
Chi Vinh Le 46359b4a1b Show errors 2017-10-24 14:49:32 +02:00
KiwiandGitHub 85890b4e6e Merge branch 'master' into email-verification 2017-10-24 12:01:59 +02:00
Kim GardnerandGitHub fb9419f2ad Merge pull request #1098 from coralproject/talk-product-guide-features
Talk Product Guide - features and configuration
2017-10-23 19:41:58 +01:00
Kim Gardner 9fc0fc37db Fix merge conflicts 2017-10-23 19:30:36 +01:00
Kim GardnerandGitHub c442b8bb70 Merge branch 'master' into talk-product-guide-features 2017-10-23 19:27:05 +01:00
Kim GardnerandGitHub e1f897ec17 Merge pull request #1104 from facuesr/bulk-approve-reject-actions
Bulk approve/reject actions for Moderators
2017-10-23 19:26:00 +01:00
KiwiandGitHub 1803c740fc Merge branch 'master' into bulk-approve-reject-actions 2017-10-23 19:29:24 +02:00
Chi Vinh Le d75ae3aca8 Revive resend verification feature 2017-10-23 18:46:41 +02:00
KiwiandGitHub a3216dd33e Merge branch 'master' into email-verification 2017-10-23 18:45:11 +02:00
Kim GardnerandGitHub 6b7ceb99c9 Merge branch 'master' into talk-product-guide-features 2017-10-23 17:00:32 +01:00
Kim GardnerandGitHub 4ae9928224 Merge pull request #1121 from coralproject/config-fix
Config Fix
2017-10-23 16:58:36 +01:00
Wyatt Johnson dae8dc0509 patched config bug 2017-10-23 09:51:34 -06:00
Kim GardnerandGitHub 017d560421 Merge branch 'master' into bulk-approve-reject-actions 2017-10-23 15:52:20 +01:00
KiwiandGitHub 3f59ed1e46 Merge branch 'master' into email-verification 2017-10-23 11:56:40 +02:00
Facu 9c38bab83b notify error messages 2017-10-20 17:01:52 -03:00
Wyatt Johnson a9cb206415 formatting 2017-10-20 13:14:00 -06:00
Wyatt Johnson c1b954965f Fixed incorrect plugin naming 2017-10-20 11:40:55 -06:00
Kim Gardner e0713a5ec4 Update auth section 2017-10-20 17:56:24 +01:00
Kim GardnerandGitHub 0ee56fe8d3 Merge branch 'master' into talk-product-guide-features 2017-10-20 17:53:31 +01:00
Kim GardnerandGitHub 88390f13c7 Merge pull request #1119 from coralproject/turn-off-flagged-edited-notification
Turn off notifications for comments flagged and edited
2017-10-20 17:02:04 +01:00
Chi Vinh Le 7e709ec41d Merge branch 'turn-off-flagged-edited-notification' of ssh://github.com/coralproject/talk into turn-off-flagged-edited-notification 2017-10-20 17:56:07 +02:00
Chi Vinh Le 1bfecdd77c Don't show notification when featuring comment 2017-10-20 17:55:37 +02:00
Kim GardnerandGitHub 487e1e34db Merge branch 'master' into talk-product-guide-features 2017-10-20 16:48:49 +01:00
KiwiandGitHub c054992741 Merge branch 'master' into turn-off-flagged-edited-notification 2017-10-20 17:33:09 +02:00
Kim GardnerandGitHub 12b83d3904 Merge pull request #1120 from coralproject/disable-ie-e2e
Temporarily disable IE in browserstack ci
2017-10-20 16:30:27 +01:00
Kim Gardner 7ebba3018f Merge branch 'talk-product-guide-features' of git+ssh://github.com/coralproject/talk into talk-product-guide-features 2017-10-20 16:26:23 +01:00
Kim GardnerandGitHub 0e089b8ff8 Merge branch 'master' into talk-product-guide-features 2017-10-20 16:25:08 +01:00
Chi Vinh Le 5695599f74 Temporarily disable IE in browserstack ci 2017-10-20 17:23:31 +02:00
Chi Vinh Le bef3e3e33c Turn off notifications for flagged and edited 2017-10-20 17:19:44 +02:00
KiwiandGitHub 8dbd1789e0 Merge pull request #1118 from coralproject/improve-e2e
Disable network logging
2017-10-20 15:01:03 +02:00
Chi Vinh Le ee548d7180 Disable network logging 2017-10-20 14:45:12 +02:00