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

5058 Commits

Author SHA1 Message Date
Weblate 878ff9826a Merge remote-tracking branch 'origin/develop' into develop 2017-07-20 10:50:26 +00:00
Richard van der Hoff 7e00a86048 Merge pull request #4650 from vector-im/rav/bump_indexeddb_timeot 
Increase the timeout for clearing indexeddbs
 2017-07-20 11:50:23 +01:00
Weblate e133160a68 Merge remote-tracking branch 'origin/develop' into develop 2017-07-20 10:25:25 +00:00
Kegan Dougal 62579ed6b0 Add tracebacks to deploy exceptions 2017-07-20 11:25:19 +01:00
Weblate 98e3746a1e Merge remote-tracking branch 'origin/develop' into develop 2017-07-20 10:16:40 +00:00
Luke Barnard 01eef7eb41 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-07-20 11:16:26 +01:00
Luke Barnard ccf5d6fc90 Adjust pill CSS 
-Remove space after mentions without pill background colour
-Increase space between pill avatar and first letter of the pill by 1px
 2017-07-20 11:14:54 +01:00
Weblate 055224693a Merge remote-tracking branch 'origin/develop' into develop 2017-07-20 10:02:15 +00:00
Kegsay 9864ce5bb2 Support multiple config.json symlinks in redeploy.py (#4644) 
* Support multiple config.json symlinks in redeploy.py

* Review comments
 2017-07-20 11:02:10 +01:00
Richard van der Hoff 238afde00a Increase the timeout for clearing indexeddbs 
Chrome seems to take ages (like, 1500ms regularly) to clear out the indexeddbs,
and that's causing test timeouts. Bump the timeout to hack around it.

Also: clear both dbs in parallel (can't hurt, right?) and improve diagnostics
on the process.
 2017-07-20 11:01:27 +01:00
Bamstam 4b67900225 Translated using Weblate (German) 
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-07-19 20:52:22 +00:00
Weblate fb10357dd5 Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 16:26:16 +00:00
Luke Barnard f7d282fc8e Merge pull request #4597 from vector-im/luke/css-matrixto-timeline-pills 
Make some adjustments to mx_UserPill and mx_RoomPill
 2017-07-19 17:26:13 +01:00
Weblate 11ae3dd46c Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 16:16:06 +00:00
Luke Barnard 3544c2b0c8 Merge pull request #4639 from vector-im/luke/css-rte-pre 
Apply CSS to <pre> tags to distinguish them from each other
 2017-07-19 17:16:02 +01:00
Weblate edfa3c1980 Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 13:27:40 +00:00
Bhuvan Krishna 620f39c6a2 Translated using Weblate (Telugu) 
Currently translated at 1.4% (3 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
 2017-07-19 13:27:40 +00:00
Luke Barnard 0c253e2437 Merge pull request #4643 from vector-im/luke/fix-room-tile-dnd 
Use `catch` instead of `fail` to handle room tag error
 2017-07-19 14:27:37 +01:00
Luke Barnard 53ae42ed68 Use `catch` instead of `fail` to handle room tag error 
Because bluebird doesn't support fail
 2017-07-19 14:11:22 +01:00
Luke Barnard 871c9e6d3e Add bing mention pill CSS 
Useful with https://github.com/matrix-org/matrix-react-sdk/pull/1234
 2017-07-19 11:02:51 +01:00
Luke Barnard ccc30fb52e Apply CSS to <pre> tags to distinguish them from each other 2017-07-19 09:25:53 +01:00
Weblate 745b803d28 Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 16:45:25 +00:00
Matthew Hodgson bd693768cc deliberately de-theme pre tags 2017-07-18 17:45:17 +01:00
Weblate 6e1c40ea0f Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 14:50:34 +00:00
Matthew Hodgson b45108d80d ooooops, fix dark theme code blocks correctly 2017-07-18 15:50:28 +01:00
Weblate ec68c54644 Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 14:33:48 +00:00
erciccione 4e5e5dd6b3 Translated using Weblate (Italian) 
Currently translated at 96.1% (199 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2017-07-18 14:33:48 +00:00
Matthew Hodgson e7ba618bbe fix text in code blocks on dark theme 2017-07-18 15:33:41 +01:00
David Baker fc470cd20d Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-18 11:14:27 +01:00
Alexey Murz Korepov c6bc20cd2a Fix menu on change keyboard language issue #4345 
Fix activating menu when changing keyboard language / layout  via Alt-Shift, Alt-Ctrl, Alt-CapsLock, and Alt-Space
 2017-07-18 09:23:32 +03:00
David Baker cd418a5525 Retest 2017-07-17 18:16:50 +01:00
David Baker 65b9086f18 Add group header button css 2017-07-17 17:20:11 +01:00
Luke Barnard 0e71ea7a5a Make some adjustments to mx_UserPill and mx_RoomPill 
So that they can appear correctly in the body of a text message.
 2017-07-17 14:52:08 +01:00
František Šindelář faa9fa8db9 Added translation using Weblate (Czech) 2017-07-15 13:26:27 +00:00
Richard Lewis f272961fbd Styling for beta testing icon. 2017-07-14 23:30:47 +01:00
Weblate ac0d29dc06 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 17:04:10 +00:00
Luke Barnard cb4f57eb4a Merge pull request #4583 from vector-im/luke/feature-rte-pills 
CSS for decorated matrix.to links in the composer
 2017-07-14 18:04:05 +01:00
Luke Barnard a1b4b9992e Use $accent-fg-color instead of #fff 2017-07-14 17:59:53 +01:00
Luke Barnard 18a6ee5a52 white -> #fff 2017-07-14 17:52:11 +01:00
Luke Barnard de0fd588b6 Add $rte-room-pill-color: #aaa 2017-07-14 17:51:25 +01:00
David Baker 54f44af494 Make editing prettier 2017-07-14 17:23:44 +01:00
Luke Barnard 38899c6011 CSS for decorated matrix.to links in the composer 2017-07-14 17:23:16 +01:00
Weblate dd77147313 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 15:43:17 +00:00
David Baker 1690f875ca Merge pull request #4579 from vector-im/rav/wait_longer_for_client 
Deflake the joining test
 2017-07-14 16:43:13 +01:00
Richard van der Hoff 66ddf25977 Deflake the joining test 
Just give the client longer to get started (it seems to be taking a long time
to get started talking to indexeddb)
 2017-07-14 16:14:42 +01:00
Weblate c24b04d19b Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 14:43:00 +00:00
Richard van der Hoff 0c31c62a62 build fix: bump to mock-request 1.1 
This should have happened with 32ef273f: now that we are using
flushAllExpected, we nee matrix-mock-request 1.1.0
 2017-07-14 15:41:13 +01:00
David Baker 8c9afc2dfd Make GroupView more consistent with RoomView 2017-07-14 15:39:46 +01:00
Weblate bd06a1c393 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 14:05:12 +00:00
Kegsay 40a47f8c7a Allow Riot to load up different configs depending on the domain (#4575) 
Initially try to load `config.$domain.json` and only if that fails, load
`config.json`. Configs are not muxxed in any way, it either entirely uses
the domain config, or entirely uses `config.json`.
 2017-07-14 15:05:07 +01:00