enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
Files
c77807bd221975f0bc0c8b9b79aefa02d01ea794
blap/src
T
History
Michael Telatynski c77807bd22 Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
2018-04-12 09:48:06 +01:00
..
actions
Fix broken import preventing people tag
2018-03-22 10:23:34 +00:00
async-components/views/dialogs
Remove use of deprecated React.PropTypes
2017-12-26 14:03:18 +13:00
autocomplete
Merge pull request #1778 from matrix-org/t3chguy/devtools_autocomplete
2018-03-22 09:54:26 +00:00
components
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-04-12 09:48:06 +01:00
i18n/strings
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-04-12 09:48:06 +01:00
settings
Fix to prevent guests from seeing features
2018-04-06 11:03:17 +01:00
stores
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-04-12 09:48:06 +01:00
utils
Fix user widget event type.
2018-04-02 10:02:41 +01:00
wrappers
Remove use of deprecated React.PropTypes
2017-12-26 14:03:18 +13:00
ActiveRoomObserver.js
Avoid re-rendering RoomList on room switch
2017-09-11 16:59:09 +01:00
AddThreepid.js
de-lint AddThreepid
2017-07-01 14:21:28 +01:00
Analytics.js
Always expect generationTimeMs
2018-03-28 10:31:03 +01:00
Avatar.js
de-lint RoomHeader, Avatar, SdkConfig, SlashCommands
2017-07-01 14:13:32 +01:00
BasePlatform.js
Add setupScreenSharingForIframe to BasePlatform
2017-09-25 17:12:37 +02:00
CallHandler.js
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-20 10:00:47 +00:00
CallMediaHandler.js
Add SettingsLevel enum; Move settings to own file.
2017-11-03 23:19:45 -06:00
ComposerHistoryManager.js
Run linting --fix
2017-11-16 13:19:36 +00:00
ContentMessages.js
Don't swallow error.
2018-03-29 16:24:03 +01:00
createRoom.js
Use invite_3pid prop of createRoom instead of manual invite after create
2018-01-25 09:54:31 +00:00
cryptodevices.js
Fix jsdoc
2018-01-11 10:27:15 +00:00
DateUtils.js
Add seconds to formatFullDate()
2018-02-08 18:09:04 +02:00
dispatcher.js
Copyright
2017-12-13 10:17:38 +00:00
email.js
de-lint email, extend
2017-07-01 14:43:18 +01:00
Entities.js
de-lint Entities
2017-07-01 14:34:20 +01:00
extend.js
de-lint email, extend
2017-07-01 14:43:18 +01:00
FromWidgetPostMessageApi.js
Refactor widget postMessage API.
2018-03-28 12:22:06 +01:00
GroupAddressPicker.js
Show GroupMemberList after inviting a group member
2018-03-12 17:23:31 +00:00
groups.js
Alter group member api
2017-11-07 11:27:42 +00:00
HtmlUtils.js
allow BigEmoji calc to ignore replies fallback if enabled
2018-04-04 10:36:48 +01:00
ImageUtils.js
Run eslint --fix
2017-10-11 17:56:17 +01:00
index.js
Allow fetch() to be stubbed for the RtsClient
2017-06-15 01:52:24 +01:00
IntegrationManager.js
Add callback handler for integration manager close.
2018-03-29 18:32:49 +01:00
Keyboard.js
Add alt condition back in, rename to specify igorance of shift
2018-01-04 12:06:19 +00:00
KeyRequestHandler.js
un-i18n Modal Analytics
2017-07-27 17:19:18 +01:00
languageHandler.js
Don't modify original options arg
2018-01-16 17:45:29 +00:00
Lifecycle.js
Fix bug where global "Never send to unverified..." is ignored
2018-02-22 18:47:27 +00:00
linkify-matrix.js
Implement Rich Quoting/Replies
2017-12-10 12:50:41 +00:00
Login.js
remove needless case-squash on login, castrating https://github.com/matrix-org/matrix-react-sdk/pull/1550
2017-11-13 10:34:38 +00:00
Markdown.js
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"
2018-01-07 20:30:18 +00:00
matrix-to.js
Implement Rich Quoting/Replies
2017-12-10 12:50:41 +00:00
MatrixClientPeg.js
Add tests for RoomSettings
2018-02-28 16:07:21 +00:00
Modal.js
Reimplement setting aria-hidden on the main app node by dispatching actions rather than assuming we can find and manipulate the node directly
2018-02-08 22:51:07 +01:00
Notifier.js
Don't notify for bad encrypted messages
2018-03-29 18:18:53 +01:00
ObjectUtils.js
de-lint ObjectUtils
2017-07-01 14:38:32 +01:00
PageTypes.js
Add 'groups' page
2017-06-28 13:56:18 +01:00
PasswordReset.js
de-lint PasswordReset
2017-07-01 14:31:59 +01:00
phonenumber.js
…
PlatformPeg.js
…
Presence.js
Don't reset the presence timer on every dispatch
2018-03-06 17:48:21 +00:00
ratelimitedfunc.js
Make ratelimitedfunc time from the function's end
2018-02-06 14:39:13 +00:00
Resend.js
Remove now-unused dispatches
2017-11-09 16:09:12 +00:00
RichText.js
Run linting --fix
2017-11-16 13:19:36 +00:00
Roles.js
Attempt to clarify the affect that the users_default has on power levels
2017-11-13 17:03:48 +00:00
RoomInvite.js
Use invite_3pid prop of createRoom instead of manual invite after create
2018-01-25 09:54:31 +00:00
RoomListSorter.js
de-lint Resend, RoomListSorter, UserActivity
2017-07-01 14:50:22 +01:00
RoomNotifs.js
Offline mode (#1723)
2018-02-06 17:50:53 +00:00
Rooms.js
Cache isConfCallRoom
2018-01-05 14:53:04 +00:00
RtsClient.js
Allow fetch() to be stubbed for the RtsClient
2017-06-15 01:52:24 +01:00
ScalarAuthClient.js
Add comment.
2018-02-25 23:00:46 +00:00
ScalarMessaging.js
Fix user widget event type.
2018-04-02 10:02:41 +01:00
SdkConfig.js
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
2017-11-19 15:33:07 +00:00
shouldHideEvent.js
fix based on PR review
2018-02-28 00:49:14 +00:00
Skinner.js
Add more doc
2017-09-08 17:43:41 +01:00
SlashCommands.js
Merge pull request #1675 from turt2live/travis/fix-granular-again
2018-01-05 11:48:32 +00:00
stripped-emoji.json
Bump the dep on emojione to 2.2.7 to add 🦈 and others
2017-07-11 13:48:15 +01:00
TextForEvent.js
Fix display name change message
2018-02-06 10:24:38 +00:00
Tinter.js
Put Tinter loop body in a try/catch
2018-04-11 18:31:54 +01:00
ToWidgetPostMessageApi.js
Refactor widget postMessage API.
2018-03-28 12:22:06 +01:00
UiEffects.js
…
Unread.js
don't let 3pid invites mark room as unread
2018-02-21 23:51:45 +00:00
UserActivity.js
de-lint Resend, RoomListSorter, UserActivity
2017-07-01 14:50:22 +01:00
UserAddress.js
Implement adding rooms to a group (or group summary) by room ID
2017-09-27 15:30:58 +01:00
UserSettingsStore.js
Merge pull request #1482 from turt2live/travis/presence
2017-11-14 23:53:16 +00:00
Velociraptor.js
Remove use of deprecated React.PropTypes
2017-12-26 14:03:18 +13:00
VelocityBounce.js
Run eslint --fix
2017-10-11 17:56:17 +01:00
WhoIsTyping.js
Use plurals in WhoIsTyping
2017-10-24 18:32:50 +02:00
WidgetMessaging.js
Refactor widget postMessage API.
2018-03-28 12:22:06 +01:00
WidgetMessagingEndpoint.js
Refactor widget postMessage API.
2018-03-28 12:22:06 +01:00
WidgetUtils.js
Fix user widget event type.
2018-04-02 10:02:41 +01:00