enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • 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
  • 36616a97a1 Add ability to click-to-invite Kegan Dougal 2016-01-18 17:12:35 +00:00
  • 7c0fffa79b PushRules settings: Applied easy review remarks manuroe 2016-01-18 18:07:33 +01:00
  • 772470a0ee Merge pull request #97 from matrix-org/push-rules-settings manuroe 2016-01-18 18:02:34 +01:00
  • 33edeccb43 Merge branch 'develop' into push-rules-settings manuroe 2016-01-18 18:00:41 +01:00
  • 165adde0c8 Use EntityTile for 3PID entities rather than munging MemberTile Kegan Dougal 2016-01-18 16:55:51 +00:00
  • c758c0f84f Add invite button JSX Kegan Dougal 2016-01-18 16:47:31 +00:00
  • fef02f2fd1 s/MemberTile/EntityTile/ Kegan Dougal 2016-01-18 16:43:00 +00:00
  • bdcf683942 PushRules settings: Create a dedicated rule for "Messages sent to group". The default fallback rule cannot be used because it matches with too much events. manuroe 2016-01-18 16:41:48 +01:00
  • ae14210763 PushRules settings: Put keywords in the right position manuroe 2016-01-18 16:31:18 +01:00
  • 830160f074 PushRules settings: Enabled all radio buttons of the table. Each rule is described in the code so that if the server does not have it in its default rules or if the user wants to use actions different from the hs one, the code will create a new rule that will override the hs one. manuroe 2016-01-18 16:20:33 +01:00
  • 71009d81b6 Factor out common code between MemberTile and UserTile into EntityTile. Use EntityTile. Kegan Dougal 2016-01-18 15:19:49 +00:00
  • cc3d27bd4b Merge pull request #98 from matrix-org/message_composer_arrows_keys David Baker 2016-01-18 14:25:57 +00:00
  • 880ae0f3fa Fix typo David Baker 2016-01-18 14:25:23 +00:00
  • 0ac997491e Clarify comment David Baker 2016-01-18 14:23:31 +00:00
  • 795d782410 Merge pull request #100 from matrix-org/matthew/roomsettings2 Matthew Hodgson 2016-01-18 14:02:27 +00:00
  • 51648b9bf0 merge develop Matthew Hodgson 2016-01-18 14:02:19 +00:00
  • 17fdfa0c8f incorporate kegan PR feedback Matthew Hodgson 2016-01-18 14:00:47 +00:00
  • 0ef03c5ca4 Merge pull request #653 from vector-im/matthew/roomsettings2 Matthew Hodgson 2016-01-18 13:39:55 +00:00
  • 5a1b0a1dab Merge pull request #657 from vector-im/matthew/memberlist Matthew Hodgson 2016-01-18 13:39:42 +00:00
  • 9fae4d4ecd Merge pull request #101 from matrix-org/matthew/memberlist Matthew Hodgson 2016-01-18 13:39:29 +00:00
  • aa412bed0f reindent promises as per dave's PR feedback Matthew Hodgson 2016-01-18 13:38:40 +00:00
  • d0eedb4faa merge develop Matthew Hodgson 2016-01-18 13:34:09 +00:00
  • fd99b260f4 Merge branch 'develop' into kegan/invite-search Kegan Dougal 2016-01-18 12:07:36 +00:00
  • 77621fe035 Add missing CSS from #638 Kegan Dougal 2016-01-18 12:06:46 +00:00
  • 2a64d0feb3 Merge branch 'develop' into matthew/roomsettings2 Kegan Dougal 2016-01-18 10:49:45 +00:00
  • 6e42d00727 Merge pull request #95 from matrix-org/kegan/base-avatar Kegsay 2016-01-18 10:18:04 +00:00
  • 7e40d81a44 Merge pull request #638 from vector-im/kegan/base-avatar Kegsay 2016-01-18 10:17:57 +00:00
  • 8f83621c4c hide Mod button for muted users Matthew Hodgson 2016-01-18 01:40:19 +00:00
  • 6e3245a3b0 make linkify userid jump to memberinfo Matthew Hodgson 2016-01-18 01:26:15 +00:00
  • 8792be4db2 moar space Matthew Hodgson 2016-01-18 01:25:57 +00:00
  • 1fef91b82c MemberInfo lipstick Matthew Hodgson 2016-01-18 01:18:11 +00:00
  • 8e1ab8e6b4 vaguely skin MemberInfo correctly Matthew Hodgson 2016-01-18 01:18:02 +00:00
  • 430c90f4a4 oops ,forgot PowerSelector Matthew Hodgson 2016-01-17 23:58:38 +00:00
  • a768b7fe4b bring back power badges Matthew Hodgson 2016-01-18 00:16:31 +00:00
  • b2a1c89e83 bring back power badges Matthew Hodgson 2016-01-18 00:16:04 +00:00
  • 0553551d92 oops ,forgot PowerSelector Matthew Hodgson 2016-01-17 23:58:38 +00:00