445a55c7ca
Merge pull request #3992 from vector-im/t3chguy/electron_call_sleep
...
Prevent Power Save when in call (Electron)
2017-05-26 18:44:53 +01:00
d313f4c7b6
Merge https://github.com/MTRNord/riot-web/pull/70/
2017-05-26 18:44:08 +01:00
5e0457c32d
Merge pull request #4035 from vector-im/dbkr/translations
...
Translations!
2017-05-26 18:39:07 +01:00
e26422ef10
fix a typo
2017-05-26 18:22:53 +01:00
4fcaccbc7f
Merge https://github.com/MTRNord/riot-web/pull/69
2017-05-26 16:56:49 +01:00
6c3c4fc547
Language generation and file structure
...
* Move language files to strings/ subdir to be consistent with
react-sdk
* Only copy static list of languages (to avoid including
languages that are only a few percent translated)
* Make copy-res script work with watch mode
* Other general cleanups like only write each language file once,
rather than n times.
2017-05-26 16:48:21 +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
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
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
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
c63e429c76
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep
2017-05-24 10:56:36 +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
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +01:00
f57d8e4cb9
make ESLint a touch happier
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:31:30 +01:00
755c66b9f1
pass dispatcher through to electron, on a whitelist basis
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:30:45 +01:00
cae62c8383
MessageTimestamp now has 12 hour prop
2017-05-19 22:36:02 +01:00
1ebe819aa2
Revert _EventTile.scss padding.
2017-05-19 22:29:20 +01:00
9e37fa46b1
Add 12 hour support
2017-05-19 22:29:20 +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
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
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
d0adfb6469
CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
2017-05-18 14:03:27 +01:00
1460eae280
Change background colour of login country dd to white
2017-05-18 13:43:21 +01:00
86055bc476
Fix some setState-after-unmount in roomdirectory
...
Give the RoomDirectory and unmounted guard, and use it to avoid some setState
warnings. Also, cancel the filterTimeout (no point in leaving it around).
There are still plenty of other opportunities to setState after unmount, but
the filterTimeout was causing noise in the test.
2017-05-18 13:41:54 +01:00
01a15b2b7e
Merge pull request #3953 from vector-im/luke/improve-country-dd-3-square-flags
...
Add square flag pngs /w genflags.sh script
2017-05-18 13:37:17 +01:00
ea03140cbd
Add ellipsis overflow to long dd options
2017-05-18 11:30:22 +01:00
98215b4767
Adjust for 27x27 flag png size
2017-05-18 11:29:57 +01:00
15ab1732a2
Reduce rageshake log size to 1MB
...
... 50MB turned out to be quite a lot.
2017-05-17 14:46:06 +01:00
089740a840
CSS for putting country dd on same line as phone input
...
(For login and registration)
2017-05-17 14:25:43 +01:00
7ea0ecd125
Merge branch 'new_release_process_stable' into develop
...
This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
2017-05-17 10:43:02 +01:00
9352e5d78e
Lets make it abundantly clear that we want attention. FLASH FLASH FLASH
...
also improve favicon updating to not change if we're same as previous
not sure how intensive the nativeImage stuff is but cheap efficiency
For FLASH FLASH I moved the setBadgeCount stuff RPC -> IPC
should be more reliable now, its in electron-main
Win only:
if mainWindow is set and is not in focus make it FLASH
clear flash if notification gets cleared elsewhere
debounce focus handler so we don't set a million of them
if the app is backgrounded a while
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-17 10:39:43 +01:00
9fc9de3af5
Revert "Merge pull request #3654 from vector-im/matthew/quick-search"
...
This reverts commit 8f20fcfa6b751f715e77
2017-05-16 17:21:49 +01:00
844ea390c8
Revert "clear the searchbox after quick-search"
...
This reverts commit ddd12edc06
2017-05-16 17:13:55 +01:00
fdf326c9f0
Revert "Cancel quick-search on Escape, clearing it and returning focus to composer."
...
This reverts commit 52a119244b
2017-05-16 17:13:39 +01:00
9399b7ddf0
Revert "fix incoming call box"
...
This reverts commit b3431bb750
2017-05-16 16:35:17 +01:00
03476705b1
Revert "better solution to incomingcallbox weirdness"
...
This reverts commit be52787473
2017-05-16 16:35:06 +01:00
Matthew Hodgson