Commit Graph

6962 Commits

Author SHA1 Message Date
Wyatt Johnson a3eeec34df Merge pull request #1137 from blackcathacker/premod_setting
Send user an email when they are banned #1050
2017-10-31 10:06:00 -06:00
Wyatt Johnson d20666adb9 Update users.js
Prefix added by mailer service
2017-10-31 10:00:47 -06:00
Wyatt Johnson b92b4027b0 Merge branch 'master' into premod_setting 2017-10-31 09:32:43 -06:00
Kim Gardner 457322e3d0 Merge pull request #1145 from coralproject/readme-updates
Readme updates
2017-10-31 14:40:53 +00:00
Kim Gardner 9ba8cbcbe1 Fix logo link 2017-10-31 14:30:32 +00:00
Kim Gardner 93363a0650 Remove indenting 2017-10-31 14:27:38 +00:00
Kim Gardner 5c033dbfdf Tweaks 2017-10-31 11:40:33 +00:00
Kim Gardner 3cdf2a3118 Formatting 2017-10-31 11:31:13 +00:00
Kim Gardner 4e5e989d22 Update one-click directions 2017-10-31 11:25:22 +00:00
Kim Gardner 62660ed144 Fix header 2017-10-31 11:18:24 +00:00
Kim Gardner 2d44f7abf4 Spruce up README 2017-10-31 11:12:14 +00:00
Kim Gardner ea98f0275d Merge branch 'master' into premod_setting 2017-10-31 10:35:44 +00:00
Kim Gardner f573504a3c Merge pull request #1141 from coralproject/update-version
Update version number to be correct
2017-10-30 14:34:26 +00:00
Kim Gardner 8c0118106b Update version number to be correct 2017-10-30 14:24:15 +00:00
Kim Gardner 7bf114c01a Merge branch 'master' into premod_setting 2017-10-30 13:25:14 +00:00
Kim Gardner 6460cbd536 Merge pull request #1138 from blackcathacker/disable_report
disable report button when comment already reported
2017-10-30 13:24:10 +00:00
blackcathacker 82a332c787 disable report button when comment already reported 2017-10-29 19:48:42 -07:00
blackcathacker bfe82218ed Send user an email when they are banned #1050 2017-10-29 18:48:15 -07:00
Wyatt Johnson b7137fbcd4 Merge pull request #1132 from coralproject/docker-regression
Docker Regression Fix
v3.7.1
2017-10-26 09:43:15 -06:00
Wyatt Johnson 4089d09681 fix regression missing yarn cache clean 2017-10-26 09:19:29 -06:00
Kiwi a7eb588f7f Merge pull request #1122 from coralproject/onbuild
Docker Updates
2017-10-26 14:40:45 +02:00
Kiwi cd92dbf682 Merge branch 'master' into onbuild 2017-10-26 14:33:02 +02:00
Kiwi 89ab71eb1d Merge pull request #1130 from coralproject/tests-e2e
Missing Classes and testing Admin Drawer
2017-10-26 14:31:58 +02:00
Kiwi c1cfe3b200 Merge branch 'master' into onbuild 2017-10-26 14:28:59 +02:00
Kiwi d7ed679384 Merge branch 'master' into tests-e2e 2017-10-26 14:20:53 +02:00
Wyatt Johnson 7446712109 Merge pull request #1131 from coralproject/wyattjoh-patch-1
Disable e2e
v3.7.0
2017-10-25 14:10:39 -06:00
Wyatt Johnson 6647e22d1c Update circle.yml 2017-10-25 14:05:04 -06:00
Belen Curcio 59acdc5c02 new e2e test 2017-10-25 16:53:18 -03:00
Belen Curcio b06ae9001e Adding missing classes 2017-10-25 16:31:46 -03:00
Belén Curcio 1e718532f3 Merge pull request #1129 from coralproject/community-pagination-
Adding a pause after admin login - Cross browser compat [E2E]
2017-10-25 16:05:27 -03:00
Belén Curcio 6d797b44c8 Merge branch 'master' into community-pagination- 2017-10-25 15:59:33 -03:00
Belen Curcio dbd7f26311 Adding pause after login 2017-10-25 15:57:57 -03:00
Kim Gardner 11f774ecab Merge pull request #1123 from coralproject/community-pagination-
Community/Stories Refactor and Paginate Component
2017-10-25 19:23:14 +01:00
Chi Vinh Le d472223ee3 Fix/Implement sorting for stories 2017-10-25 19:32:47 +02:00
Chi Vinh Le b4daf8fc98 Move searchValue to Redux 2017-10-25 19:19:59 +02:00
Chi Vinh Le e41c224e3d Remove unused 2017-10-25 19:14:25 +02:00
Chi Vinh Le 20b5525c48 Refactor and fix query 2017-10-25 19:07:14 +02:00
Chi Vinh Le 23da613f2b Declaratively set page 2017-10-25 18:02:18 +02:00
Chi Vinh Le df079d29bd Set current page declaratively for People 2017-10-25 17:38:58 +02:00
Kiwi e782df815b Merge branch 'master' into community-pagination- 2017-10-25 17:09:34 +02:00
Kiwi 9bfc17d332 Merge pull request #1128 from coralproject/viewing-options-bug
Viewing Options Styling bug
2017-10-25 17:09:21 +02:00
Chi Vinh Le 3ff47dc610 Fix ci 2017-10-25 16:47:51 +02:00
Kim Gardner ed929fa2c6 Merge branch 'master' into viewing-options-bug 2017-10-25 14:32:07 +01:00
Kim Gardner 369e974a0c Merge branch 'master' into community-pagination- 2017-10-25 14:32:03 +01:00
Kim Gardner 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
Kiwi 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