gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,171 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

4171 Commits

Author SHA1 Message Date
Luke Barnard 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
Luke Barnard d98d493420 Merge pull request #4468 from vector-im/dbkr/my_groups 
CSS for Groups page
 2017-07-10 09:37:32 +01:00
David Baker 5f5a802b44 Add CSS from react-sdk PR feedback 2017-07-07 18:34:57 +01:00
David Baker b4602fd2b1 Comment 2017-07-07 10:49:19 +01:00
David Baker 43bdc04637 Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:47:41 +01:00
Luke Barnard e36899c30f Merge pull request #4442 from vector-im/erikj/group_server 
CSS for GroupView
 2017-07-06 22:04:30 +01:00
Luke Barnard fc5ce7fb61 Merge pull request #4525 from vector-im/t3chguy/markdown_allow_u 
remove unused class
 2017-07-06 14:08:37 +01:00
Michael Telatynski a8d5f7d5eb
remove unused class 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-06 13:53:17 +01:00
Luke Barnard 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
Luke Barnard 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
Luke Barnard 07e8d4ef69 Add visual bell animation for RTE 2017-07-05 18:13:23 +01:00
Luke Barnard 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
Luke Barnard 65a160f24a Merge branch 'develop' into luke/fix-rte-autocomplete-truncate 2017-07-05 13:45:06 +01:00
Richard van der Hoff 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
Richard van der Hoff a14bc9a9b1 README: minor fixes 2017-07-05 11:47:38 +01:00
Richard van der Hoff ba0073ca71 README: Add notes on running tests 2017-07-05 11:45:33 +01:00
Richard van der Hoff 60703bdcfc Log errors thrown by getThirdpartyProtocols 
- so that it appears in rageshakes and test logs.
 2017-07-05 10:54:10 +01:00
David Baker 2ccd36d09e Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-07-05 10:13:53 +01:00
Richard van der Hoff cfe9e762ad Use trusty dist 2017-07-05 10:01:13 +01:00
Richard van der Hoff 9969d6095d Remove phantomjs; add chrome 2017-07-05 09:43:40 +01:00
Richard van der Hoff 38b1ca9b90 Use headless chrome instead of phantomjs for tests 2017-07-05 09:35:51 +01:00
Luke Barnard b4b33ae06f Add CSS class to truncate certain autocompletions 2017-07-04 16:49:11 +01:00
Luke Barnard 1e569e67b1 Do not truncate autocomplete provider names 2017-07-04 16:40:15 +01:00
Richard van der Hoff 48889b51b0 Bump to matrix-mock-request 1.0.0 
- for consistency with js-sdk updates
 2017-07-04 16:38:19 +01:00
Richard van der Hoff 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
Luke Barnard 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
Richard van der Hoff 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
Luke Barnard 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
Michael Telatynski 39ff11fe82 preinstall phantomjs to try get rid of boom error 2017-07-03 18:13:56 +01:00
Luke Barnard 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
Luke Barnard 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
Luke Barnard 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
David Baker 17bd323376 Make Groups page look more like design 2017-06-30 14:00:17 +01:00
David Baker 796b51113f CSS for Create Group dialog 2017-06-29 16:59:26 +01:00
Luke Barnard 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
Luke Barnard 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
Richard Lewis 176f7f1515 Merge pull request #4447 from vector-im/rxl881/apps 
Styling for apps / widgets
 2017-06-28 16:06:57 +01:00
David Baker 105c54a1f1 CSS for Groups page 2017-06-28 13:57:20 +01:00
Michael Telatynski f36c1ca207 fix Quote not closing contextual menu 
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
 2017-06-27 14:51:18 +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 c614bc2356 Merge pull request #4400 from vector-im/rav/flush_logs_on_close 
Attempt to flush the rageshake logs on close
 2017-06-23 09:47:53 +01:00
Matthew Hodgson f7f5255378 fix vars 2017-06-22 21:53:06 +01:00
Matthew Hodgson 23a0e9a96c Merge pull request #4401 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-22 21:42:58 +01:00
Elia 8b89a1770d Translated using Weblate (Turkish) 
Currently translated at 96.6% (199 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2017-06-22 20:21:51 +00:00
Pitchaya Boonsarngsuk bfe43d841f Translated using Weblate (Thai) 
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/th/
 2017-06-22 20:21:51 +00:00
Carlos A. Carnero Delgado 423a047687 Translated using Weblate (Spanish) 
Currently translated at 99.5% (205 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2017-06-22 20:21:51 +00:00
Richard van der Hoff cc56ef3abd Attempt to flush the rageshake logs on close 
... so that we get to see what happened in the last 30s.
 2017-06-22 18:25:19 +01:00
Pitchaya Boonsarngsuk fbcdc5adad Translated using Weblate (Thai) 
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/th/
 2017-06-22 17:08:08 +00:00
Weblate b75180d959 Merge remote-tracking branch 'origin/develop' into develop 2017-06-22 16:37:03 +00:00