Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 876646ac54 Hopefully make unread loop a bit more digrestable. David Baker 2016-01-21 13:22:13 +00:00
  • 568f9bb19d Merge pull request #713 from vector-im/dbkr/remove_member_event_rule David Baker 2016-01-21 12:30:03 +00:00
  • b913e72735 Remove member event rule as per SYN-607 David Baker 2016-01-21 12:01:28 +00:00
  • eed83f982e Add a suitable overflow tile for the member list Kegan Dougal 2016-01-21 11:41:28 +00:00
  • 9f362e488c Add a TruncatedList component, which truncates children passed to it. Kegan Dougal 2016-01-21 11:30:37 +00:00
  • 4d4c6e06ec Merge remote-tracking branch 'origin/develop' into unread_sync David Baker 2016-01-21 10:39:35 +00:00
  • 13e70e6956 Merge remote-tracking branch 'origin/develop' into unread_sync David Baker 2016-01-21 10:36:29 +00:00
  • 2d917910da Merge pull request #556 from vector-im/notif_sync David Baker 2016-01-21 10:31:46 +00:00
  • 99a491bb0e Merge pull request #68 from matrix-org/notif_sync David Baker 2016-01-21 10:31:42 +00:00
  • 0a70fe2bd1 Argh, revert accidental config commit David Baker 2016-01-21 10:30:52 +00:00
  • acce08194d Apply patch to the right branch: update for new count format David Baker 2016-01-21 10:23:18 +00:00
  • a08d00c672 Apply patch to the right branch: update for new count format David Baker 2016-01-21 10:20:45 +00:00
  • 1c54c64850 Merge pull request #99 from matrix-org/user_settings_on_register David Baker 2016-01-21 10:11:28 +00:00
  • a0cc3720a9 Merge pull request #106 from matrix-org/dbkr/dont_spam_read_receipts David Baker 2016-01-21 10:01:30 +00:00
  • 9bbb9f7b29 pretty invites! Matthew Hodgson 2016-01-21 00:45:22 +00:00
  • bd75234a2f make CSS work on FF Matthew Hodgson 2016-01-21 00:39:26 +00:00
  • eab0ca8716 fix bottom margin on FF Matthew Hodgson 2016-01-21 00:39:10 +00:00
  • 4d549304b6 Fix autoshow Matthew Hodgson 2016-01-21 00:26:44 +00:00
  • 9ce4148925 go splitscreen at the first sign of an invite search Matthew Hodgson 2016-01-21 00:25:47 +00:00
  • 6573ba8c20 fix up Start Chat behaviour as per Amandine's feedback Matthew Hodgson 2016-01-21 00:16:26 +00:00
  • deca90d0a7 fix up Start Chat behaviour as per Amandine's feedback Matthew Hodgson 2016-01-21 00:16:10 +00:00
  • 35c141cda9 reduce size of auxpanel when editing roomsettings Matthew Hodgson 2016-01-20 23:09:36 +00:00
  • 6f6db75ea1 improve banned users layout Matthew Hodgson 2016-01-20 22:47:42 +00:00
  • f4a2b6ab7e Merge pull request #697 from vector-im/matthew/roompreview Matthew Hodgson 2016-01-20 22:32:08 +00:00
  • 41da05f36a Merge pull request #102 from matrix-org/matthew/roompreview Matthew Hodgson 2016-01-20 22:30:10 +00:00
  • c0aa15aa09 now with gemini Matthew Hodgson 2016-01-20 22:11:58 +00:00
  • 3aaf934c97 implement the correct design for memberlist, modulo gemini Matthew Hodgson 2016-01-20 22:04:49 +00:00
  • 6117e09a3f implement the correct design for memberlist Matthew Hodgson 2016-01-20 22:04:32 +00:00
  • 161cdef36e tint bottom borders Matthew Hodgson 2016-01-20 17:24:09 +00:00
  • 1fd60f1e44 revert read marker css Matthew Hodgson 2016-01-20 17:23:33 +00:00
  • d979511696 Re-remove extra icons as they break favico David Baker 2016-01-20 17:20:34 +00:00
  • ac2e69ba28 Use new unread count methods David Baker 2016-01-20 17:20:19 +00:00
  • 548dac2ad9 Use new unread count methods David Baker 2016-01-20 17:19:52 +00:00
  • 964e7c3739 fix user_levels some more Matthew Hodgson 2016-01-20 17:15:01 +00:00
  • 705730d450 fix user_levels Matthew Hodgson 2016-01-20 17:12:55 +00:00
  • 48052415b7 usersettings button layout Matthew Hodgson 2016-01-20 17:09:53 +00:00
  • 442e090f37 button layout Matthew Hodgson 2016-01-20 17:09:46 +00:00
  • 76b7788ba6 usersettings rhs button Matthew Hodgson 2016-01-20 17:07:00 +00:00
  • e87e22a438 rhsbutton Matthew Hodgson 2016-01-20 17:06:13 +00:00
  • 5b2f921190 Fix bold avatar letters Matthew Hodgson 2016-01-20 17:01:19 +00:00
  • b830f43371 remove RoomAvatar; stale border-radius; fix aliases table Matthew Hodgson 2016-01-20 16:59:53 +00:00
  • c64f08dcc3 fix missing aliases Matthew Hodgson 2016-01-20 16:53:46 +00:00
  • 76279e2940 fix roomsettings a bit Matthew Hodgson 2016-01-20 16:39:26 +00:00
  • 0052fbd6cb Don't spam the same RR at the server until it acks it. David Baker 2016-01-20 16:39:25 +00:00
  • 6332e3908e roomsettings css fixes Matthew Hodgson 2016-01-20 16:39:14 +00:00
  • 82742f9f13 oops, fix tinted read up to marker correctly Matthew Hodgson 2016-01-20 16:06:35 +00:00
  • 39eb0f9c8f Merge pull request #687 from vector-im/push-rules-call-settings-fix manuroe 2016-01-20 17:06:01 +01:00
  • 888fde0f53 Fixed call push notifications settings that always stayed OFF manuroe 2016-01-20 17:01:09 +01:00
  • eb62456007 Update for new unread count format David Baker 2016-01-20 15:58:21 +00:00
  • 14c2d945d6 oops, use right class Matthew Hodgson 2016-01-20 15:58:17 +00:00
  • 83634bf930 Update for new unread count format David Baker 2016-01-20 15:56:11 +00:00
  • dbcbd2aad8 fix badge layout Matthew Hodgson 2016-01-20 15:52:34 +00:00
  • 5c105a50e2 Merge branch 'matthew/roompreview' of https://github.com/matrix-org/matrix-react-sdk into matthew/roompreview Matthew Hodgson 2016-01-20 15:49:02 +00:00
  • 4d2608017b fix CSS for ChangeAvatar placeholder Matthew Hodgson 2016-01-20 15:39:56 +00:00
  • 60d2d45255 readd in the .mx_EntityTile_power class. don't understand why it was killed :'( Matthew Hodgson 2016-01-20 15:39:42 +00:00
  • b296d05b35 Fix finally NPE Kegan Dougal 2016-01-20 15:38:34 +00:00
  • 6ecdb02e81 sanitize avatar border radii Matthew Hodgson 2016-01-20 15:26:48 +00:00
  • 8dc21ec837 Fix race condition when joining rooms Kegan Dougal 2016-01-20 15:25:40 +00:00
  • 4d3918109a skin new invite UI CSS Matthew Hodgson 2016-01-20 14:58:27 +00:00
  • 9a9db53e0a fix tinting of read marker again Matthew Hodgson 2016-01-20 14:58:17 +00:00
  • edb67b778d Merge branch 'develop' into matthew/roompreview Kegan Dougal 2016-01-20 14:42:04 +00:00
  • fee7ee5dcc Load the user list eventually if we have no Room object Kegan Dougal 2016-01-20 14:41:48 +00:00
  • a0aaae49dd Merge branch 'develop' into matthew/roompreview Kegan Dougal 2016-01-20 14:27:25 +00:00
  • c3c7c90de0 Merge pull request #103 from matrix-org/kegan/invite-search Kegsay 2016-01-20 14:26:17 +00:00
  • 60a084bdbd Merge branch 'develop' into matthew/roompreview Matthew Hodgson 2016-01-20 14:22:09 +00:00
  • 391c653d24 Lazy-load the user list to improve perf Kegan Dougal 2016-01-20 14:14:04 +00:00
  • 91c224aaf4 Review comments: Remove stuff which shouldn't have been there Kegan Dougal 2016-01-20 13:41:03 +00:00
  • 6d19ce09ab Merge pull request #105 from matrix-org/dbkr/add_email_address David Baker 2016-01-19 17:20:35 +00:00
  • c4d4e9c46e Terminate promise chain David Baker 2016-01-19 17:20:23 +00:00
  • bdfd09d893 Merge branch 'kegan/invite-search' into matthew/roompreview Kegan Dougal 2016-01-19 17:10:54 +00:00
  • e4e3393232 Temporarily comment out address book until perf can be looked at given other PRs now depend on this PR Kegan Dougal 2016-01-19 17:09:36 +00:00
  • 4ed130ceac Implement adding email addresses to your profile. David Baker 2016-01-19 16:36:54 +00:00
  • 84608ba156 Fix syntax error Kegan Dougal 2016-01-19 16:18:08 +00:00
  • ad6a19a0df Merge pull request #668 from vector-im/matthew/roompreview Kegsay 2016-01-19 16:09:36 +00:00
  • 3e4c5d7fa3 Merge branch 'kegan/invite-search' into matthew/roompreview Kegan Dougal 2016-01-19 16:08:14 +00:00
  • db7d863ce4 set autoPeekDone on finally Matthew Hodgson 2016-01-19 15:18:16 +00:00
  • 33bd6e2028 Merge pull request #104 from matrix-org/dbkr/dedup_client_secret Kegsay 2016-01-19 14:57:29 +00:00
  • d2708cf4d4 Filter the membership list in addition to the search area for the input text Kegan Dougal 2016-01-19 14:51:26 +00:00
  • 2274cb3f7f fix invite prompt Matthew Hodgson 2016-01-18 20:18:46 +00:00
  • c29ec28dfd fix layout for blunt join msgs Matthew Hodgson 2016-01-18 20:15:12 +00:00
  • f22519f10c factor out the peek rule calculation so that we can do it both onNewRoom and if there's a room already. I guess we could do it in react's onStateUpdate too Matthew Hodgson 2016-01-18 20:05:33 +00:00
  • 3e8c6a42d3 roomsettings layout tweaks Matthew Hodgson 2016-01-18 19:58:02 +00:00
  • 3b8e5073b5 improve layout Matthew Hodgson 2016-01-18 19:57:32 +00:00
  • a775086e81 wording from amandine Matthew Hodgson 2016-01-18 19:57:17 +00:00
  • eb7144ef85 improve layout Matthew Hodgson 2016-01-18 19:56:56 +00:00
  • 0a79b0f9e2 fix NPE from kegan's memberlist branch Matthew Hodgson 2016-01-18 19:56:47 +00:00
  • 7b91d3c5f8 wording changes from Amandine to settings Matthew Hodgson 2016-01-18 19:56:38 +00:00
  • 765174a600 merge conflict Matthew Hodgson 2016-01-18 19:56:35 +00:00
  • d5c291ae62 Merge branch 'kegan/invite-search' into matthew/roompreview Matthew Hodgson 2016-01-18 18:00:58 +00:00
  • e68972fb1a Remove generateClientSecret and use the one the js sdk gives us. David Baker 2016-01-18 17:50:27 +00:00
  • 491ba94230 WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted. Matthew Hodgson 2016-01-18 17:39:23 +00:00
  • a8643ff039 Move power level stuff to EntityTile for now Kegan Dougal 2016-01-18 17:37:17 +00:00
  • d6f6f32c74 WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now Matthew Hodgson 2016-01-18 17:37:13 +00:00
  • 317e1fb9cd Merge branch 'develop' into kegan/invite-search Kegan Dougal 2016-01-18 17:33:26 +00:00
  • 0465323ca6 Merge branch 'develop' into kegan/invite-search Kegan Dougal 2016-01-18 17:31:26 +00:00
  • 37e8a35967 Merge pull request #641 from vector-im/push-rules-settings manuroe 2016-01-18 18:25:31 +01:00
  • 6182c983ab PushRules settings: Applied review remarks (2/2) manuroe 2016-01-18 18:24:53 +01:00
  • ac4b221690 More CSS fun for border bottom Kegan Dougal 2016-01-18 17:22:02 +00:00
  • f1042bd1c4 UI tweaks Kegan Dougal 2016-01-18 17:21:28 +00:00
  • fdf5b0a4fc Merge branch 'develop' into push-rules-settings manuroe 2016-01-18 18:14:20 +01:00