Commit Graph

28 Commits (b8b6a874239a49e528c3f95a3afe74e3bf12188a)

Author SHA1 Message Date
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
Matthew Hodgson ebdac4ee50 first cut (untested) 2016-07-18 01:35:42 +01:00
Aviral Dasgupta 5831a68e11 Labs improvements 2016-06-13 23:25:31 +05:30
Aviral Dasgupta c3a9658392 Add experimental "Labs" section to settings 2016-06-13 22:04:12 +05:30
Matthew Hodgson 1d31463140 set email branding after registration 2016-06-02 13:14:52 +01:00
David Baker 6dd530e2a4 Comment getEmailPusher 2016-05-04 09:41:36 +01:00
David Baker 6a596f034f Clarify comment 2016-05-03 11:21:05 +01:00
David Baker fcab259511 Support for email notifs
Add utility funcs in UserSettingsStore and pass threepids to Notifications so it can do email notif stuff
2016-04-12 16:17:04 +01:00
Richard van der Hoff c5e03913d9 Factor out audio bings to a separate setting
Some people are sad about bings on the desktop app. Make it turn-off-able.
2016-03-10 10:59:40 +00:00
Kegan Dougal c64f36c81b Merge branch 'develop' into kegan/guest-access 2016-01-07 13:21:06 +00:00
Matthew Hodgson 0772f50fab update copyright for 2016 2016-01-07 04:06:52 +00:00
Kegan Dougal d729dee31d Make the settings page load for guests. Add checkboxes for guest r/w 2016-01-05 17:34:25 +00:00
Kegan Dougal 5d490841bc Review comments 2015-12-24 10:50:47 +00:00
Kegan Dougal 1af5018597 General code cleanup / tweaks / fixes
- Swap Phases enum to be using string literals
- Swap roomId prop on UserSettings for a more sane onUserSettingsClose and
  make MatrixChat responsible for swapping the room.
- s/then/done/ when terminating Promise chains to avoid subtle errors.
- Rejig render() of UserSettings so we don't need to indent quite so much.
2015-12-23 11:47:56 +00:00
Matthew Hodgson e9132a873b experiment with turning the UserSettings controller into a UserSettingsStore logic class 2015-11-17 02:13:42 +00:00