gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,050 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

50 Commits

Author SHA1 Message Date
Travis Ralston 3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Michael Telatynski bf6a3470b4
Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-10-04 22:35:58 +01:00
Luke Barnard a9d308004e Factor out EditableItemList component from AliasSettings 2017-10-04 10:30:09 +01:00
Luke Barnard 195395e7ee Adjust CSS for groupRoomTile and add QuestionDialog right padding 
(The confirmation dialog for removing a room needed padding)
 2017-10-03 11:14:43 +01:00
Travis Ralston 2d153a72c1 Split up CSS; use .catch instead of .then 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:33:14 -06:00
Travis Ralston 078ee54edf Move the PinnedEventsPanel to the react-sdk 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:15:21 -06:00
Luke Barnard 014464d82b CSS for "remove" button on GroupRoomTile 2017-09-29 17:58:42 +01:00
Travis Ralston 5daa16ab53 Add panel for pinned messages. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Luke Barnard fbcccd8be0 Merge pull request #4830 from vector-im/dbkr/group_userlist 
Group Membership UI
 2017-09-19 13:26:02 +01:00
Michael Telatynski b84f258f87
add bottom margin to navigation buttons of room state explorer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 13:49:52 +01:00
David Baker 07b6e215a1 CSS for group invite tiles 2017-08-18 11:24:52 +01:00
Michael Telatynski f0967d4f18
split css out as the modal is no longer generic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-17 13:31:09 +01:00
Luke Barnard d901515059 rethemedex 2017-07-13 10:16:23 +01:00
David Baker 43bdc04637 Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:47:41 +01:00
David Baker 2ccd36d09e Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-07-05 10:13:53 +01:00
David Baker 796b51113f CSS for Create Group dialog 2017-06-29 16:59:26 +01:00
David Baker 105c54a1f1 CSS for Groups page 2017-06-28 13:57:20 +01:00
Richard Lewis 83353e9419 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/apps 2017-06-27 12:40:32 +01:00
David Baker f6627937fa CSS for GroupView 2017-06-27 11:52:46 +01:00
David Baker 2c186aafae Fix h2 in markdown being weird 
Date separator style was just define don any h2 in the message
list, so got picked up by any h2s in markdown too. Give date
separators their own class.

Fixes https://github.com/vector-im/riot-web/issues/4328
 2017-06-16 11:36:24 +01:00
Luke Barnard 4f55f810af Ask for email address after setting password for the first time 
This is so that the user can reset their password.
 2017-06-14 09:30:08 +01:00
Richard Lewis 152e3c6258 Merge branch 'master' of https://github.com/vector-im/riot-web into rxl881/apps 2017-06-13 11:40:23 +01:00
David Baker e30fcdba4c Merge branch 'develop' into new-guest-access 2017-06-06 11:39:47 +01:00
Matthew Hodgson e825a66e1f add CSS for RoomAvatarEvent and always make AccessibleButtons have a cursor pointer 2017-06-01 13:09:23 +01:00
Matthew Hodgson 1f4f86b5f8 rework tom's welcome page to fit in slightly better with riot's UI/UX 
* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit.
 2017-05-30 03:58:45 +01:00
Luke Barnard 3779b74dae Remove GuestWarningBar.scss from _components.scss 2017-05-25 14:51:24 +01:00
David Baker d81f894a50 Add buttons to room sub list headers 
Conflicts:
	src/components/structures/RoomSubList.js
	src/components/structures/RoomSubListHeader.js

cherry-picking commit 095da68.
 2017-05-25 11:58:12 +01:00
Luke Barnard 299dc7fe84 Merge branch 'develop' into new-guest-access 2017-05-22 16:17:36 +01:00
Richard Lewis 7a63cfd717 Add stylesheet for apps 2017-05-17 23:17:53 +01:00
David Baker 3cead032c2 Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2" 
This reverts commit e6133820a2, reversing
changes made to d1db602b3a.
 2017-05-16 16:27:58 +01:00
Luke Barnard 0e787a09c3 Implement dialog to set password 
Until https://github.com/matrix-org/matrix-react-sdk/pull/881, ChangePassword will not know about the cached password (so it won't hide "Current Password" yet).

There's also a bit of work left - informing the SessionStore that the password has changed (marked with a TODO)
 2017-05-16 09:44:52 +01:00
Luke Barnard 2eccdf56b9 Merge branch 'develop' into new-guest-access 2017-05-11 09:50:13 +01:00
David Baker 095da68aac Add buttons to room sub list headers 2017-05-04 13:58:17 +01:00
Luke Barnard d7b2f0d3be CSS for new SetMxIdDialog 2017-04-28 14:32:08 +01:00
Matthew Hodgson 15accf33f5 get rid of the evil blue outlines 2017-04-15 00:30:31 +01:00
Luke Barnard 778e7dcab0 Add CSS to make Emote sender cursor : pointer 2017-04-06 14:11:37 +01:00
David Baker c4d3d66f31 Support for phone number registration/signin, mk2 
Changes from https://github.com/vector-im/riot-web/pull/3381
 2017-03-14 14:45:54 +00:00
Luke Barnard e4c155a881 Merge branch 'develop' into luke/merge-RoomTile-context-menus 
Conflicts:
	src/components/views/context_menus/RoomTagContextMenu.js
 2017-03-14 14:01:47 +00:00
Matthew Hodgson ffba088192 fix CSS for ChatCreateOrReuseDialog 2017-03-13 00:03:53 +00:00
Richard van der Hoff e5b3ec83b3 Revert "Support for phone number registration / signin (#3381)" 
This reverts commit 271fedd1e9.

This breaks against the current synapse release. We need to think more
carefully about backwards compatibility.
 2017-03-09 20:41:11 +00:00
Luke Barnard 3dc45886f7 Merge the two RoomTile context menus into one 2017-03-09 17:05:51 +00:00
David Baker 271fedd1e9 Support for phone number registration / signin (#3381) 
* WIP msisdn signin (css)

* Changed how highlights are done

to support keyboard based navigation

* Support for new InteractiveAuth registration

* CSS for msisdn auth entry component

* CSS tweaks for msisdn login

* Fix tests
 2017-03-09 10:58:58 +00:00
David Baker 324e596e28 CSS for kick/ban confirmation dialog 2017-02-14 13:42:06 +00:00
Luke Barnard 4a34bee2dc Use localStorage `mx_team_token` to decide welcome page 2017-02-02 11:12:43 +00:00
Kegan Dougal efbea0e942 Add css for bug report dialog 2017-01-24 14:45:16 +00:00
Matthew Hodgson d907421ad4 crappy CSS for UnknownDeviceDialog 2017-01-22 01:25:32 +01:00
Richard van der Hoff 36450764f3 rethemendex fixes 
- set cwd before doing cwd-specific operations
- don't include 'themes' directory, otherwise it's a bit circular.
 2017-01-19 17:02:57 +00:00
Matthew Hodgson 691fe611d6 experimental postcss 2017-01-10 11:06:09 +00:00
Matthew Hodgson c6beaa1631 initial stab at an official dark theme via the magic of SASS. 
SVGs are all broken, and some of the more exotic colours haven't been updated. There's been no attempt to use SASS to remove duplication from the CSS yet.
no attempt to switch it at runtime yet.
 2016-12-28 04:06:10 +00:00
Matthew Hodgson 33f0eaada0 autogen _components.css 2016-12-28 02:02:23 +00:00