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

4540 Commits

Author SHA1 Message Date
Richard van der Hoff 348ec52b14 Merge pull request #4565 from vector-im/rav/bluebird 
Switch riot-web to bluebird
 2017-07-13 12:20:08 +01:00
Richard van der Hoff 76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird 2017-07-13 12:04:54 +01:00
Weblate 9072ff93b9 Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 10:58:24 +00:00
Luke Barnard a303e1e1b8 Merge pull request #4564 from vector-im/rav/await_login_component 
loading tests: wait for login component
 2017-07-13 11:58:21 +01:00
Weblate acbcde85ce Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 10:33:32 +00:00
Luke Barnard ba1166d0d0 Merge pull request #4568 from vector-im/luke/remove-old-composer 
Remove CSS for the MessageComposerInputOld
 2017-07-13 11:33:28 +01:00
Richard van der Hoff 7238c4dfac Fix overlooked `q` 2017-07-13 11:33:25 +01:00
Luke Barnard d901515059 rethemedex 2017-07-13 10:16:23 +01:00
Luke Barnard f5c4d903e6 Remove CSS for TabComplete 2017-07-13 10:11:58 +01:00
Richard Lewis e15c8e473f AppTile menu bar button styling. 2017-07-13 09:44:19 +01:00
Richard van der Hoff 69eb1a49d4 Fix a broken test 
turns out that you could call defer.resolve on q defers as an unbound function,
whereas that doesn't work with bluebird promises.
 2017-07-13 00:56:13 +01:00
Richard van der Hoff 1d2d086a58 Replace q.allSettled() 
Bluebird doesn't have an `allSettled` method, so instead catch the exceptions and
use `all`.
 2017-07-13 00:50:01 +01:00
Richard van der Hoff 4c5b5ca0ba replace `q.Promise` with `new Promise` 2017-07-13 00:50:01 +01:00
Richard van der Hoff d5b550f89a replace q method calls with bluebird ones 
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff b29b4a959b q(...) -> Promise.resolve 
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff 10decf95f6 replace imports of `q` with bluebird 
update `package.json`

```
find src test -name '*.js' |
    xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
    xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
 2017-07-13 00:48:31 +01:00
Richard van der Hoff b2403d59b7 loading tests: wait for login component 
Rather than a fixed delay, use matrix-react-test-utils to wait for the login
component to appear. Hopefully this will deflakify some tests.
 2017-07-13 00:18:49 +01:00
Richard van der Hoff 0f8a2554dc Enable colours for karma test output 
I don't really know why we disable colours here.
 2017-07-13 00:18:10 +01:00
Weblate 668199e219 Merge remote-tracking branch 'origin/develop' into develop 2017-07-12 17:29:15 +00:00
Andrey 498feeed21 Translated using Weblate (Russian) 
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/ru/
 2017-07-12 17:29:15 +00:00
erciccione 4040c1d931 Translated using Weblate (Italian) 
Currently translated at 58.9% (122 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2017-07-12 17:29:14 +00:00
Bamstam e774e807c6 Translated using Weblate (German) 
Currently translated at 99.5% (206 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-07-12 17:29:14 +00:00
Rami Taibah f80629db44 Translated using Weblate (Arabic) 
Currently translated at 14.9% (31 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/
 2017-07-12 17:29:14 +00:00
Luke Barnard 248944a300 Merge pull request #4560 from vector-im/luke/fix-ctrl-k 
Implement the focus_room_filter action
 2017-07-12 18:29:10 +01:00
Luke Barnard 188a58e5c7 RateLimitedFunc -> rate_limited_func 2017-07-12 18:18:13 +01:00
Luke Barnard 3e1a909b1d Just use the onKeyDown of the <input> 2017-07-12 17:46:27 +01:00
Luke Barnard 41cd238e02 Update to reflect previous implementation 
Which was a74bbb424c
 2017-07-12 17:10:43 +01:00
Luke Barnard 4fe4e10abb Implement the focus_room_filter action 
This is for ctrl+k room filtering and switching
 2017-07-12 13:49:57 +01:00
Andrey 659ac2e8c7 Translated using Weblate (Russian) 
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/ru/
 2017-07-12 11:02:09 +00:00
strix aluco 71396e062d Translated using Weblate (Ukrainian) 
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/uk/
 2017-07-12 02:38:52 +00:00
Szimszon 2ba1a84b0c Translated using Weblate (Hungarian) 
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/hu/
 2017-07-11 16:40:51 +00:00
Weblate b5ef34b0a0 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:36:15 +00:00
Richard van der Hoff 898725082a Remove spurious comma 
I am messing this up - fix to 0bbce1c
 2017-07-11 17:35:25 +01:00
Weblate a00781b733 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:04:20 +00:00
Luke Barnard 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
Weblate 2c65bd097b Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:01:08 +00:00
Richard van der Hoff 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
Weblate b3abf7c592 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 15:46:47 +00:00
Richard van der Hoff a201f74115 Merge pull request #4557 from vector-im/rav/homepage_again 
more HomePage tweaks
 2017-07-11 16:46:43 +01:00
Richard van der Hoff 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
Weblate c465f40179 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 13:27:41 +00:00
Richard van der Hoff 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
Richard van der Hoff d755903fdb typo 2017-07-11 14:10:18 +01:00
Richard van der Hoff 8ac26dd19f Give HomePage an unmounted guard 
Also add missing return in error-handling path
 2017-07-11 14:08:16 +01:00
Weblate 4d34809279 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 12:23:32 +00:00
Richard van der Hoff b375c71a28 fix comments on node versions 2017-07-11 13:23:15 +01:00
David Baker cefc3e6da9 Make CSS more generic 2017-07-10 19:32:25 +01:00
Travis Ralston bc88585026 Translated using Weblate (English (United States)) 
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/en_US/
 2017-07-10 15:03:57 +00:00
David Baker 7a1494fc46 Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-10 14:35:51 +01:00
Weblate ab95905472 Merge remote-tracking branch 'origin/develop' into develop 2017-07-10 12:56:07 +00:00