wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,324 Commits 10 Branches 125 Tags
f4fd843efebe7e167e4ac537cf0e244a303dc449
Commit Graph
10324 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim GardnerandGitHub 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 GardnerandGitHub 1dc1f91b72 Merge branch 'master' into 1920 2018-10-25 21:00:47 +01:00
Kim GardnerandGitHub 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
Kim GardnerandWyatt Johnson dcd7145510 Update Spanish translations (#2019) 
* Update translations

* More sp trans

* Add translation for Contains Link
 2018-10-24 11:58:42 -06:00
Kim GardnerandGitHub d3896ed97d Merge pull request #2016 from hovoodd/stream-status 
Fixed stream status updating
 2018-10-24 17:39:22 +01:00
Kim GardnerandGitHub 47a3cba5f5 Merge branch 'master' into stream-status 2018-10-24 13:57:53 +01:00
Kim GardnerandGitHub 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 KolehmainenandGitHub 5f62083c2f Merge branch 'master' into master 2018-10-23 20:53:52 +03:00
Kim GardnerandGitHub c0efc33044 Merge branch 'master' into stream-status 2018-10-23 17:47:48 +01:00
Kim GardnerandGitHub 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 GardnerandGitHub 1bfe0fbac1 Merge branch 'master' into change-username 2018-10-23 17:41:10 +01:00
Kim GardnerandGitHub b3d704be76 Merge branch 'master' into 1920 2018-10-23 17:23:11 +01:00
Kim GardnerandGitHub 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
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 GardnerandGitHub 9e511817a8 Merge pull request #1990 from snorremd/master 
Display avatar left of comments by default
 2018-10-19 19:51:21 +01:00
Kim GardnerandGitHub 4015e19040 Merge branch 'master' into master 2018-10-19 19:47:36 +01:00
Kim GardnerandGitHub 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 GardnerandGitHub 893c8d32b2 Merge branch 'master' into 1920 2018-10-19 19:07:59 +01:00
Kim GardnerandGitHub 2dfadebd42 Merge branch 'master' into 1939 2018-10-19 18:45:46 +01:00
Kim GardnerandGitHub a2d5af1372 Merge pull request #2007 from coralproject/base64-secret 
Base64 Secret Encoding
 2018-10-19 18:45:12 +01:00
Kim GardnerandGitHub 7a5416a807 Merge branch 'master' into base64-secret 2018-10-19 18:39:36 +01:00
Kim GardnerandGitHub 8c2c632f52 Merge pull request #2011 from coralproject/email-prefix 
Email Prefix Fix
 2018-10-19 18:39:02 +01:00
Wyatt JohnsonandGitHub 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 GardnerandGitHub 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
immberandWyatt Johnson 5e4bdf1f0c Perspective (#2001) 
* perspective documentation update

* fixed typo
 2018-10-16 20:25:11 +00:00
immberandWyatt Johnson 71e1b69afe perspective documentation update (#1999) 2018-10-16 18:35:10 +00:00
Kim GardnerandGitHub 6fa18f6c7c Merge branch 'master' into 1920 2018-10-15 16:52:37 +01:00
Kim GardnerandGitHub bda9b55562 Merge branch 'master' into master 2018-10-15 16:50:42 +01:00
Kim GardnerandGitHub 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 GardnerandGitHub 8a88228d9c Merge branch 'master' into 1920 2018-10-12 18:57:35 +01:00
Kim GardnerandGitHub 0a9664d464 Merge branch 'master' into fix-admin-menu-visibility 2018-10-12 18:53:09 +01:00
Kim GardnerandGitHub b3749b9332 Merge pull request #1961 from hovoodd/master 
Added filters to Admin > Community > People
 2018-10-12 18:48:55 +01:00
Kim Gardner aecb7de019 Add Spanish translations 2018-10-12 18:24:55 +01:00
Snorre Magnus Davøen ade3cf6252 Display avatar left of comments by default 
Previously avatars would be displayed on top of comments. Most comment
and forum systems will display avatars to the left of comments/posts.
The https://github.com/snorremd/talk-plugin-gravatar plugin currently
renders avatars in the avatar slot which will render the avatar on top
of the comments. This change modified the comment container to be
displayed as a flex container with row direction. It also adds 10px top
margin to the avatar slot which corresponds with the comment header.

Signed-off-by: Snorre Magnus Davøen <snorremd@gmail.com>
 2018-10-12 19:13:04 +02:00
Wyatt JohnsonandGitHub 1837ae4a0f Merge branch 'master' into fix-admin-menu-visibility 2018-10-12 16:44:22 +00:00
Kim GardnerandGitHub 334074a7ca Merge branch 'master' into master 2018-10-12 16:55:59 +01:00
Fabian MarzandWyatt Johnson f93c4adc97 Fixed typo in GDPR docs. (#1986) 2018-10-11 14:57:16 +00:00
Wyatt JohnsonandGitHub bb54009567 Websocket Regression (#1971) 
* fix: addresses websocket connection issues

- reverted upgrade to subscriptions-transport-ws
- removed unnecessary websocket resets
- improved websocket reconnection logic

* Update package.json
v4.6.5 		2018-10-09 17:47:07 +00:00
vittoboaandWyatt Johnson c126d217ad Fix spanish translation (#1977) 2018-10-09 15:35:22 +00:00
Bryce Kahle 8b2dc3a46d do not show admin drawer unless user has access 
Fixes https://github.com/coralproject/talk/issues/1791
 2018-10-08 13:02:37 -04:00