nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
64,590 Commits 258 Branches 582 Tags
develop
Commit Graph

64590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
5fa67d9617 Merge pull request #490 from matrix-org/rav/encrypted_event_dialog 
EncryptedEventDialog updates
 2016-09-21 10:52:22 +01:00
Richard van der Hoff
2842506b27 EncryptedEventDialog updates 
* Separate info on the event from info on the device, and add a couple of new
   fields.

 * Use MatrixClient.getEventSenderDeviceInfo (requires
   https://github.com/matrix-org/matrix-js-sdk/pull/214)

 * Don't force a download of the device keys every time we open the dialog

 * Fix a react warning if the device query takes a while
 2016-09-21 10:36:23 +01:00
David Baker
2fd3c7c5ac Merge pull request #487 from matrix-org/dbkr/incoming_dm_heuristic 
Apply heuristic on incoming DMs
 2016-09-21 10:29:30 +01:00
David Baker
5b216df28e Not joined members any more 2016-09-21 09:57:17 +01:00
Aviral Dasgupta
f171985e4c Fix click-to-complete in RTE 
Closes vector-im/vector-web#2179
 2016-09-21 07:40:48 +05:30
Aviral Dasgupta
44217422d0 Force-hide autocomplete after sending message. 
Fixes vector-im/vector-web#2128
 2016-09-21 07:28:07 +05:30
Aviral Dasgupta
ea1419ff78 force old selection state after creating entities 
Fixes vector-im/vector-web#2180
 2016-09-21 07:20:50 +05:30
David Baker
d1a5e54a69 Check if a room looks like a DM rooms on joining 
and mark it as one if so.

Also change the heuristic to only count rooms with 2 total members rather than 2 joined members, otherwise this is going to mark any room as a DM if someone creates a room, invites a bunch of people and you happen to be first to join.
 2016-09-20 17:59:46 +01:00
David Baker
b66c449bd7 Comment typo 
and out comment in more sensible place
 2016-09-20 16:08:11 +01:00
Matthew Hodgson
a2904ad33f fix 'new chat' layout bug 2016-09-20 10:06:57 -04:00
David Baker
5011d3b158 Only show version bar if on develop 
Or rather, if the version string is in the right format it to work.
 2016-09-20 14:33:25 +01:00
David Baker
c10b11a22c Separate GA tracking ID for riot 2016-09-19 17:46:54 +01:00
David Baker
a5ee48d857 Swap out unknown user icons 2016-09-19 16:42:07 +01:00
David Baker
343fc1b164 Update GA hostnames 2016-09-19 16:22:42 +01:00
David Baker
55fde43d5d All the logos. 2016-09-19 15:52:39 +01:00
David Baker
940eaf2b7d The times, they are a changin' 2016-09-19 15:32:39 +01:00
David Baker
855ecbe11d Update twitter / blog 2016-09-19 15:18:49 +01:00
David Baker
fc8f3eb0ee Just change favicon for now 2016-09-19 14:55:08 +01:00
David Baker
df90921d6c More s/Vector/Riot/ 2016-09-19 14:50:17 +01:00
David Baker
746aad9a18 Oops, missed one 2016-09-19 14:47:08 +01:00
David Baker
0f2c41dddc Merge pull request #2285 from vector-im/dbkr/rebrand 
Dbkr/rebrand
 2016-09-19 13:37:02 +01:00
David Baker
c40a7a696e Merge pull request #485 from matrix-org/dbkr/riot 
Rebrand
 2016-09-19 13:36:55 +01:00
David Baker
1c76870dcf Remove failed commenting 2016-09-19 13:36:04 +01:00
David Baker
a99c9f4db2 Keep order of blog / twitter the same 2016-09-19 13:35:31 +01:00
David Baker
7e5373e194 Stick with VectorCo twitter for now 2016-09-19 13:34:49 +01:00
David Baker
560174b99f Keep width on logo 2016-09-19 13:34:01 +01:00
David Baker
d2947a637a Better. 2016-09-19 13:31:01 +01:00
David Baker
8e4dcd9b41 Rebrand 2016-09-19 13:29:49 +01:00
David Baker
31753fc3f3 Rebrand 2016-09-19 13:26:59 +01:00
Matthew Hodgson
9391dc6c2a aargh 2016-09-19 07:41:32 -04:00
Matthew Hodgson
b348cf1244 actually apply scalar CSS :( 2016-09-19 07:01:46 -04:00
Matthew Hodgson
f19044fef2 re-apply new scalar CSS 2016-09-19 06:59:24 -04:00
Kegsay
9be1ab774d Merge pull request #484 from matrix-org/kegan/add-close-scalar-event 
Pass close_scalar postMessage action through to the dispatcher
 2016-09-19 10:47:51 +01:00
Kegsay
60179aab52 Merge pull request #2282 from vector-im/kegan/close-scalar 
Listen for close_scalar and close the dialog box when received
 2016-09-19 10:47:36 +01:00
Kegan Dougal
993bb5c89d Pass close_scalar postMessage action through to the dispatcher 2016-09-19 10:38:42 +01:00
Kegan Dougal
de38a32969 Listen for close_scalar and close the dialog box when received 2016-09-19 10:37:19 +01:00
Kegsay
5f6cc9b37b Merge pull request #2281 from vector-im/revert-2280-matthew/scalar-lipstick 
Revert "improve lipstick and support scalar logout"
 2016-09-19 10:17:54 +01:00
Kegsay
e2fc2b1b09 Revert "improve lipstick and support scalar logout" 2016-09-19 10:16:50 +01:00
Kegsay
1d97272874 Merge pull request #2280 from vector-im/matthew/scalar-lipstick 
improve lipstick and support scalar logout
 2016-09-19 09:27:07 +01:00
Richard van der Hoff
69da6a6dd8 Changelog test 
empty commit to test the changelog
 2016-09-19 00:14:19 +01:00
Richard van der Hoff
6cb7ffcd3b Another go at fixing the damn changelog 
html_url is in the top-level 'commit' object, not in commit.commit.

Also factor some code out for legibility. Seriously, what's with stuffing
everything into inline functions?
 2016-09-18 23:56:55 +01:00
Richard van der Hoff
0ab1dacb1e Merge remote-tracking branch 'origin/pull/2071/head' into rav/fix_changelog_links 2016-09-18 23:33:17 +01:00
Matthew Hodgson
af230b5fa8 improve lipstick and support scalar logout 2016-09-18 02:57:15 +01:00
Matthew Hodgson
7691559e01 more disclaimer 2016-09-17 22:07:43 +01:00
Matthew Hodgson
53bb6b96ce don't warn when disabling crypto 2016-09-17 21:56:10 +01:00
Matthew Hodgson
5fa5489bbd disambiguate devices by ID in memberinfo 2016-09-17 20:12:56 +01:00
Matthew Hodgson
6e57faecb0 trim whitespace when adding to list 2016-09-17 16:14:02 +01:00
Matthew Hodgson
4720da3f8e Merge pull request #2241 from vector-im/dbkr/paginate_publicrooms 
Paginate Room Directory
 2016-09-17 15:46:21 +01:00
Matthew Hodgson
da85df9d1a let comma trigger autocomplete. hook up backspace. search displaynames that include space 2016-09-17 15:21:08 +01:00
Matthew Hodgson
88273e8065 move admin tools to the top 2016-09-17 15:07:41 +01:00