898725082a
Remove spurious comma
...
I am messing this up - fix to 0bbce1c
2017-07-11 17:35:25 +01:00
a619001533
Merge pull request #4530 from vector-im/dbkr/groups_better_groupview
...
CSS for Rooms in Group View
2017-07-11 17:04:16 +01:00
0bbce1c140
Add missing i18n string
...
This should have been part of
https://github.com/vector-im/riot-web/pull/4557/files
2017-07-11 17:00:04 +01:00
a201f74115
Merge pull request #4557 from vector-im/rav/homepage_again
...
more HomePage tweaks
2017-07-11 16:46:43 +01:00
bc60fa81af
more HomePage tweaks
...
* Don't log errors with no context
* i18nify the "Couldn't load home page" message
2017-07-11 14:29:47 +01:00
d25b441add
Merge pull request #4556 from vector-im/rav/homepage_unmounted_guard
...
Give HomePage an unmounted guard
2017-07-11 14:27:38 +01:00
d755903fdb
typo
2017-07-11 14:10:18 +01:00
8ac26dd19f
Give HomePage an unmounted guard
...
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
b375c71a28
fix comments on node versions
2017-07-11 13:23:15 +01:00
cefc3e6da9
Make CSS more generic
2017-07-10 19:32:25 +01:00
7a1494fc46
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-10 14:35:51 +01:00
c1b8879b6b
Merge pull request #4500 from vector-im/luke/feature-enable-RTE
...
Take RTE out of labs
2017-07-10 13:56:02 +01:00
d98d493420
Merge pull request #4468 from vector-im/dbkr/my_groups
...
CSS for Groups page
2017-07-10 09:37:32 +01:00
5f5a802b44
Add CSS from react-sdk PR feedback
2017-07-07 18:34:57 +01:00
052f9effc1
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-07 12:02:38 +01:00
b4602fd2b1
Comment
2017-07-07 10:49:19 +01:00
43bdc04637
Merge remote-tracking branch 'origin/develop' into dbkr/my_groups
2017-07-07 10:47:41 +01:00
e36899c30f
Merge pull request #4442 from vector-im/erikj/group_server
...
CSS for GroupView
2017-07-06 22:04:30 +01:00
e04f34a202
More CSS for group view
2017-07-06 19:14:12 +01:00
fc5ce7fb61
Merge pull request #4525 from vector-im/t3chguy/markdown_allow_u
...
remove unused class
2017-07-06 14:08:37 +01:00
a8d5f7d5eb
remove unused class
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-06 13:53:17 +01:00
0796b304cc
Merge pull request #4466 from vector-im/luke/css-rte-improvements
...
Fix long words causing MessageComposer to widen
2017-07-06 10:27:25 +01:00
d4435daf31
Merge pull request #4516 from vector-im/luke/css-visual-bell
...
Add visual bell animation for RTE
2017-07-05 18:22:09 +01:00
07e8d4ef69
Add visual bell animation for RTE
2017-07-05 18:13:23 +01:00
8daa0fced8
Merge pull request #4502 from vector-im/luke/fix-rte-autocomplete-truncate
...
Truncate auto-complete pills properly
2017-07-05 14:00:02 +01:00
65a160f24a
Merge branch 'develop' into luke/fix-rte-autocomplete-truncate
2017-07-05 13:45:06 +01:00
43a70c2bfb
Merge pull request #4512 from vector-im/rav/chrome_headless
...
Use chrome headless instead of phantomjs
2017-07-05 13:42:52 +01:00
a14bc9a9b1
README: minor fixes
2017-07-05 11:47:38 +01:00
ba0073ca71
README: Add notes on running tests
2017-07-05 11:45:33 +01:00
60703bdcfc
Log errors thrown by getThirdpartyProtocols
...
- so that it appears in rageshakes and test logs.
2017-07-05 10:54:10 +01:00
2ccd36d09e
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-07-05 10:13:53 +01:00
cfe9e762ad
Use trusty dist
2017-07-05 10:01:13 +01:00
9969d6095d
Remove phantomjs; add chrome
2017-07-05 09:43:40 +01:00
38b1ca9b90
Use headless chrome instead of phantomjs for tests
2017-07-05 09:35:51 +01:00
b4b33ae06f
Add CSS class to truncate certain autocompletions
2017-07-04 16:49:11 +01:00
1e569e67b1
Do not truncate autocomplete provider names
2017-07-04 16:40:15 +01:00
48889b51b0
Bump to matrix-mock-request 1.0.0
...
- for consistency with js-sdk updates
2017-07-04 16:38:19 +01:00
5312c9ad4c
Merge pull request #4489 from vector-im/rav/use_external_mock_request
...
Use external mock-request
2017-07-04 16:30:11 +01:00
77a52b02cb
Take RTE out of labs
...
Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176
2017-07-04 16:26:19 +01:00
bd1196716a
Use external mock-request
...
mock-request is now factored out to matrix-mock-request; use it
2017-07-04 15:59:21 +01:00
cb17cb0535
Merge pull request #4443 from vector-im/t3chguy/patch-3
...
fix Quote not closing contextual menu
2017-07-03 19:04:31 +01:00
39ff11fe82
preinstall phantomjs to try get rid of boom error
2017-07-03 18:13:56 +01:00
5d4b98d4f6
Merge pull request #4470 from vector-im/luke/css-emotes-pre-wrap
...
Apply white-space: pre-wrap to mx_MEmoteBody
2017-07-03 09:57:56 +01:00
6fcf504a4b
Apply white-space: pre-wrap to mx_MEmoteBody
...
as we do with MTextBody.
So that people can do multi-line emotes...
2017-06-30 17:41:55 +01:00
042e7acca5
Fix long words causing MessageComposer to widen
...
Use `word-break: break-word` to split long words.
Fixes https://github.com/vector-im/riot-web/issues/4414
2017-06-30 16:03:56 +01:00
17bd323376
Make Groups page look more like design
2017-06-30 14:00:17 +01:00
796b51113f
CSS for Create Group dialog
2017-06-29 16:59:26 +01:00
515f8de2c5
Merge pull request #4456 from vector-im/luke/css-rte-improvements
...
Add some style improvements to autocompletions
2017-06-28 17:38:53 +01:00
2ea69624af
Add some style improvements to autocompletions
...
- Fix https://github.com/vector-im/riot-web/issues/2230 by adding text-overflow: ellipsis to pill spans
- Add padding to pills
- Make sure to only apply horizontal margin of pill children at one level of the DOM tree
2017-06-28 16:36:32 +01:00
176f7f1515
Merge pull request #4447 from vector-im/rxl881/apps
...
Styling for apps / widgets
2017-06-28 16:06:57 +01:00
Richard van der Hoff