Commit Graph

8345 Commits

Author SHA1 Message Date
Kiwi 85890b4e6e Merge branch 'master' into email-verification 2017-10-24 12:01:59 +02:00
Belén Curcio 6d3cdb176e Merge branch 'master' into community-pagination- 2017-10-24 00:23:53 -03:00
Belen Curcio 38abf63cc9 removing unused files 2017-10-24 00:21:26 -03:00
Belen Curcio 34334b8152 Pagination only shows when there are results to show 2017-10-24 00:18:03 -03:00
Belen Curcio 0b973f24ff Replacing paginate from Stories 2017-10-24 00:14:47 -03:00
Belen Curcio abff1c763a More styling 2017-10-24 00:12:18 -03:00
Belen Curcio 9f4a913655 Passing props 2017-10-24 00:03:35 -03:00
Belen Curcio d363c977dc Refactor 2017-10-23 23:47:43 -03:00
Belen Curcio f004573ed2 Replacing Pagination Component 2017-10-23 23:47:05 -03:00
Kim Gardner 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
Wyatt Johnson 9217239caf Merge branch 'master' into onbuild 2017-10-23 12:33:56 -06:00
Kim Gardner 9fc0fc37db Fix merge conflicts 2017-10-23 19:30:36 +01:00
Kim Gardner c442b8bb70 Merge branch 'master' into talk-product-guide-features 2017-10-23 19:27:05 +01:00
Kim Gardner 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
Kiwi 1803c740fc Merge branch 'master' into bulk-approve-reject-actions 2017-10-23 19:29:24 +02:00
Wyatt Johnson fac028c22b update to docker build process 2017-10-23 10:50:29 -06:00
Chi Vinh Le d75ae3aca8 Revive resend verification feature 2017-10-23 18:46:41 +02:00
Kiwi a3216dd33e Merge branch 'master' into email-verification 2017-10-23 18:45:11 +02:00
Kim Gardner 6b7ceb99c9 Merge branch 'master' into talk-product-guide-features 2017-10-23 17:00:32 +01:00
Kim Gardner 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 Gardner 017d560421 Merge branch 'master' into bulk-approve-reject-actions 2017-10-23 15:52:20 +01:00
Kiwi 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 Gardner 0ee56fe8d3 Merge branch 'master' into talk-product-guide-features 2017-10-20 17:53:31 +01:00
Kim Gardner 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 Gardner 487e1e34db Merge branch 'master' into talk-product-guide-features 2017-10-20 16:48:49 +01:00
Kiwi c054992741 Merge branch 'master' into turn-off-flagged-edited-notification 2017-10-20 17:33:09 +02:00
Kim Gardner 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 Gardner 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
Kiwi 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
Kim Gardner 8ce9f2d4bb Clean up docs, fix links, remove Tutorials section for now 2017-10-20 11:28:03 +01:00
Kim Gardner 76f9e1487c Merge branch 'master' into email-verification 2017-10-19 21:55:14 +01:00
Kim Gardner e729da8e01 Merge branch 'master' into talk-product-guide-features 2017-10-19 21:54:50 +01:00
Facu 011d8830fb Merge branch 'master' into bulk-approve-reject-actions 2017-10-19 14:12:08 -03:00
Kim Gardner 5713e2e2f6 Merge pull request #1116 from coralproject/no-comments
No Comments Text
2017-10-19 16:16:21 +01:00
Belen Curcio f23a5132d6 Missing proptypes 2017-10-19 11:35:40 -03:00
Belen Curcio 101b6cbe59 Missing proptypes 2017-10-19 11:26:22 -03:00
Belen Curcio 7494752019 Translations, Proptypes, NoComments Component 2017-10-19 11:20:09 -03:00
Belen Curcio 11999d751a No inline styling 2017-10-19 11:01:27 -03:00
Belen Curcio 2a85b9fdd2 Adding missing proptypes 2017-10-19 10:58:24 -03:00