OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,394 Commits
205 Branches
553 Tags
458 MiB
Commit Graph

3394 Commits (2f71dc9fe583c2f0e828a9ca0fe2a46154616e7a)

Author SHA1 Message Date
David Baker 0ab9486829 Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations 2017-05-26 14:02:44 +01:00
David Baker 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
David Baker ee2a49ad41 Punctuation in translation strings 2017-05-26 13:46:01 +01:00
David Baker 8ad189c79d Remove unused _t import 2017-05-26 13:45:46 +01:00
David Baker 92579cf463 Array literal 2017-05-26 13:36:58 +01:00
David Baker d688eade43 Remove commented use strict 
It's even less use in a comment
 2017-05-26 13:34:18 +01:00
David Baker 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
David Baker 810fb42458 Fix indenting 2017-05-26 13:25:46 +01:00
David Baker 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
David Baker bde501a9ce Languages on config file is no longer a thing 2017-05-26 13:10:57 +01:00
David Baker 2982174028 No need for repeated OKs anymore 2017-05-25 18:21:40 +01:00
David Baker c15a66d1d4 Fix up notification settings strings 2017-05-25 17:21:41 +01:00
David Baker 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
David Baker 5ccab395d7 Merge pull request #4021 from vector-im/t3chguy/electron_context_menus 
add moar context menus [Electron]
 2017-05-25 13:49:23 +01:00
David Baker dd1c9a4477 Merge pull request #4022 from vector-im/t3chguy/patch-2 
Add `Chat` to Linux app categories
 2017-05-25 13:35:50 +01:00
Michael Telatynski 9cd04509bf Add `Chat` to Linux app categories 
most dists inc Arch have Chat and IRCClient,
though the latter isn't exactly correct so missing it
 2017-05-25 13:22:01 +01:00
Michael Telatynski 727e267853 we don't really need a webContents like that, so pass if needed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-25 12:47:36 +01:00
Michael Telatynski c4c78c9b3e split webContents context handling into own file, as main was growing 
add handlers for editable fields, with Cut Copy Paste Undo Redo etc
add Copy Image feature to all images, working on not only the download
buttons now

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-25 12:42:53 +01:00
David Baker 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
David Baker 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
David Baker ee85eb961a Bulk change counterpart imports 
to use react-sdk wrapper function, rather than using counterpart
directly.
 2017-05-25 11:39:56 +01:00
David Baker aaf948017a Make language dropdown a more sensible width 2017-05-24 14:37:12 +01:00
David Baker d4aa428321 Move translation status image to i18n section 2017-05-24 14:23:34 +01:00
David Baker 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
Michael Telatynski c63e429c76 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep 2017-05-24 10:56:36 +01:00
David Baker ff1567ed2a Remove spurious import 2017-05-23 17:09:09 +01:00
David Baker af6cc7bf9c I don't really see why this is necessary 2017-05-23 17:06:49 +01:00
David Baker caca5cc00b Remove c+ped UserSettingsStore functions 
as they don't seem to be necessary
 2017-05-23 17:06:02 +01:00
David Baker 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
David Baker a6b11968a4 s/tabs/spaces/ 2017-05-23 16:15:52 +01:00
David Baker 3f3f230a77 Remove accidentally comitted yarn stuff 2017-05-23 14:20:51 +01:00
David Baker 6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Michael Telatynski 8994c2bad1 missed a concat :) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 19:28:01 +01:00
Michael Telatynski e0fb2fd074 /me forgets we don't have babel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 19:25:56 +01:00
Michael Telatynski 4bb054c955 electron stuff isn't actually using flow, so don't enable it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 19:25:18 +01:00
Michael Telatynski 911c3bcf6e tidy electron files, they were starting to annoy me 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 19:21:52 +01:00
Michael Telatynski 4944bfdaa2 onAction support in Electron process, disable powersave when in call 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 18:32:39 +01:00
Michael Telatynski f57d8e4cb9 make ESLint a touch happier 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-22 18:31:30 +01:00
Michael Telatynski 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
David Baker 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
Michael Telatynski 6e8516e537 fiiine! 2017-05-22 16:53:46 +01:00
David Baker 73ec3e1f4d Merge branch 'master' into develop 2017-05-22 11:44:31 +01:00
David Baker 86bce146e8 v0.9.10 2017-05-22 11:41:10 +01:00
David Baker 734a28e0f3 Prepare changelog for v0.9.10 2017-05-22 11:41:09 +01:00
David Baker 5c4e3cec08 v0.9.10 2017-05-22 11:40:10 +01:00
David Baker c03d12238a Released js-sdk & react-sdk 2017-05-22 11:39:25 +01:00
Michael Telatynski 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
Kieran Gould cae62c8383 MessageTimestamp now has 12 hour prop 2017-05-19 22:36:02 +01:00
Kieran Gould 1ebe819aa2 Revert _EventTile.scss padding. 2017-05-19 22:29:20 +01:00
Maxwell Kepler 9e37fa46b1 Add 12 hour support 2017-05-19 22:29:20 +01:00