0ab9486829
Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations
2017-05-26 14:02:44 +01:00
9c7731e141
Don't include src in the test resolve root
...
As https://github.com/matrix-org/matrix-react-sdk/pull/931
2017-05-26 14:02:03 +01:00
ee2a49ad41
Punctuation in translation strings
2017-05-26 13:46:01 +01:00
8ad189c79d
Remove unused _t import
2017-05-26 13:45:46 +01:00
92579cf463
Array literal
2017-05-26 13:36:58 +01:00
d688eade43
Remove commented use strict
...
It's even less use in a comment
2017-05-26 13:34:18 +01:00
82b2741ed9
Move english custom server text to en file
...
As it is in English and not German
2017-05-26 13:33:00 +01:00
810fb42458
Fix indenting
2017-05-26 13:25:46 +01:00
5356eab159
Correct docs
...
Change array.push guideline to not using _t at class-load time
which was probably the actual problem. Update guidelines to
include punctuation.
2017-05-26 13:16:36 +01:00
bde501a9ce
Languages on config file is no longer a thing
2017-05-26 13:10:57 +01:00
2982174028
No need for repeated OKs anymore
2017-05-25 18:21:40 +01:00
c15a66d1d4
Fix up notification settings strings
2017-05-25 17:21:41 +01:00
003238c1e7
Update for new API in react-sdk
...
We now get multiple languages from the browser as there may be
a whole preference list
2017-05-25 16:47:12 +01:00
7636212bed
Remove refs to counterpart
...
and remove extCounterpart which is unnecessary now we just use a
single counterpart instance
2017-05-25 12:08:47 +01:00
b95da4a40c
No longer need counterpart
...
We now use stock counterpart, but indirectly via react-sdk so no
need to depend on it directly.
2017-05-25 11:40:31 +01:00
ee85eb961a
Bulk change counterpart imports
...
to use react-sdk wrapper function, rather than using counterpart
directly.
2017-05-25 11:39:56 +01:00
aaf948017a
Make language dropdown a more sensible width
2017-05-24 14:37:12 +01:00
d4aa428321
Move translation status image to i18n section
2017-05-24 14:23:34 +01:00
d5425b62a1
Don't inject languages into the config
...
If we're defaulting this it should really be by the component
itself or with the other defaukts in SdkConfig, but we've decided
to leave out support for reading languages from the config file as
it's only useful for a Riot admin to restrict the choice of
languages available to users which is of debateable use.
2017-05-24 11:27:06 +01:00
ff1567ed2a
Remove spurious import
2017-05-23 17:09:09 +01:00
af6cc7bf9c
I don't really see why this is necessary
2017-05-23 17:06:49 +01:00
caca5cc00b
Remove c+ped UserSettingsStore functions
...
as they don't seem to be necessary
2017-05-23 17:06:02 +01:00
241d95293e
Code style fixes
...
Use async/await consistently rather than flipping between that and
callbacks, s/var/let/, indenting
2017-05-23 16:44:54 +01:00
a6b11968a4
s/tabs/spaces/
2017-05-23 16:15:52 +01:00
3f3f230a77
Remove accidentally comitted yarn stuff
2017-05-23 14:20:51 +01:00
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +01:00
7d59742a22
Merge pull request #3975 from vector-im/t3chguy/riot-desktopt-linux-cat
...
add menu category for linux build of app
2017-05-22 16:59:27 +01:00
6e8516e537
fiiine!
2017-05-22 16:53:46 +01:00
73ec3e1f4d
Merge branch 'master' into develop
2017-05-22 11:44:31 +01:00
86bce146e8
v0.9.10
2017-05-22 11:41:10 +01:00
734a28e0f3
Prepare changelog for v0.9.10
2017-05-22 11:41:09 +01:00
5c4e3cec08
v0.9.10
2017-05-22 11:40:10 +01:00
c03d12238a
Released js-sdk & react-sdk
2017-05-22 11:39:25 +01:00
90ab4a02f2
add category so it doesn't get dropped into Default/Lost+Found
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-20 13:11:31 +01:00
dc990f47be
Fix app breakage with a 'version' file
...
Re-add accidenally removed variable initialiser
2017-05-19 17:02:48 +01:00
a9b5282ba3
Merge pull request #3909 from vector-im/t3chguy/favicon_improvements
...
Electron Tray Improvements
2017-05-19 16:22:11 +01:00
d7f1e01cfa
Don't fail if reskindex symlink exists
2017-05-19 14:47:44 +01:00
0a920df05d
Merge pull request #3966 from vector-im/rav/more_deflakification
...
More riot-web test deflakification
2017-05-19 13:51:51 +01:00
ea67fa9c16
More riot-web test deflakification
...
Two changes:
1. wait longer for /sync to arrive in the loading tests, via an
`expectAndAwaitSync` method.
2. https://github.com/matrix-org/matrix-react-sdk/pull/773 made it possible for
MatrixChat to not show its syncing spinner despite `loading` being
false. Update `awaitSyncingSpinner` accordingly, so that it doesn't fail
when it happens to check MatrixChat at just taht moment.
2017-05-19 13:33:50 +01:00
50b46af943
Merge pull request #3945 from vector-im/dbkr/fetch_deps_script
...
Script to fetch corresponding branches of dependent projects
2017-05-19 13:14:07 +01:00
68a39b2783
Update process to not set deps to #develop
...
Update README instructions and add checks to release script to
prevent us forgetting to bump the versions of dependencies
(because the check in the main release script will only catch
references to #develop left in, which will no longer be the
failure mode).
2017-05-19 11:59:27 +01:00
448ac8dce1
Merge pull request #3964 from vector-im/luke/fix-logo-svgs-style-type
...
Add type="text/css" to SVG logos
2017-05-19 11:38:27 +01:00
76bf869d87
Add type="text/css" to SVG logos
...
Without this, SVG renderers may not pick up the CSS in the SVGs at all, as is the case with librsvg.
2017-05-19 11:19:30 +01:00
da14d7eb8c
v0.9.10-rc.1
2017-05-19 10:43:11 +01:00
3a44cb65b7
Prepare changelog for v0.9.10-rc.1
2017-05-19 10:43:10 +01:00
029dfe5ed0
v0.9.10-rc.1
2017-05-19 10:41:22 +01:00
c0c1972d56
Released js-sdk & react-sdk
2017-05-19 10:40:44 +01:00
b886215fdd
Merge pull request #3958 from vector-im/rav/roomdirectory_unmounting
...
Fix some setState-after-unmount in roomdirectory
2017-05-18 19:06:18 +01:00
4d60d444d4
Merge pull request #3956 from vector-im/rav/deflakify
...
Attempt to deflakify joining test
2017-05-18 19:06:01 +01:00
53f0a6b360
Merge pull request #3959 from vector-im/luke/improve-country-dd-4
...
CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
2017-05-18 14:38:47 +01:00
David Baker