Commit Graph

64 Commits (ba9f03ce5e688b2c17d6a76cd88ea67bb25b6217)

Author SHA1 Message Date
Travis Ralston c5c346f0b7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:18:41 -07:00
Luke Barnard 853d33a93a Make groups a fully-fleged baked-in feature 2017-11-10 15:42:11 +00:00
Travis Ralston 7ce4316cc8 Initial support for notification settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 21:47:18 -07:00
Travis Ralston 8282534f87 Add SettingsLevel enum; Move settings to own file.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 23:19:45 -06:00
Travis Ralston 786bd87fec Support URL previews (with bugs)
Known issues at this point:
* The room-level setting accepts the current user's default, which is wrong
* The checkboxes on RoomSettings are not independent
* The checkboxes in RoomSettings need some layout fixes

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:48:29 -06:00
Travis Ralston 0d3f0eaf98 Convert local settings to granular settings
This breaks language selection.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:53:00 -06:00
Travis Ralston ae10a11ac4 Convert synced settings to granular settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
Travis Ralston bf815f4be9 Support labs features
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 20:21:50 -06:00
Matthew Hodgson fb96f4fac2 fix typos 2017-10-23 14:55:54 +01:00
Luke Barnard 0c34e943fb Merge branch 'develop' into luke/groups-are-communities 2017-10-16 17:34:06 +01:00
Luke Barnard eaa5dd5f22 Groups -> Communities in the UI
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
2017-10-16 13:18:39 +01:00
Travis Ralston 8a641c7173 Hide message pinning behind a labs setting
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
Matthew Hodgson d63a25a183 Merge branch 'develop' into t3chguy/hide_notification_body 2017-10-14 23:10:01 +01:00
David Baker d0759a537b Fix the enableLabs flag, again
We were showing the options but ignoring them
2017-10-13 16:06:17 +01:00
David Baker 5214a867db Fix labs again 2017-10-13 14:43:26 +01:00
David Baker 4e793d4f68 skip unnecessary filter 2017-10-13 14:11:21 +01:00
David Baker f94873bd5d Honour the (now legacy) enableLabs flag 2017-10-13 13:58:24 +01:00
David Baker 710c952428 Make features disabled by default
So we can then put them in labs on /develop & others can enable
them as desired.
2017-10-12 18:45:04 +01:00
David Baker 65eacff3d3 redundant code is redundant 2017-10-12 17:28:53 +01:00
David Baker ef3df3e3fa comment 2017-10-12 17:28:14 +01:00
David Baker 20f9d71782 oops 2017-10-12 17:27:09 +01:00
David Baker e50478aa1d enable/disable features in config.json
As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit#

Replaces:
 * enableLabs setting
 * 'override' flag in labs
 * 'default' flag in labs

Un-feature-flags matrix apps since this was now overidden to be
enabled.
2017-10-12 17:03:38 +01:00
Luke Barnard 18e0d8da86 Rename Flair feature to Groups 2017-09-29 10:27:40 +01:00
Luke Barnard 548e5f516c Put flair into labs 2017-09-18 14:38:41 +01:00
Michael Telatynski d1af424b3f
allow hiding of notification body for privacy reasons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-06 10:56:08 +01:00
Luke Barnard 0844beac79 Enable matrix-apps by default 2017-08-16 16:04:39 +01:00
Luke Barnard 867e83edff Fix log to include some useful info 2017-08-14 14:47:26 +01:00
Luke Barnard c97ae5c2e1 Override matrix-apps to be disabled
- ignores localStorage setting
 - hides feature from labs section in user settings
2017-08-14 12:29:42 +01:00
Luke Barnard cbd8018ac8 Support semi-perma-disabling of lab features
Adding `override: true` will remove the feature from the labs section, and force Riot to always use the default value (i.e. ignoring localStorage). This is useful removing features entirely when they might be deliberately not working but we still want to do a release.
2017-08-14 12:26:31 +01:00
Richard van der Hoff 0254d2b3a2 q(...) -> Promise.resolve
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
2017-07-12 18:05:08 +01:00
Richard van der Hoff a06bd84213 replace imports of `q` with bluebird
update `package.json`

```
find src test -name '*.js' |
   xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
   xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
2017-07-12 18:05:08 +01:00
Luke Barnard e6ec5742be _t should be used on string literals
For scripts to easily find translations
2017-07-04 15:06:24 +01:00
Luke Barnard e3f2eb5232 Take RTE out of labs! 🎉
This stops react-sdk from tracking any state previously stored for the purposes of enabling or disabling the lab feature that enabled the new MessageComposer. It is now enabled permanently.

This is being done with the hope that we can get more feedback for it so that when we release we can be confident that people will be OK with the changes it brings.
2017-07-04 14:44:55 +01:00
Richard Lewis 2b1d15717a Add translation for Matrix Apps labs setting. 2017-06-28 12:00:22 +01:00
Richard Lewis 7a7687699b Add matrix apps to Labs settings 2017-06-27 17:38:33 +01:00
Kegan Dougal ced68f2719 Find a way to translate the name of RTE in user settings
I never said it was a *nice* way...
2017-06-01 15:53:08 +01:00
David Baker e44f3cc709 Fix tests
* Serve translation files from the karma server
 * Port UserSettingsStore to ES6 exports because the test runner
   gets confused by ES6 importing a commonjs module
 * Remove extra spaces in translations strings for MELS
 * Fix 'his/her' back to be 'their'
 * Change test to expect singular 'invitation' for a single person
   (there may be multiple invitations, but IMO this should be
   'rejected n invitations' and we can play with the wording later,
   I don't think the singular is any worse than the plural).
 * set language in the MELS tests (and wait for it to complete)
 * Don't bother setting lang in other tests for now
2017-05-26 11:58:45 +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
Michael Telatynski cc53825b06 fix defaultValue on getLocalSetting and getSyncedSetting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-25 22:01:35 +01:00
Michael Telatynski de89c1f710 lets make eslint at least somewhat happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-25 22:00:50 +01:00
Aviral Dasgupta ebe7ec4000
Rename RTE labs option to "New Composer & Autocomplete"
As per confusion around https://riot.im/develop/#/room/!DdJkzRliezrwpNebLk:matrix.org/$1487091505948TmtGn:t2l.io
2017-02-16 02:20:34 +05:30
Matthew Hodgson 39c122fe4f fix local storage idiocy 2017-01-21 22:27:55 +01:00
Matthew Hodgson 3071fc0ddc UI for blacklisting unverified devices per-room & globally
(written blind; untested as yet)
2017-01-21 17:39:39 +00:00
Richard van der Hoff 4476b09ce7 Get rid of always-on labs settings
If the setting is on by default, it's not much use as a Labs setting. The E2e
setting was only confusing everyone anyway.
2016-11-21 10:25:48 +00:00
Matthew Hodgson cf1b1442eb no labs for guests 2016-09-17 14:29:40 +01:00
Matthew Hodgson 736b6dac7a default labs correctly :/ 2016-09-17 00:54:56 +01:00
Matthew Hodgson c322a191af turn on E2E and Scalar by default 2016-09-16 18:36:03 +01:00
Aviral Dasgupta f0f20beae0 RTE format bar enhancements 2016-09-08 00:03:54 +05:30
Matthew Hodgson d6415aceca handle accountData changes, and errors on toggling URL previews 2016-07-20 18:14:16 +01:00
Matthew Hodgson 1365f18829 many stupid thinkos and bugfixes; make it work 2016-07-20 12:03:13 +01:00