gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,921 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

2921 Commits

Author SHA1 Message Date
David Baker 0bce7f3102 Merge remote-tracking branch 'origin/develop' into dbkr/paginate_publicrooms 2016-09-16 20:16:33 +01:00
David Baker 3d97061d78 Check if we need to fetch more rooms after filter 2016-09-16 19:59:06 +01:00
David Baker 50f05db29e Don't show loading spinner if just paginating 2016-09-16 19:29:56 +01:00
David Baker 2fdec51a5b Wait a bit before sending filter requests 
avoid hammering the server with requests for each keystroke
 2016-09-16 18:53:18 +01:00
David Baker 6d332256b5 Ignore results of old requests 2016-09-16 18:48:47 +01:00
David Baker 2b6fbb038a Show headers while loading 
& show spinner whilst waiting for filter requests
 2016-09-16 18:41:29 +01:00
David Baker 48fb578952 Empty commit to test /develop redeploy 2016-09-16 18:31:47 +01:00
David Baker 7fc4b1cb35 Actually ad the arg to argparse 2016-09-16 18:26:46 +01:00
David Baker 4725fa4c2d Missed a comma 2016-09-16 18:21:33 +01:00
David Baker 5acb6b0b37 Merge pull request #2240 from vector-im/dbkr/redeploy_config 
Make redeploy script symlink config
 2016-09-16 18:19:34 +01:00
David Baker 838608afab Make redeploy script symlink config 2016-09-16 18:15:15 +01:00
David Baker a11516a984 Make publicrooms use the new paginating API 
Also do filtering on the server

WIP: This breaks the network dropdown
 2016-09-16 17:33:28 +01:00
Matthew Hodgson 196b352b9a Merge pull request #2210 from vector-im/markjh/megolm 
Update the version of olm to 1.3.0
 2016-09-16 17:30:51 +01:00
Richard van der Hoff e8a12e7ddc Revert "fix instructions" 
This reverts commit 6a13155013.
 2016-09-16 17:27:52 +01:00
David Baker 135c22c99d Merge pull request #2219 from vector-im/dbkr/directory_network_selector 
Directory network selector
 2016-09-16 17:09:23 +01:00
Matthew Hodgson 6a13155013 fix instructions 2016-09-16 17:08:27 +01:00
Matthew Hodgson 6e2a371017 fix MemberInfo layout 2016-09-16 14:36:26 +01:00
Matthew Hodgson de26d1a8ce Merge pull request #2235 from vector-im/wmwragg/two-state-sublist-headers 
Wmwragg/two state sublist headers
 2016-09-16 14:08:00 +01:00
wmwragg 7af765976b Notification counts now done correctly, as well as highlights 2016-09-16 13:25:39 +01:00
David Baker 8f6d98886c Use real matrix.org network in sample config 2016-09-16 11:44:33 +01:00
wmwragg 72e108c4f9 More robust badge positioning 2016-09-16 11:34:16 +01:00
wmwragg e2b695827e Refactor to reuse RoomSubList chevron styling 2016-09-16 11:02:09 +01:00
wmwragg 4b50a8a56e Refactored so the RoomSubList overflow element use RoomSubList CSS 2016-09-16 10:57:55 +01:00
wmwragg 737d1d8843 Changed the overflow tile styling, but there is no collpased state or mention count yet 2016-09-16 10:48:52 +01:00
Matthew Hodgson eea9e366b8 un-revert 5282796d84 as it wasn't to blame 2016-09-16 10:38:54 +01:00
wmwragg 24d0b95cb2 Corrected the tooltip text colour to match the design 2016-09-16 08:15:27 +01:00
wmwragg 77085882fa quick tidy of CSS 2016-09-16 08:08:31 +01:00
wmwragg 9375ebfb75 Fixed broken tooltip positioning again 2016-09-16 08:06:17 +01:00
Matthew Hodgson e2f94c8722 improve scroll cosmetics 2016-09-16 03:26:59 +01:00
Matthew Hodgson b0fd65f442 fix ff rhs scroll 2016-09-16 03:26:45 +01:00
Matthew Hodgson f56a6039e8 fix droptarget margins 2016-09-16 02:54:03 +01:00
Matthew Hodgson c44994c0ee fix tinter for LeftPanel 2016-09-16 02:53:57 +01:00
Matthew Hodgson eeb91374cf highlight my device 2016-09-15 19:42:36 +01:00
David Baker cd4564d3d3 Make the matrix.org section be everything 
(ie. every alias on the matrix.org HS, so currently everything, since we don't pull in any other directories)
 2016-09-15 18:56:04 +01:00
David Baker 190cd884b5 Add roomDirectory to sample config 2016-09-15 18:42:00 +01:00
Matthew Hodgson 1741cc915e revert accidental commit 5282796d84 as folks say everything broke 2016-09-15 17:50:47 +01:00
wmwragg 37fc73b1ea Setting correct initial state 2016-09-15 17:31:15 +01:00
David Baker c1e83da35d Put network list config into config file 2016-09-15 17:20:13 +01:00
wmwragg 5282796d84 Added back the overflow tile and two state room sub lists, rather than the three state currently 2016-09-15 17:17:45 +01:00
Matthew Hodgson 866164c4d9 Merge pull request #2222 from vector-im/wmwragg/correct-incoming-call-positioning 
Wmwragg/correct incoming call positioning
 2016-09-15 15:59:14 +01:00
wmwragg 5ceb1e641f Placing the incomingCallBox in the sticky element, so it sticks when the header sticks 2016-09-15 15:34:11 +01:00
David Baker f3cbb9fe90 Make the network dropdown work 2016-09-15 15:18:12 +01:00
Matthew Hodgson fe4371bf45 Merge pull request #2211 from vector-im/wmwragg/remove-old-filter 
Wmwragg/remove old filter
 2016-09-15 15:01:37 +01:00
wmwragg cde3f33db3 Added incomingCallBox to header and removed from roomTile 2016-09-15 14:37:53 +01:00
Matthew Hodgson 82e257b4ea make DM naming consistent 2016-09-15 13:23:17 +01:00
wmwragg 3907da064e Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog 2016-09-15 11:46:35 +01:00
wmwragg f43530e1ef Tweaked font size to match the design spec 2016-09-15 11:39:21 +01:00
Mark Haines f6fb1561d7 Update the version of olm to 1.3.0 2016-09-15 11:33:37 +01:00
wmwragg a1e3ec1d19 Added query to CSS and removed nolonger used SearchableEntityList 2016-09-15 11:30:46 +01:00
David Baker 43b87e1f82 Add network selector that doesn't do anything yet 2016-09-15 11:29:27 +01:00