eb01cb9cba
Merge pull request #1037 from vector-im/markjh/change_push_actions
...
Update the actions of default rules instead of overriding.
2016-03-15 18:10:04 +00:00
2a8afd49fb
mx_Login_fieldLabel CSS
2016-03-15 18:09:54 +00:00
9b85d88036
s/somme/some/
2016-03-15 15:23:18 +00:00
672a5cb89c
Merge pull request #200 from matrix-org/matthew/loginfixes
...
Bring back lost functionality on login/register/password-reset screens
2016-03-15 15:21:32 +00:00
59866a2006
final PR feedback
2016-03-15 15:20:51 +00:00
836f7ca80d
Merge pull request #218 from matrix-org/session_logged_out
...
Handle the new Session.logged_out event.
2016-03-15 14:51:50 +00:00
438558da55
PR feedback
2016-03-15 13:48:46 +00:00
c2049e991b
padding for radio buttons on login pages
2016-03-15 13:37:07 +00:00
1a74b0c487
Merge pull request #216 from matrix-org/matthew/fix-join-by-room-alias
...
hopefully fix https://github.com/vector-im/vector-web/issues/819
2016-03-15 13:16:51 +00:00
3224a4e49e
Add helper functions for decoding and encoding lists of push actions
2016-03-15 11:26:32 +00:00
cfc4b89225
fix https://github.com/vector-im/vector-web/issues/1154
2016-03-15 10:56:54 +00:00
8b1444c954
Port the legacy im.vector rules to the new format on startup
2016-03-15 10:49:10 +00:00
a1b875bb25
Handle the new Session.logged_out event. Log the user out and display a message telling them they've been logged out.
...
Requires https://github.com/matrix-org/matrix-js-sdk/pull/100 (but safe without)
Fixes https://github.com/vector-im/vector-web/issues/414
2016-03-15 10:48:16 +00:00
8ea75277e1
Merge pull request #215 from matrix-org/rav/fix_scroll_on_resize
...
Adjust the scroll position when the gemini panel is resized
2016-03-15 09:59:44 +00:00
8a905dec58
grey out roomsettings that you can't edit
2016-03-15 02:46:17 +00:00
7c598d90b1
give proper error message on failing to start chat
2016-03-15 02:19:27 +00:00
1abd7f45ce
fix setting custom power levels
2016-03-15 01:34:49 +00:00
5e050c6276
hopefully fix https://github.com/vector-im/vector-web/issues/819
2016-03-15 00:49:44 +00:00
79eb54058f
oops, backout WIP
2016-03-15 00:48:19 +00:00
005ebbd037
stop avatar mxids being copy-pastable (unless they contain an initial). should significantly improve https://github.com/vector-im/vector-web/issues/893
2016-03-15 00:21:05 +00:00
ce150646e6
Merge branch 'develop' into rav/fix_scroll_on_resize
2016-03-14 22:32:54 +00:00
0598092f9d
Bump to latest react-gemini-scrollbar
...
... which will hopefully fix the mystery of the disappearing member list.
2016-03-14 19:02:22 +00:00
d4d2ef326e
Bump to dev branch of js-sdk
2016-03-14 15:54:56 +00:00
6a0cd9e047
Bump to dev branch of js-sdk
2016-03-14 15:54:33 +00:00
3173898bc1
Bump the timeline limit to 500
...
... so that matthew can ctrl-f
2016-03-14 15:47:09 +00:00
61cd66304e
Adjust the scroll position when the gemini panel is resized
...
Make sure we restore the scroll state of the message panel when it is resized
2016-03-14 15:29:29 +00:00
2a62fdb652
Switch back to dev version of react-sdk
2016-03-14 14:08:47 +00:00
8a4a810d1f
Merge pull request #214 from matrix-org/rav/gemini-resize
...
Use our fork of react-gemini-scrollbar to fix resize issues
2016-03-14 13:59:11 +00:00
74bbb81532
Merge pull request #212 from matrix-org/rav/fix_search_position
...
Put direct-linked events and search clickthroughs in the middle
2016-03-14 12:49:21 +00:00
6215326f8e
Merge pull request #1137 from vector-im/rav/update_README
...
Update README to include `npm install` in react-sdk
2016-03-14 12:48:58 +00:00
88b3f2ed8c
Use our fork of react-gemini-scrollbar to fix resize issues
...
Rather than telling react-gemini-scrollbar to update every time something that
changes its size happens, try out our fork of it which uses some hackery to
listen for resizes.
2016-03-14 12:46:13 +00:00
22bd0f9aa0
Merge pull request #198 from matrix-org/matthew/confjoinparts
...
prettyprint conference joins and parts properly
2016-03-13 23:30:31 +00:00
893e338917
incorporate keganfeedback
2016-03-12 19:49:54 +00:00
da7e9840f3
reinstate npm 3 warning
2016-03-11 15:12:28 +00:00
cc18458bec
Update README to include `npm install` in react-sdk
...
Casual users of /develop shouldn't need to do the whole
clone-three-repositories thing.
2016-03-11 15:09:29 +00:00
e0c416ee01
Merge pull request #213 from matrix-org/dbkr/redacted_3pid_invite_crash
...
Don't crash on redacted (or otherwise invalid) 3pid invites
2016-03-11 14:39:43 +00:00
928915873b
Use npm to fetch react-sdk and js-sdk
...
After some discussion, we've agreed it's less evil to have package.json point
to git develop, even if you then have to do a manual build step. That avoids
any future problems where (for example) js-sdk develop gains experimental
changes which would break for users using a build process which involves a
manual git checkout.
2016-03-11 14:30:53 +00:00
1131b82414
Don't crash on redacted (or otherwise invalid) 3pid invites
2016-03-11 14:18:30 +00:00
8fa059fc4b
Prep 0.3.0
2016-03-11 13:00:31 +00:00
fc062072b0
Bump to 0.2.0
2016-03-11 12:52:21 +00:00
eeab97114f
Prepare v0.2.0
2016-03-11 12:48:26 +00:00
02510003dd
prep v0.1.1
2016-03-11 12:24:44 +00:00
1516f17af4
Merge pull request #210 from matrix-org/dbkr/invite_display_when_peekable
...
Show the invite preview bar when we have a 3pid invite
2016-03-11 10:21:04 +00:00
15170f8718
Comment how we're not rejecting 3pid invites
2016-03-11 10:20:52 +00:00
73781f5619
doc inviterName
2016-03-10 17:43:20 +00:00
5e7eb3ee92
Stop video tags autoplaying.
...
Properly, this time
Fixes https://github.com/vector-im/vector-web/issues/995
2016-03-10 17:38:52 +00:00
3fd066c2d4
Put direct-linked events and search clickthroughs in the middle
...
We need two modes of operation for ScrollPanel.scrollToToken:
For jump-to-read-marker, we want it 1/3 of the way down the screen.
For search clickthrough, and hyperlinked events, we want put the event in the
*middle* of the screen.
Fixes https://github.com/vector-im/vector-web/issues/1032
2016-03-10 17:27:46 +00:00
f985232d29
Merge pull request #211 from matrix-org/rav/update_scrollpanel_on_topbar
...
Update the gemini panel when we show/hide the TopUnreadMessagesBar
2016-03-10 16:56:31 +00:00
2875fa3eb1
Show the invite preview bar when we have a 3pid invite, and make the reject button work.
2016-03-10 15:56:58 +00:00
f9e753f57a
Update the gemini panel when we show/hide the TopUnreadMessagesBar
...
Showing/hiding the TopUnreadMessagesBar resizes the scrollpanel. Make sure that
we update the gemini panel when this happens.
(Fixes an intermittent bug wherein we could get stuck with a 'scroll to bottom'
indicator after jumping to the bottom, with unread messages in the view)
2016-03-10 15:55:03 +00:00
Mark Haines