OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
32,364 Commits
215 Branches
561 Tags
480 MiB
Commit Graph

32364 Commits (6127669c532f6c4782a2e6ebd99d6385b6719260)

Author SHA1 Message Date
Kegan Dougal 91c224aaf4 Review comments: Remove stuff which shouldn't have been there 2016-01-20 13:41:03 +00:00
David Baker 6d19ce09ab Merge pull request #105 from matrix-org/dbkr/add_email_address 
Implement adding email addresses to your profile.
 2016-01-19 17:20:35 +00:00
David Baker c4d4e9c46e Terminate promise chain 2016-01-19 17:20:23 +00:00
Kegan Dougal bdfd09d893 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-19 17:10:54 +00:00
Kegan Dougal e4e3393232 Temporarily comment out address book until perf can be looked at given other PRs now depend on this PR 2016-01-19 17:09:36 +00:00
David Baker 4ed130ceac Implement adding email addresses to your profile. 2016-01-19 16:36:54 +00:00
Kegan Dougal 84608ba156 Fix syntax error 2016-01-19 16:18:08 +00:00
Kegan Dougal 3e4c5d7fa3 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-19 16:08:14 +00:00
Matthew Hodgson db7d863ce4 set autoPeekDone on finally 2016-01-19 15:18:16 +00:00
Kegsay 33bd6e2028 Merge pull request #104 from matrix-org/dbkr/dedup_client_secret 
Remove generateClientSecret and use the one the js sdk gives us.
 2016-01-19 14:57:29 +00:00
Kegan Dougal d2708cf4d4 Filter the membership list in addition to the search area for the input text 2016-01-19 14:51:26 +00:00
Matthew Hodgson 2274cb3f7f fix invite prompt 2016-01-18 20:18:46 +00:00
Matthew Hodgson c29ec28dfd fix layout for blunt join msgs 2016-01-18 20:15:12 +00:00
Matthew Hodgson 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 2016-01-18 20:05:33 +00:00
Matthew Hodgson eb7144ef85 improve layout 2016-01-18 19:56:56 +00:00
Matthew Hodgson 0a79b0f9e2 fix NPE from kegan's memberlist branch 2016-01-18 19:56:47 +00:00
Matthew Hodgson 7b91d3c5f8 wording changes from Amandine to settings 2016-01-18 19:56:38 +00:00
Matthew Hodgson 765174a600 merge conflict 2016-01-18 19:56:35 +00:00
David Baker e68972fb1a Remove generateClientSecret and use the one the js sdk gives us. 2016-01-18 17:50:27 +00:00
Matthew Hodgson 491ba94230 WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted. 2016-01-18 17:39:23 +00:00
Kegan Dougal a8643ff039 Move power level stuff to EntityTile for now 2016-01-18 17:37:17 +00:00
Kegan Dougal 0465323ca6 Merge branch 'develop' into kegan/invite-search 2016-01-18 17:31:26 +00:00
Kegan Dougal f1042bd1c4 UI tweaks 2016-01-18 17:21:28 +00:00
Kegan Dougal 36616a97a1 Add ability to click-to-invite 2016-01-18 17:12:35 +00:00
manuroe 772470a0ee Merge pull request #97 from matrix-org/push-rules-settings 
Push rules settings
 2016-01-18 18:02:34 +01:00
manuroe 33edeccb43 Merge branch 'develop' into push-rules-settings 
# Conflicts:
#	src/component-index.js
#	src/components/views/rooms/RoomSettings.js
 2016-01-18 18:00:41 +01:00
Kegan Dougal 165adde0c8 Use EntityTile for 3PID entities rather than munging MemberTile 2016-01-18 16:55:51 +00:00
Kegan Dougal c758c0f84f Add invite button JSX 2016-01-18 16:47:31 +00:00
Kegan Dougal 71009d81b6 Factor out common code between MemberTile and UserTile into EntityTile. Use EntityTile. 2016-01-18 15:19:49 +00:00
David Baker cc3d27bd4b Merge pull request #98 from matrix-org/message_composer_arrows_keys 
Fix history scrolling with multiline input
 2016-01-18 14:25:57 +00:00
David Baker 880ae0f3fa Fix typo 2016-01-18 14:25:23 +00:00
David Baker 0ac997491e Clarify comment 2016-01-18 14:23:31 +00:00
Matthew Hodgson 795d782410 Merge pull request #100 from matrix-org/matthew/roomsettings2 
Finish off RoomSettings (part 2)
 2016-01-18 14:02:27 +00:00
Matthew Hodgson 51648b9bf0 merge develop 2016-01-18 14:02:19 +00:00
Matthew Hodgson 17fdfa0c8f incorporate kegan PR feedback 2016-01-18 14:00:47 +00:00
Matthew Hodgson 9fae4d4ecd Merge pull request #101 from matrix-org/matthew/memberlist 
MemberInfo and MemberTile UI/UX fixups
 2016-01-18 13:39:29 +00:00
Matthew Hodgson aa412bed0f reindent promises as per dave's PR feedback 2016-01-18 13:38:40 +00:00
Matthew Hodgson d0eedb4faa merge develop 2016-01-18 13:34:09 +00:00
Kegan Dougal fd99b260f4 Merge branch 'develop' into kegan/invite-search 2016-01-18 12:07:36 +00:00
Kegan Dougal 2a64d0feb3 Merge branch 'develop' into matthew/roomsettings2 2016-01-18 10:49:45 +00:00
Kegsay 6e42d00727 Merge pull request #95 from matrix-org/kegan/base-avatar 
Factor out common Avatar code
 2016-01-18 10:18:04 +00:00
Matthew Hodgson 8f83621c4c hide Mod button for muted users 2016-01-18 01:40:19 +00:00
Matthew Hodgson 6e3245a3b0 make linkify userid jump to memberinfo 2016-01-18 01:26:15 +00:00
Matthew Hodgson 8e1ab8e6b4 vaguely skin MemberInfo correctly 2016-01-18 01:18:02 +00:00
Matthew Hodgson 430c90f4a4 oops ,forgot PowerSelector 2016-01-18 00:42:20 +00:00
Matthew Hodgson a768b7fe4b bring back power badges 2016-01-18 00:16:31 +00:00
Matthew Hodgson 0553551d92 oops ,forgot PowerSelector 2016-01-17 23:58:38 +00:00
Matthew Hodgson f3aeda7af9 merge develop 2016-01-17 23:31:21 +00:00
Matthew Hodgson 1467aacfa4 support saving tag changes (untested) 2016-01-17 12:27:21 +00:00
Matthew Hodgson 06e1674f23 UI for tag management 2016-01-17 05:13:16 +00:00