Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

move everything not explicitly riot (or status) branded into matrix-react-sdk #1836

Merged
merged 34 commits into from
Apr 18, 2018
Merged

move everything not explicitly riot (or status) branded into matrix-react-sdk #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8ab8f76
move non-Riot-specific components over from riot-web
ara4n Apr 11, 2018
178fb64
move notifications logic over from riot-web
ara4n Apr 11, 2018
70f3804
move room directory logic over from riot-web
ara4n Apr 11, 2018
79d3cca
move components' CSS to be in the same repo as their JS
ara4n Apr 11, 2018
cdb5d48
organise themes (even light & dark) in the SDK layer
ara4n Apr 11, 2018
848403a
move default fonts over from riot-web
ara4n Apr 11, 2018
8ce4df7
move non-Riot image resources over from riot-web
ara4n Apr 11, 2018
8371774
move default ringtones over from riot-web
ara4n Apr 11, 2018
7ae1b37
add notif UTs
ara4n Apr 12, 2018
cc904be
add NVL
ara4n Apr 12, 2018
40a67ca
point imports at the new locations
ara4n Apr 12, 2018
5d03eab
rethemedex
ara4n Apr 12, 2018
5f3e444
fix theme paths
ara4n Apr 13, 2018
0336d99
move VectorConferenceHandler over and use getUpdateCheckStatusEnum vi…
ara4n Apr 13, 2018
efe466e
move rageshake to sdk
ara4n Apr 13, 2018
1376563
use new rageshake location
ara4n Apr 13, 2018
610747e
fix paths and updateCheckStatusEnum
ara4n Apr 13, 2018
a30fdaf
copy all the i18n over from vector-web via copy-i18n.py
ara4n Apr 15, 2018
cb5ff40
fix missing i18n
ara4n Apr 15, 2018
faa1924
run gen-i18n to normalise en_EN and remove stuff still in vector-web
ara4n Apr 15, 2018
df564af
run prune-i18n to bring the translations back in line with normalised…
ara4n Apr 15, 2018
fe5e68d
fix tests
ara4n Apr 15, 2018
4da804f
Merge branch 'develop' into matthew/fix_layering
ara4n Apr 15, 2018
32dd7f9
merge vector-im/riot-web#5881 into matrix-react-sdk
ara4n Apr 15, 2018
f1f7673
ignore lint errors in stuff moved over from vector-web for now
ara4n Apr 16, 2018
46f5c0d
finish merging vector-im/riot-web#5881 into matrix-react-sdk
ara4n Apr 16, 2018
eca5a96
add i18n which weren't correctly copied over from vector-web by copy-…
ara4n Apr 17, 2018
ce809e1
fix i18n thinko on createTrackedDialog
ara4n Apr 17, 2018
d91c7f5
Add comment about enum hijinks
ara4n Apr 17, 2018
7b53e36
retheming commentary
ara4n Apr 17, 2018
6d15634
fix missing NLs
ara4n Apr 17, 2018
f84573e
convert HomePage to ES6 and split out the vectory bit
ara4n Apr 18, 2018
0571c59
move deps from vector-web to sdk; resolve version mismatches...
ara4n Apr 18, 2018
92c98aa
displayName should be tracked as static
ara4n Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 36 additions & 4 deletions .eslintignore.errorfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,57 @@ src/autocomplete/EmojiProvider.js
src/autocomplete/UserProvider.js
src/CallHandler.js
src/component-index.js
src/components/structures/ContextualMenu.js
src/components/structures/BottomLeftMenu.js
src/components/structures/CompatibilityPage.js
src/components/structures/CreateRoom.js
src/components/structures/HomePage.js
src/components/structures/LeftPanel.js
src/components/structures/LoggedInView.js
src/components/structures/login/ForgotPassword.js
src/components/structures/login/Login.js
src/components/structures/login/Registration.js
src/components/structures/LoginBox.js
src/components/structures/MessagePanel.js
src/components/structures/NotificationPanel.js
src/components/structures/RoomDirectory.js
src/components/structures/RoomStatusBar.js
src/components/structures/RoomSubList.js
src/components/structures/RoomView.js
src/components/structures/ScrollPanel.js
src/components/structures/SearchBox.js
src/components/structures/TimelinePanel.js
src/components/structures/UploadBar.js
src/components/structures/ViewSource.js
src/components/views/avatars/BaseAvatar.js
src/components/views/avatars/GroupAvatar.js
src/components/views/avatars/MemberAvatar.js
src/components/views/create_room/RoomAlias.js
src/components/views/dialogs/BugReportDialog.js
src/components/views/dialogs/ChangelogDialog.js
src/components/views/dialogs/ChatCreateOrReuseDialog.js
src/components/views/dialogs/DeactivateAccountDialog.js
src/components/views/dialogs/SetPasswordDialog.js
src/components/views/dialogs/UnknownDeviceDialog.js
src/components/views/directory/NetworkDropdown.js
src/components/views/elements/AddressSelector.js
src/components/views/elements/DeviceVerifyButtons.js
src/components/views/elements/DirectorySearchBox.js
src/components/views/elements/EditableText.js
src/components/views/elements/ImageView.js
src/components/views/elements/InlineSpinner.js
src/components/views/elements/MemberEventListSummary.js
src/components/views/elements/Spinner.js
src/components/views/elements/TintableSvg.js
src/components/views/elements/UserSelector.js
src/components/views/globals/MatrixToolbar.js
src/components/views/globals/NewVersionBar.js
src/components/views/globals/UpdateCheckBar.js
src/components/views/login/CountryDropdown.js
src/components/views/login/InteractiveAuthEntryComponents.js
src/components/views/login/PasswordLogin.js
src/components/views/login/RegistrationForm.js
src/components/views/login/ServerConfig.js
src/components/views/messages/MFileBody.js
src/components/views/messages/MImageBody.js
src/components/views/messages/RoomAvatarEvent.js
src/components/views/messages/TextualBody.js
src/components/views/room_settings/AliasSettings.js
Expand All @@ -55,12 +73,14 @@ src/components/views/rooms/MemberList.js
src/components/views/rooms/MemberTile.js
src/components/views/rooms/MessageComposer.js
src/components/views/rooms/MessageComposerInput.js
src/components/views/rooms/ReadReceiptMarker.js
src/components/views/rooms/RoomDropTarget.js
src/components/views/rooms/RoomList.js
src/components/views/rooms/RoomPreviewBar.js
src/components/views/rooms/RoomSettings.js
src/components/views/rooms/RoomTile.js
src/components/views/rooms/RoomTooltip.js
src/components/views/rooms/SearchableEntityList.js
src/components/views/rooms/SearchBar.js
src/components/views/rooms/SearchResultTile.js
src/components/views/rooms/TopUnreadMessagesBar.js
src/components/views/rooms/UserTile.js
Expand All @@ -69,6 +89,8 @@ src/components/views/settings/ChangeAvatar.js
src/components/views/settings/ChangeDisplayName.js
src/components/views/settings/ChangePassword.js
src/components/views/settings/DevicesPanel.js
src/components/views/settings/IntegrationsManager.js
src/components/views/settings/Notifications.js
src/ContentMessages.js
src/HtmlUtils.js
src/ImageUtils.js
Expand All @@ -78,9 +100,16 @@ src/Login.js
src/Markdown.js
src/MatrixClientPeg.js
src/Modal.js
src/notifications/ContentRules.js
src/notifications/NotificationUtils.js
src/notifications/PushRuleVectorState.js
src/notifications/StandardActions.js
src/notifications/VectorPushRulesDefinitions.js
src/Notifier.js
src/PlatformPeg.js
src/Presence.js
src/rageshake/rageshake.js
src/rageshake/submit-rageshake.js
src/ratelimitedfunc.js
src/RichText.js
src/Roles.js
Expand All @@ -89,10 +118,12 @@ src/ScalarAuthClient.js
src/UiEffects.js
src/Unread.js
src/utils/DecryptFile.js
src/utils/DirectoryUtils.js
src/utils/DMRoomMap.js
src/utils/FormattingUtils.js
src/utils/MultiInviter.js
src/utils/Receipt.js
src/VectorConferenceHandler.js
src/Velociraptor.js
src/VelocityBounce.js
src/WhoIsTyping.js
Expand All @@ -102,8 +133,9 @@ test/components/structures/MessagePanel-test.js
test/components/structures/ScrollPanel-test.js
test/components/structures/TimelinePanel-test.js
test/components/views/dialogs/InteractiveAuthDialog-test.js
test/components/views/elements/MemberEventListSummary-test.js
test/components/views/login/RegistrationForm-test.js
test/components/views/rooms/MessageComposerInput-test.js
test/mock-clock.js
test/notifications/ContentRules-test.js
test/notifications/PushRuleVectorState-test.js
test/stores/RoomViewStore-test.js
1 change: 1 addition & 0 deletions header
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 Vector Creations Ltd
Copyright 2017, 2018 New Vector Ltd

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
11 changes: 7 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,22 @@
"flux": "2.1.1",
"focus-trap-react": "^3.0.5",
"fuse.js": "^2.2.0",
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"glob": "^5.0.14",
"highlight.js": "^8.9.1",
"highlight.js": "^9.0.0",
"isomorphic-fetch": "^2.2.1",
"linkifyjs": "^2.1.3",
"lodash": "^4.13.1",
"matrix-js-sdk": "0.10.1",
"optimist": "^0.6.1",
"pako": "^1.0.5",
"prop-types": "^15.5.8",
"querystring": "^0.2.0",
"react": "^15.4.0",
"react": "^15.6.0",
"react-addons-css-transition-group": "15.3.2",
"react-beautiful-dnd": "^4.0.0",
"react-dom": "^15.4.0",
"react-beautiful-dnd": "^4.0.1",
"react-dom": "^15.6.0",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"sanitize-html": "^1.14.1",
"text-encoding-utf-8": "^1.0.1",
Expand Down
Loading