Part 2 of 3: Merge develop->experimental minus #2336 #2399
turt2live
merged
209 commits into
experimental
from
travis/develop-for-real
Check upload limits before trying to upload large files
c99f5c0d
Linting
0fad90eb
size > upload_size as per spec feedback
7c0811dd
Fix nitpicks
76f0f15e
Restructure limits to be set at RoomView, so they may change if the
caf20865
If HttpStatus == 413, refresh media limits
736b76bb
Move upload verification logic to RoomView.
541f1d71
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
5a72a586
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
fcce61bf
Sneaky ,
67d39a40
Support .well-known discovery
0030ba70
Linting
71a97170
Remove temporary account_deactivation_preferences
328d57f0
Translated using Weblate (Albanian)
810405c6
Translated using Weblate (Albanian)
3c3c5031
Translated using Weblate (Albanian)
2e86bced
Translated using Weblate (Albanian)
7a01468a
Translated using Weblate (Albanian)
f8fd2a53
Translated using Weblate (Albanian)
0e874fe1
Translated using Weblate (Albanian)
2122bf83
Translated using Weblate (Albanian)
69a3b894
Translated using Weblate (Albanian)
400ba219
Translated using Weblate (Hindi)
ae6c4680
Merge remote-tracking branch 'origin/develop' into develop
c4668dd1
Translated using Weblate (Hindi)
2787ebcc
Merge remote-tracking branch 'origin/develop' into develop
94b39cd3
Translated using Weblate (Albanian)
ed7ed063
Merge remote-tracking branch 'origin/develop' into develop
1d4f95ad
Translated using Weblate (French)
e18dc4bc
Translated using Weblate (Albanian)
3ab8adc8
Translated using Weblate (Albanian)
9697d759
Translated using Weblate (Hungarian)
dbb8de50
Translated using Weblate (Albanian)
414ff55f
Merge remote-tracking branch 'origin/develop' into develop
0eeafa36
Translated using Weblate (Hungarian)
4e186358
Merge remote-tracking branch 'origin/develop' into develop
fce5cb0d
Translated using Weblate (French)
3a91f003
Merge remote-tracking branch 'origin/develop' into develop
c40f6095
Merge remote-tracking branch 'origin/develop' into develop
0252cf43
Merge remote-tracking branch 'origin/develop' into develop
8b4702a3
Merge branch 'develop' into travis/well-known
6f0f930e
Translated using Weblate (Hungarian)
d324c310
Introduce an onUsernameBlur and fix hostname parsing
4cfefe4c
Validate the identity server
5600a9d0
Translated using Weblate (Albanian)
5810f596
Translated using Weblate (French)
328ab4d8
Translated using Weblate (Polish)
c6f317b8
Merge remote-tracking branch 'origin/develop' into develop
4122f208
Translated using Weblate (Basque)
7d45994c
Merge remote-tracking branch 'origin/develop' into develop
02d950bd
Merge remote-tracking branch 'origin/develop' into develop
25a4aaf7
Add password strength meter to backup creation UI
075c13a5
Translated using Weblate (Basque)
e27f3f0c
Use sensible logging
015af7d7
Merge pull request #2227 from matrix-org/travis/well-known
e3f2e690
Translated using Weblate (Hindi)
ec3173c8
Translated using Weblate (Polish)
f58cf6cc
Merge remote-tracking branch 'origin/develop' into develop
438b940b
Suppress CORS errors in the 'failed to join room' dialog
2b027b71
Translated using Weblate (French)
2d8a0722
Translated using Weblate (Hungarian)
3aa768f7
Check if users exist before inviting them and communicate errors
987ad0b0
Appease the linter
84b568a2
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
2b077b4f
Translated using Weblate (Basque)
0834985f
Merge pull request #1876 from Half-Shot/hs/upload-limits
c0ef2f7d
Translated using Weblate (Albanian)
c1637732
Translated using Weblate (German)
f7a8e144
Translated using Weblate (Hindi)
e25df6af
Translated using Weblate (Polish)
dbc3e87e
Merge remote-tracking branch 'origin/develop' into develop
35ef2cde
Translated using Weblate (Chinese (Traditional))
e131a76e
Translated using Weblate (Hungarian)
8510fe72
Translated using Weblate (French)
c4ad15f9
comment typo
5b2c2a0a
Merge pull request #2294 from matrix-org/dbkr/zxcvbn
5d94da07
Translated using Weblate (Albanian)
98b23989
Merge remote-tracking branch 'origin/develop' into develop
c5daf148
Translated using Weblate (Hungarian)
3f7a3b8c
Translated using Weblate (Albanian)
6ab9ae7a
Show correct text if passphrase is skipped
c849a238
Merge pull request #2324 from matrix-org/dbkr/text_if_skip_passphrase
f1869edf
Merge remote-tracking branch 'origin/develop' into develop
bfe8f3a4
Translated using Weblate (Hungarian)
cf9fbe04
Only mark group as failed to load for summary
5fc25fd6
Add error to UI when group member list fails to load
22ff76e6
Translated using Weblate (Chinese (Traditional))
7f4ee2b1
Introduce a default_server_name for aesthetics and rework .well-known
633be506
Translated using Weblate (French)
573cb8a3
Merge pull request #2326 from jryans/group-users-error
dad8e6a2
Translated using Weblate (Polish)
817f78ec
Merge remote-tracking branch 'origin/develop' into develop
28dc6f6d
Translated using Weblate (French)
5764622e
Translated using Weblate (Hungarian)
9f25c39a
Translated using Weblate (Albanian)
c8aa53ca
Merge pull request #2328 from RiotTranslateBot/weblate-riot-web-matri…
a3382eb6
Factor out common login code (#2307)
c553323d
Merge branch 'develop' into travis/invite-errors
0f348a7c
Rename returned completion states to be something sensible
28f4752c
Add a helpful comment
7e817f4a
Merge branch 'develop' into travis/cors-on-join
c46bae59
Merge pull request #2317 from matrix-org/travis/invite-errors
c06d42d5
Sort translations by file name
a2b825ba
Fix pinning of rooms without badges
216fc641
Merge pull request #2306 from matrix-org/travis/cors-on-join
daa0ddd2
Merge remote-tracking branch 'origin/develop' into travis/sort-i18n-2
79ad95c8
Regenerate en_EN.json
93c90896
Don't consider ACL'd servers as permalink candidates
f08a54ed
Appease the linter
45bc1f7d
js-sdk rc.1
870825b1
Prepare changelog for v0.14.7-rc.1
e2c01445
v0.14.7-rc.1
58ab9a09
Ship the babelrc file to npm
77c51aff
Merge pull request #2332 from matrix-org/dbkr/ship_babelrc
c6d22cbc
Prepare changelog for v0.14.7-rc.2
c94d8d6f
v0.14.7-rc.2
a82b54f2
Merge pull request #2259 from matrix-org/t3chguy/account_deactivation…
31b7a0dd
Show the IncomingCallBox if the call is for the RoomSubList
ca131309
Update React guide in code style
757181c3
Merge pull request #2335 from jryans/react-style-guide
245c8399
Show the number of unread notifications above the bell on the right
173669b3
Remove outdated info about custom skins
0b65a1ee
Fix tinting of notification icon and use a more reliable notification…
95d15b78
Merge pull request #2329 from matrix-org/travis/sort-i18n-2
6d58296f
Merge pull request #2330 from matrix-org/travis/fix-pinned-rooms
d7319d7e
Merge pull request #2331 from matrix-org/travis/mto-via
482e6b57
Merge pull request #2333 from matrix-org/travis/callbox-hidden
8f217dc3
Merge pull request #2337 from jryans/rm-outdated-skin-info
d40225bf
Add an in-room reminder to set up key recovery
a92d2902
Check to make sure email addresses look roughly valid before inviting…
d062e2c2
Merge branch 'develop' into travis/well-known-improvements
0a325700
Change how the default server name and HS URL interact
6707186e
Disable the submit button while .well-known is underway
a969237d
Speed up room unread checks by not hitting the SettingsStore so often
f2468f56
Add a comment about the SettingsStore being slow
ebdba323
Merge pull request #2339 from matrix-org/travis/speed-up-room-list
78031581
Released js-sdk
5444a61e
Prepare changelog for v0.14.7
9d456b2d
v0.14.7
37c984e1
Merge branch 'master' into develop
f578bc6f
Avoid preserving HS url at logout
36dd43f7
Merge remote-tracking branch 'origin/develop' into rav/no_preserve_hs…
010a31db
Merge pull request #2340 from matrix-org/rav/no_preserve_hs_url
566e0356
Remove unused string left behind after #2259
ab656698
Expose hidden notification rules in UI
04c30181
Merge pull request #2346 from jryans/expose-push-rules
bea551f5
Fix typo in push rules comment
2ca74774
Display custom status messages in the UI
ce7969e3
Merge pull request #2338 from matrix-org/travis/validate-emails
bc9c08b1
Fix alignment of avatars and status messages
cd9ea2b2
Fix a bug with determining 1:1 rooms
dd382ecb
Replace the avatar next to the composer with a status entry menu
a91963e5
Misc cleanup of whitespace
99f5b9e3
Move status context menu to its own component
b0b7932f
Use the now-prefixed js-sdk status message API
f2649f78
Merge pull request #2336 from matrix-org/travis/notif-button
96300b45
Change room recovery reminder button style
15366fbb
Update checkmark icon
c6f35428
Add a missing null check
63658e04
Don't break the UI when something goes wrong
5f434cd3
Merge pull request #2327 from matrix-org/travis/well-known-improvements
366f3434
Fix translation error on notification icon
49769a40
Merge pull request #2352 from matrix-org/travis/fix-notification-bell
bae9996c
Standardize errors about localpart structure
8592e76e
Remove global flag
576bfedf
Merge pull request #2351 from matrix-org/travis/fix-username-requirem…
7ed9559a
Disable password managers on the status form
7efd82f7
Apply 50% opacity to the checkmark when there is no status
7b0766a3
Allow widgets to autoplay media
d304c35b
Link to CONTRIBUTING from JS SDK
1c4621c9
Make sure to grab the InlineSpinner object
c6da61f1
Clean up when new key backup version fails to backup
2b14f2af
Add New Recovery Method dialog
acc2e983
Merge pull request #2363 from matrix-org/travis/fix-group-view
66f5d061
Enable ESLint rule to require defined components in JSX
b036e590
React-sdk changes to support sandboxed electron
37b3644f
Clean up and follow code style
ef60a341
unused import
3a8b9ab8
Appease the linter
d20a9346
Add a feature flag for custom status messages
04c9fff6
Merge pull request #2372 from matrix-org/dbkr/electron_sandbox
1ca91370
Add a comment to describe why we're not using the property we should be
45f05092
Merge branch 'develop' into travis/custom-status
a1347add
Remove duplicate CSS file for CreateKeyBackupDialog
a22a9492
Convert show recovery key to flexbox
9c4ff404
Add a few more zxcvbn strings
a597ad10
Convert pass phrase entry to flexbox
24f0123d
Use primary styling on download / clipboard key actions
37256d29
Handle errors when fetching commits for changelog
fd94dc68
Merge pull request #2347 from matrix-org/travis/custom-status
2e1e536d
Handle well-known data in the login response
991104d1
Merge remote-tracking branch 'origin/develop' into rav/well_known_in_…
9c781417
Add some logging for riot-web#7838
f5ff580e
Fetch matching e2e-test branch
df89d973
Ensure we install the master branch of the e2e tests as a default
310f634a
Merge pull request #2384 from matrix-org/rav/well_known_in_login_resp…
3dab1b81
Consistently order flairs based on room configuration.
384320e2
Merge pull request #2385 from matrix-org/travis/7838-logging
1b8a8e95
Update scripts/fetchdep.sh
135a0884
Merge pull request #2387 from matrix-org/travis/fix-build
a3778dc8
Show in-room reminder when key backup creating device unverified
402f5822
Merge pull request #2389 from christopherjmedlin/consistent-flair-ord…
758e8672
upgrade expect to 23.6.0
22167f85
breaking changes from expect upgrade
c3185a4c
replace expect.createSpy() with jest.fn()
0bb35944
Merge pull request #2394 from jryans/key-backup-unverified-creator
c11d0bdf
Revert "Merge pull request #2336 from matrix-org/travis/notif-button"
6447a60e
Merge remote-tracking branch 'origin/experimental' into travis/develo…
8017f0a4
Regenerate en_EN.json
01eacfa2
jryans
approved these changes
on 2019-01-03
Login to write a write a comment.
Login via GitHub