OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,910 Commits
209 Branches
550 Tags
416 MiB
Commit Graph

1910 Commits (40aee5b03db769408c70f87017ca08affbeb9fb5)

Author SHA1 Message Date
David Baker 57c7d81f43 Merge pull request #1399 from vector-im/rav/fix_unparsable_notifications 
Improve handling of notification rules we can't parse
 2016-04-15 13:00:04 +01:00
Richard van der Hoff eab206c3bd Improve handling of notification rules we can't parse 
* An absent rule is the same as a rule with 'enabled == false', and is not
necessarily 'OFF' (particularly in the case of the bot rule, which is
inverted).

* If we don't understand the rule, then don't tick any of the radio buttons,
and instead show it in the 'external' section.
 2016-04-15 12:42:03 +01:00
Matthew Hodgson 72745b05dc forgotten CSS 2016-04-15 10:49:25 +01:00
Matthew Hodgson f8d5101dbc add lost SVGs and implement SearchBox skeleton 2016-04-15 02:23:12 +01:00
Matthew Hodgson cc1e30c963 dinkier topic 2016-04-15 01:42:44 +01:00
Richard van der Hoff 121fe34180 Improve parsing of keyword notification rules 
For notification rules, the absence of a value on a 'highlight' tweak means
that the highlight should happen; this was previously confusing us.

Use the action parser from NotificationUtils to simplify the code.

Fixes https://github.com/vector-im/vector-web/issues/1330
 2016-04-14 22:45:00 +01:00
Richard van der Hoff 5450223cc7 More notifications fixes 
Fix another thing I broke during the refactor
 2016-04-14 22:31:40 +01:00
Matthew Hodgson 25b5c14527 fix new bottomleft menu 2016-04-14 22:26:48 +01:00
Matthew Hodgson 6bc4c87ce4 update to new bottomleftmenu. update header and composer heights 2016-04-14 21:43:49 +01:00
Richard van der Hoff 0f0c3d0ca1 Merge branch 'rav/more_refactor_notifications' into develop 2016-04-14 21:27:34 +01:00
Matthew Hodgson 96c4a24d3d skin RoomSubList chevrons, horizontal rules and selected room 2016-04-14 21:10:55 +01:00
Richard van der Hoff c6b501811f Move more stuff out of Notifications.js 2016-04-14 19:54:03 +01:00
Richard van der Hoff 0996a0b140 Fixes to refactored notifications 
A few things I managed to break in the recent refactor
 2016-04-14 19:54:03 +01:00
Matthew Hodgson 8557a3b70e fix vertical alignment within status bar 2016-04-14 19:15:35 +01:00
Matthew Hodgson 8b6cf1fc41 change badge look & feel; change status bar sizing 2016-04-14 19:11:58 +01:00
Matthew Hodgson 4eb762d52b spell out that images are clickable 2016-04-14 18:16:03 +01:00
Matthew Hodgson 4d221c6099 spell out that images are clickable 2016-04-14 18:15:51 +01:00
Richard van der Hoff 314bfbd541 Merge pull request #1391 from vector-im/rav/unoptimize_develop 
Do less mangling of jenkins builds
 2016-04-14 15:55:13 +01:00
Richard van der Hoff 5cdd234bf2 Do less mangling of jenkins builds 
This turns off uglification, and turns on the react sanity checks.
 2016-04-14 15:05:36 +01:00
Richard van der Hoff b6d5849bec Merge pull request #1386 from vector-im/rav/refactor_notifications 
Start Notifications component refactor
 2016-04-14 14:29:11 +01:00
Richard van der Hoff 035b15f330 Moar debug for ff session restore issue 2016-04-13 22:18:26 +01:00
Richard van der Hoff 77355cbeb4 Add some debug to help with FF restore bug 
(https://github.com/vector-im/vector-web/issues/1354)
 2016-04-13 21:01:24 +01:00
Richard van der Hoff ff5dff45f5 Start Notifications component refactor 
Factor some things out of the mega Notifications component, and add a dummy
unit test to show willing
 2016-04-13 18:44:41 +01:00
Richard van der Hoff 0deb52ac5e Merge branch 'rav/karma' into develop 
Run test suite under karma as part of build
 2016-04-13 18:23:52 +01:00
Richard van der Hoff 29ff9c11a8 Final karma tweaks 
* fix a comment
* drop redundant import
 2016-04-13 18:22:05 +01:00
Richard van der Hoff cb3ae0e069 Disable autoWatch for npm test 
... we're only going to run the tests once, so there is no need to tell webpack
to watch the sources. This saves a spurious repack.
 2016-04-13 18:13:57 +01:00
Richard van der Hoff bf31d6d5fa Karma test tweaks 
* Make sure we only get one js-sdk (and update runtime config to match)
* Don't verifyNoOutstandingRequests (since it is hard to be certain which we
  will get, and makes the tests too dependent on implementation-specifics).
* Disable color for npm test, to avoid confusing Jenkins
 2016-04-13 17:41:23 +01:00
Richard van der Hoff 181a6a61ff tests: Don't add the div to the DOM 2016-04-13 17:20:06 +01:00
Richard van der Hoff 322af6513d Run some tests under karma 
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
 2016-04-13 17:20:06 +01:00
Richard van der Hoff 69ce3c43cf Revert "Merge branch 'develop' into rav/karma" 
The karma tests don't pass yet, and aren't ready to land on develop.

This reverts commit 438453e61a, reversing
changes made to 50f94eb040.
 2016-04-13 17:17:45 +01:00
Richard van der Hoff 438453e61a Merge branch 'develop' into rav/karma 2016-04-13 16:16:26 +01:00
Matthew Hodgson 50f94eb040 stop guests rom trying to blunder into non-guest rooms 2016-04-13 13:33:23 +01:00
David Baker 5794c30def Devices should be below 'advanced' 2016-04-13 11:35:53 +01:00
Richard van der Hoff a512e600a7 tests: Don't add the div to the DOM 2016-04-13 11:16:38 +01:00
Richard van der Hoff 429d110212 Run some tests under karma 
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
 2016-04-13 10:15:04 +01:00
Matthew Hodgson b5248c06a7 fix https://github.com/vector-im/vector-web/issues/987 for once and for all 2016-04-13 00:34:32 +01:00
Matthew Hodgson 18bd1058d3 Merge pull request #1376 from vector-im/matthew/fadable 
make the UI fadable to help with decluttering
 2016-04-12 18:04:47 +01:00
Matthew Hodgson b18fcf7f9e spinner on saving room settings 2016-04-12 18:02:31 +01:00
Matthew Hodgson 05e963d1e2 make the UI fadable to help with decluttering 2016-04-12 17:17:08 +01:00
David Baker 5d9c8f3726 Support config for email notifs 
Add support to notif settings for adding an email pusher, only for the first email address for now.
 2016-04-12 16:19:20 +01:00
David Baker be55882f46 Merge pull request #1374 from vector-im/dbkr/get_pushers 
Get and display a user's pushers in settings
 2016-04-12 14:41:45 +01:00
David Baker 356a4a4392 Typo and use CSS rather than <i> 2016-04-12 14:10:17 +01:00
Matthew Hodgson 34bdd40953 timestamps are permalinks 2016-04-12 13:34:10 +01:00
David Baker c5524851f3 Comment future possibility for deleting pushers 2016-04-12 13:22:58 +01:00
David Baker cff1c3010b Get & display pushers in settings 
Really this is so (in a subsequent PR) we can show whether a user has an email pusher, but we can basically display the list of pushers for free, so adding this too.
 2016-04-12 13:18:57 +01:00
Matthew Hodgson 46572ae793 click on group call thumbnail should return you to the group call, not the 1:1 2016-04-12 02:27:35 +01:00
Matthew Hodgson b1ba69fd00 fix lightbox overscroll 2016-04-12 00:35:00 +01:00
Matthew Hodgson 8c619fedeb Merge pull request #1343 from vector-im/matthew/preview_urls 
URL previewing support
 2016-04-11 23:55:18 +01:00
Matthew Hodgson efd01d6929 move localstorage crap entirely to TextualBody 2016-04-11 23:54:00 +01:00
Matthew Hodgson a1b78f93fe Fix wrap on view source 2016-04-10 14:18:57 +01:00