Commit Graph

10333 Commits

Author SHA1 Message Date
Kiwi 49d2416172 Merge branch 'master' into admin-improvements 2018-10-26 20:08:24 +02:00
Parikshit Hooda aac7cae6d6 typo fix : whih to which (#2039)
typo fix : whih to which
2018-10-26 17:22:19 +00:00
Kim Gardner f4fd843efe Merge pull request #1963 from twosmalltrees/1920
Update text and description in moderation configure view
2018-10-26 10:58:36 +01:00
Kim Gardner 1dc1f91b72 Merge branch 'master' into 1920 2018-10-25 21:00:47 +01:00
Kiwi c98216cf3c Merge branch 'master' into admin-improvements 2018-10-25 21:58:16 +02:00
Kim Gardner 2c9f8586d3 Merge pull request #2035 from coralproject/fix-pointer-events
Fix pointer events in configure card
2018-10-25 20:55:03 +01:00
Chi Vinh Le 4ce5d97e3b Always have pointer events in configure cards 2018-10-25 21:42:18 +02:00
Wyatt Johnson 3ea2632187 Merge branch 'master' into admin-improvements 2018-10-25 17:57:24 +00:00
Kim Gardner dcd7145510 Update Spanish translations (#2019)
* Update translations

* More sp trans

* Add translation for Contains Link
2018-10-24 11:58:42 -06:00
Kim Gardner d3896ed97d Merge pull request #2016 from hovoodd/stream-status
Fixed stream status updating
2018-10-24 17:39:22 +01:00
Kim Gardner 47a3cba5f5 Merge branch 'master' into stream-status 2018-10-24 13:57:53 +01:00
Kim Gardner 0f1cabe126 Merge pull request #2017 from iSasFTW/master
Visible validation errors in the username change box
2018-10-24 13:56:52 +01:00
Saska Kolehmainen 5f62083c2f Merge branch 'master' into master 2018-10-23 20:53:52 +03:00
Wyatt Johnson 3cabe50a7b fix: strip out 0xAD from the comment body before testing for links 2018-10-23 11:06:31 -06:00
Kim Gardner c0efc33044 Merge branch 'master' into stream-status 2018-10-23 17:47:48 +01:00
Kim Gardner 9344c1bc80 Merge pull request #2015 from hovoodd/change-username
Added additional check for `usernameCanBeUpdated` condition in profile
2018-10-23 17:47:37 +01:00
Kim Gardner 1bfe0fbac1 Merge branch 'master' into change-username 2018-10-23 17:41:10 +01:00
Kim Gardner b3d704be76 Merge branch 'master' into 1920 2018-10-23 17:23:11 +01:00
Kim Gardner 3c100160fb Merge pull request #2014 from hovoodd/collapsible-list
Made Banned/Suspended Word Lists collapsible in Admin > Configure
2018-10-23 16:19:23 +01:00
Wyatt Johnson 49c7d2eeda fix: move priority up for token fetching 2018-10-22 12:25:20 -06:00
Wyatt Johnson cff9b29a36 fix: adjust perspective defaults when failure occurs 2018-10-22 12:22:01 -06:00
Wyatt Johnson 5a1f93975c feat: added support for access_token hash passthrough 2018-10-22 12:13:15 -06:00
Wyatt Johnson cd6da751a6 fix: added patch to reset form 2018-10-22 12:12:35 -06:00
Saska Kolehmainen 41610ccf57 Added error message to profile tab in embedded comments for when disallowed characters are added while changing the username. 2018-10-21 17:45:54 +03:00
hovoodd 607a59ad63 Fix stream status updating 2018-10-20 22:59:13 +03:00
hovoodd c0fea4821b Add additional check for usernameCanBeUpdated condition in profile 2018-10-20 22:05:32 +03:00
hovoodd 8432df15a1 Add collapsible prop to banned and suspended lists in admin 2018-10-20 19:07:56 +03:00
hovoodd 61486caa9e Make ConfigureCard collapsible 2018-10-20 19:01:01 +03:00
Harrison Reid 7f45f7e2e2 Add Code of Conduct Link 2018-10-20 08:43:13 +11:00
Kim Gardner 9e511817a8 Merge pull request #1990 from snorremd/master
Display avatar left of comments by default
2018-10-19 19:51:21 +01:00
Kim Gardner 4015e19040 Merge branch 'master' into master 2018-10-19 19:47:36 +01:00
Kim Gardner c1fcc82b62 Merge pull request #2006 from twosmalltrees/1939
Keep Question Box visible after stream is closed #1939
2018-10-19 19:47:10 +01:00
Kim Gardner 893c8d32b2 Merge branch 'master' into 1920 2018-10-19 19:07:59 +01:00
Kim Gardner 2dfadebd42 Merge branch 'master' into 1939 2018-10-19 18:45:46 +01:00
Kim Gardner a2d5af1372 Merge pull request #2007 from coralproject/base64-secret
Base64 Secret Encoding
2018-10-19 18:45:12 +01:00
Kim Gardner 7a5416a807 Merge branch 'master' into base64-secret 2018-10-19 18:39:36 +01:00
Kim Gardner 8c2c632f52 Merge pull request #2011 from coralproject/email-prefix
Email Prefix Fix
2018-10-19 18:39:02 +01:00
Wyatt Johnson fabec2c89b review: fix invalid substring 2018-10-19 16:28:13 +00:00
Wyatt Johnson 7f18603fd5 fix: fixes #2009 2018-10-19 10:05:05 -06:00
Kim Gardner 3a69e0cf96 Merge branch 'master' into base64-secret 2018-10-18 21:53:43 +01:00
Wyatt Johnson 7ad3d247b5 feat: added base64 secret encoding 2018-10-18 14:33:45 -06:00
Harrison Reid 130dc578b3 Refactor Stream component, move QuestionBox render logic into seperate fn 2018-10-18 21:25:36 +11:00
Harrison Reid fd7114ab2a Keep question box visible when comment stream is closed 2018-10-18 21:06:00 +11:00
immber 5e4bdf1f0c Perspective (#2001)
* perspective documentation update

* fixed typo
2018-10-16 20:25:11 +00:00
immber 71e1b69afe perspective documentation update (#1999) 2018-10-16 18:35:10 +00:00
Kim Gardner 6fa18f6c7c Merge branch 'master' into 1920 2018-10-15 16:52:37 +01:00
Kim Gardner bda9b55562 Merge branch 'master' into master 2018-10-15 16:50:42 +01:00
Kim Gardner d843320c4a Merge pull request #1976 from brycekahle/fix-admin-menu-visibility
do not show admin drawer unless user has access
2018-10-15 16:50:30 +01:00
Kim Gardner 8a88228d9c Merge branch 'master' into 1920 2018-10-12 18:57:35 +01:00
Kim Gardner 0a9664d464 Merge branch 'master' into fix-admin-menu-visibility 2018-10-12 18:53:09 +01:00