mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-12 03:07:41 +03:00
Code Issues Projects Releases Packages Wiki Activity
element-web/src
History
Michael Telatynski dcd99ac3de Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 
# Conflicts:
#	src/components/structures/UserSettings.js
#	src/i18n/strings/en_EN.json

First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 23:54:57 +01:00
..
async-components/views/dialogs More i18n strings (#963) 2017-05-30 15:09:57 +01:00
autocomplete clean up file 2017-05-29 23:52:55 +01:00
components Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 2017-05-30 23:54:57 +01:00
i18n/strings Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 2017-05-30 23:54:57 +01:00
utils Group e2e keys into blocks of 4 characters 2017-05-22 12:01:09 +01:00
wrappers Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
AddThreepid.js Bulk change counterpart imports 2017-05-25 11:39:08 +01:00
Analytics.js make Analytics use new method for finding Platform name, now human friendly :D 2017-05-29 19:52:00 +01:00
Avatar.js *Avatar: Calculate thumbnail dimensions based on devicePixelRatio 2017-04-27 12:38:03 +02:00
BasePlatform.js Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 2017-05-30 23:54:57 +01:00
CallHandler.js Merge pull request #918 from matrix-org/t3chguy/electron_call_sleep 2017-05-26 19:09:10 +01:00
ContentMessages.js Put back default strings on dialogs 2017-05-25 18:20:48 +01:00
createRoom.js Put back default strings on dialogs 2017-05-25 18:20:48 +01:00
DateUtils.js Support 12hr time in full date 2017-05-30 13:12:27 -06:00
dispatcher.js Mark sync param as optional so that my IDE will stop complaining. 2017-04-21 13:50:22 +01:00
email.js Implement adding email addresses to your profile. 2016-01-19 16:36:54 +00:00
Entities.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
extend.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
HtmlUtils.js workaround for https://github.com/vector-im/riot-web/issues/3633. 2017-05-15 01:32:37 +01:00
ImageUtils.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
index.js Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
Invite.js allow @local:domain style mxids 2017-02-21 14:50:09 +00:00
KeyCode.js Revert "Merge pull request #807 from matrix-org/matthew/quick-search" 2017-05-16 16:11:01 +01:00
languageHandler.js Allow span... 2017-05-30 17:37:13 +01:00
Lifecycle.js use 4/5 of the default custom vars for useful things :D 2017-05-29 19:04:37 +01:00
linkify-matrix.js fix deep-linking to riot.im/app 2017-04-22 21:06:38 +01:00
Login.js Send legacy parameters on login call 2017-03-14 14:37:18 +00:00
Markdown.js Fix block quotes all being on a single line 2017-02-17 18:06:00 +00:00
MatrixClientPeg.js Add support for using indexeddb in a webworker 2017-04-06 11:13:39 +01:00
Modal.js changed my mind, no point sending spinner over to analytics 2017-05-30 00:10:36 +01:00
Notifier.js Track Notifier events so we know what % have toolbar/enabled/etc 2017-05-29 19:15:52 +01:00
ObjectUtils.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
PageTypes.js quick and dirty support for custom welcome pages, with an example for geektime techfest 2016-11-13 14:10:46 +00:00
PasswordReset.js Bulk change counterpart imports 2017-05-25 11:39:08 +01:00
phonenumber.js Support msisdn signin 2017-03-14 11:50:13 +00:00
PlatformPeg.js s/fir/for/ 2016-11-02 16:15:35 +00:00
Presence.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
ratelimitedfunc.js Cancel calls to rate-limited funcs on unmount 2016-08-10 13:39:47 +01:00
Resend.js Fix resend bar and "send anyway" in UDD 2017-03-03 10:02:08 +00:00
RichText.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
Roles.js Change to object literal 2017-05-25 17:17:37 +01:00
RoomListSorter.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
RoomNotifs.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
Rooms.js UI delay done in UI 2017-03-27 09:42:04 +01:00
RtsClient.js Instead of sending userId, userEmail, send sid, client_secret 2017-02-10 16:50:25 +00:00
ScalarAuthClient.js Implement starter link support 2016-09-02 16:36:43 +01:00
ScalarMessaging.js Hopefully sort out strings with appended '.'s 2017-05-25 19:21:18 +01:00
SdkConfig.js Do not show the bug report section if there is no bug_report_endpoint_url 2017-01-25 14:43:47 +00:00
Skinner.js update copyright for 2016 2016-01-07 04:06:52 +00:00
SlashCommands.js fix vector-im/riot-web#4059 - missed it in code review :( 2017-05-28 20:24:33 +01:00
TabComplete.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
TabCompleteEntries.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
TextForEvent.js Say "X removed the room name" instead of showing nothing 2017-05-29 23:21:14 -06:00
Tinter.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
UiEffects.js Refactor UI error effects 2016-08-03 15:59:17 +01:00
UnknownDeviceErrorHandler.js tidy up UDE handler 2017-04-24 22:11:20 +01:00
Unread.js ignore voip answer/hangup in unread events - fixes https://github.com/vector-im/riot-web/issues/3827 2017-05-15 02:18:18 +01:00
UserActivity.js Use document.onkeydown instead of onkeypress 2017-04-27 10:16:24 +01:00
UserSettingsStore.js Fix tests 2017-05-26 11:58:45 +01:00
Velociraptor.js Fix one read receipt randomly not appearing 2017-02-02 18:21:53 +00:00
VelocityBounce.js Fix a bunch of linting errors 2017-01-20 14:22:27 +00:00
WhoIsTyping.js Bulk change counterpart imports 2017-05-25 11:39:08 +01:00