Commit Graph

5140 Commits

Author SHA1 Message Date
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
David Baker 99efbbee5e Depend on prop-types module
So we can start writing code compatible with new React
2017-05-25 12:04:53 +01:00
David Baker ec146c7f45 Switch to stock counterpart
We no longer need the custom counterpart. The things that were
changed in it and reasosn we no lomger need them are:

 1. set separator - this can be done with standard counterpart
 2. ES6 port: this was done to allow importing as _t, but is
    unnecessary with the _t wrapper function in react-sdk
    (although also seems to work fine with
    `import _t from 'counterpart';`)
 3. Fallback to key name: unnecessary with
    `setMissingEntryGenerator` in 0.18, but we've changed to just
    using a fallback locale anyway since No code missing en
    translations should ever make it to the devbelop branch.
 4. Logging on missing translations. Unnecessary with
    `onTranslationNotFound`, but now not used anyway because we
    let missing translations show up in the UI as
    'missing translation'

Bulk changes to imports coming in separate commit for easy reading.
2017-05-25 11:24:17 +01:00
David Baker d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +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 86bce146e8 v0.9.10 2017-05-22 11:41:10 +01:00
David Baker c03d12238a Released js-sdk & react-sdk 2017-05-22 11:39:25 +01:00
David Baker eadd6192e8 v0.8.9 2017-05-22 11:36:56 +01:00
David Baker 3a0ee385b8 Released js-sdk 2017-05-22 11:35:02 +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
David Baker da14d7eb8c v0.9.10-rc.1 2017-05-19 10:43:11 +01:00
David Baker c0c1972d56 Released js-sdk & react-sdk 2017-05-19 10:40:44 +01:00
David Baker 1addd6e304 v0.8.9-rc.1 2017-05-19 10:39:14 +01:00
David Baker f615bc129f Released js-sdk 2017-05-19 10:37:33 +01:00
David Baker 16899d3b1f Bump electron version to 1.6.8 2017-05-18 11:38:03 +01:00
David Baker 9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search"
This reverts commit 8f20fcfa6b, reversing
changes made to 751f715e77.
2017-05-16 17:21:49 +01:00
David Baker ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search"
This reverts commit 0ad1d8caf3, reversing
changes made to 1189368aab.
2017-05-16 16:11:01 +01:00
David Baker 387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2"
This reverts commit 3366d3bbae, reversing
changes made to ceb71a4ef6.
2017-05-16 14:49:55 +01:00
Luke Barnard 6d94f35c33 Automatically update component-index
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.

-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
2017-05-11 10:37:13 +01:00
Michael Telatynski c607b1bc89 npm is "smart" enough to try and install our electron wrapper as a module
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-10 13:36:27 +01:00
Michael Telatynski fdf48def00 make reskindex windows friendly
makes #871 windows friendly
2017-05-09 17:13:27 +01:00
Luke Barnard fe121126f5 Merge branch 'develop' into rte-fixes
Conflicts:
	src/UserSettingsStore.js
	src/autocomplete/EmojiProvider.js
	src/components/views/rooms/MessageComposerInput.js
2017-05-08 17:08:59 +01:00
Luke Barnard 574c836941 Move chokidar to devDeps 2017-05-08 16:24:13 +01:00
Luke Barnard 7d1940620d Add (watching) reskindex to npm start
also add reskindex in non-watching mode to `npm run build`
2017-05-08 15:07:58 +01:00
Luke Barnard 2eaaa97451 Give reskindex.js a watch mode (-w)
`scripts/reskindex.js -w` will run reskindex in watch mode whereby FS events will cause a reskindex to occur.

This depends on `chokidar`
2017-05-08 15:07:05 +01:00
David Baker 3366d3bbae Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2
Make left panel better for new users (mk II)
2017-05-08 10:37:55 +01:00
Matthew Hodgson f056360f70 merge master post release 2017-05-07 20:01:11 +01:00
Matthew Hodgson 8e94d5240f merge master into develop post 0.9.9 2017-05-07 19:58:42 +01:00
Michael Telatynski 309afdb813 no point installing deps here, builder will do it for us
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:08:50 +01:00
Michael Telatynski a09f890619 Merge package.json, match version in electron/package.json
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:03:28 +01:00
Michael Telatynski 499b04c254 Only install electron deps when we're bundling/running electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:01:32 +01:00
Michael Telatynski f54708227e Proper two package.json format, release.sh bumps 2nd json ver too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 16:54:55 +01:00
David Baker 7b320f8fbb Remove babelcheck
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
2017-05-04 16:51:36 +01:00
David Baker 396b38512c Remove babelcheck
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
2017-05-04 16:50:47 +01:00
David Baker 909cdb6e9a Depend on prop-types module
So we can start writing code compatible with new React
2017-05-04 16:22:06 +01:00
Michael Telatynski 4a8ad53bd9 Pin filesize ver to fix break upstream
https://travis-ci.org/vector-im/riot-web/builds/227340622
avoidwork/filesize.js#87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
2017-04-30 13:11:01 +01:00
Michael Telatynski c8fb18dc93 Pin filesize ver to fix break upstream
https://travis-ci.org/vector-im/riot-web/builds/227340622
https://github.com/avoidwork/filesize.js/issues/87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
2017-04-30 13:00:47 +01:00
David Baker aa482bae28 v0.9.9 2017-04-25 11:08:08 +01:00
David Baker 2d311ddbf4 Released js-sdk & react-sdk 2017-04-25 11:04:03 +01:00
David Baker d81adb234a v0.8.8 2017-04-25 10:53:59 +01:00
David Baker 74dabb2087 Released js-sdk 2017-04-25 10:52:44 +01:00
David Baker 5326faa0b8 v0.9.9-rc.2 2017-04-24 18:26:20 +01:00
David Baker b6435502fc New version of react-sdk 2017-04-24 18:25:13 +01:00
David Baker e569144d6f v0.8.8-rc.2 2017-04-24 18:24:29 +01:00
Michael Telatynski 9e2324fb69 don't hook on postinstall, current dev cycle uses (abuses) npm i to build
so no point making it take longer than it has to for the devs only testing
webapp

build:electron - hook npm run install:electron
install:electron - run npm i for the electron deps
electron - start the app locally for testing

add to README

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 22:50:58 +01:00
David Baker 141aafd18e v0.9.9-rc.1 2017-04-21 18:40:25 +01:00
David Baker ce5a7ba48a Rewind version to try again, again 2017-04-21 18:39:11 +01:00
David Baker 95647fb7a1 v0.9.9-rc.1 2017-04-21 18:35:15 +01:00
David Baker f25612198e 0.9.8, not 0.9.9 2017-04-21 18:33:53 +01:00