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

3154 Commits

Author SHA1 Message Date
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 0f2c41dddc Merge pull request #2285 from vector-im/dbkr/rebrand 
Dbkr/rebrand
 2016-09-19 13:37:02 +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
Matthew Hodgson 9391dc6c2a aargh 2016-09-19 07:41:32 -04:00
Matthew Hodgson f19044fef2 re-apply new scalar CSS 2016-09-19 06:59:24 -04: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 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 4720da3f8e Merge pull request #2241 from vector-im/dbkr/paginate_publicrooms 
Paginate Room Directory
 2016-09-17 15:46:21 +01:00
Matthew Hodgson e2b3fc3519 only show invite button for rooms you're in 2016-09-17 03:02:14 +01:00
Matthew Hodgson ab3c1509c5 switch to 3-digit formatting for counts 2016-09-17 02:39:31 +01:00
Matthew Hodgson 91dd029483 don't let guests invite 2016-09-17 02:05:01 +01:00
David Baker 53fd3f52fa Oops, onChange doesn't catch the enter key 2016-09-16 20:56:14 +01:00
David Baker d0618c4f49 Update test now that /publicRooms is a post 2016-09-16 20:49:28 +01:00
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