Richard van der Hoff
a06bd84213
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-12 18:05:08 +01:00
David Baker
53316a76f4
Sandbox app iframes
2017-07-12 10:22:14 +01:00
David Baker
eb4e4a66ff
Merge pull request #1206 from matrix-org/rav/login_unmounted_guard
...
Give Login an unmounted guard
2017-07-11 18:37:50 +01:00
Luke Barnard
3bab720a7b
Merge pull request #1208 from matrix-org/rav/timelinepanel_test_flakiness
...
Fix a flaky test in the timelinepanel code
2017-07-11 18:10:55 +01:00
Richard van der Hoff
1139dd2be5
Fix a flaky test in the timelinepanel code
...
Sometimes it was possible for there to be a scroll event before the initial
pagination completed, which then upset the rest of the test. Just give it a few
ms to sort itself out instead.
2017-07-11 17:34:46 +01:00
Richard van der Hoff
67372d4fed
Give Login an unmounted guard
2017-07-11 17:04:19 +01:00
Luke Barnard
af3b6484cd
Merge pull request #1196 from matrix-org/dbkr/groups_better_groupview
...
Add more features to Group View
2017-07-11 17:03:47 +01:00
David Baker
ff3c21ef10
Lint, including putting key in right place
2017-07-11 15:16:58 +01:00
David Baker
8690ed2181
Make the category functions React components
2017-07-11 14:28:44 +01:00
David Baker
222ca054c5
Use PropTypes.shape to define our required inputs
2017-07-11 13:41:00 +01:00
Kegsay
cf158530f5
Implement new widget API ( #1201 )
...
* Implement new widget API
This allows clients to see who provisioned which widgets.
* Update to make state_key the wid
* Update to latest API
* Only show widgets which have required fields
* Don't constantly show apps dialog
* Fix example to include data key
2017-07-11 12:15:27 +01:00
David Baker
29990296d2
Lint
2017-07-11 11:02:23 +01:00
David Baker
925d5bd480
Add featured users to Group View
2017-07-10 19:32:02 +01:00
David Baker
0e67a9158c
hide settings button until it's wired up
2017-07-10 15:32:57 +01:00
David Baker
048912a241
Remove commented ordering code
...
No lomger needed now roosm come down in order
2017-07-10 15:17:58 +01:00
David Baker
49ca29e422
Lint
2017-07-10 14:07:16 +01:00
David Baker
696c72be2b
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-10 14:03:30 +01:00
David Baker
1e713557bb
PR feedback
2017-07-07 18:34:40 +01:00
David Baker
681fd512d7
Lint
2017-07-07 13:46:05 +01:00
David Baker
c1833f9833
Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview
2017-07-07 13:44:35 +01:00
David Baker
c21f90338d
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-07 12:02:15 +01:00
David Baker
bc8c2d442b
WithMatrixClient -> withMatrixClient
...
because we're using it as a function rather than a React component
2017-07-07 11:34:20 +01:00
David Baker
183f45bc1f
Fix lint errors
2017-07-07 10:41:59 +01:00
David Baker
45986306cc
Merge remote-tracking branch 'origin/develop' into dbkr/my_groups
2017-07-07 10:32:37 +01:00
David Baker
1deb406294
Fix race
2017-07-07 10:12:06 +01:00
Luke Barnard
32a01b54b8
Merge branch 'develop' into erikj/group_server
2017-07-07 10:08:49 +01:00
David Baker
fa37d03db6
Improve the Group View page
...
Show the rooms in the group in thir various categories, etc
2017-07-06 19:13:14 +01:00
David Baker
8468a118b5
Merge remote-tracking branch 'origin/develop' into dbkr/my_groups
2017-06-30 16:15:41 +01:00
David Baker
e5c1aeb14c
Make the Groups page look more like the design
2017-06-30 13:59:49 +01:00
David Baker
3892362386
Make my groups page a bit saner
2017-06-29 18:30:16 +01:00
David Baker
84e13d5437
Add GroupAvatar to handle fallback images etc.
...
And a few misc tidyups
2017-06-29 17:51:38 +01:00
David Baker
d6ecec1987
Behave better on rooms with no avatar / name
...
Also add translation strings
2017-06-29 17:17:43 +01:00
David Baker
f99c540b3d
Groups page / Create Group dialog
2017-06-29 17:03:05 +01:00
David Baker
a2ff289ed8
Add 'groups' page
2017-06-28 13:56:18 +01:00
Richard Lewis
ff1636aaf5
Simplify boolean assignment.
2017-06-28 12:21:05 +01:00
Richard Lewis
06dafdc099
Remove unused state variable.
2017-06-28 12:20:07 +01:00
Richard Lewis
bf2a4afce5
Change to allow setting of DEBUG at run-time.
2017-06-28 12:02:07 +01:00
Richard Lewis
8dfd047f03
Don't show widgets when editing room settings and lint fixes.
2017-06-27 17:39:29 +01:00
David Baker
aa7a113324
More PR feedback
2017-06-27 13:41:43 +01:00
David Baker
6c9716637e
Fix linting errors
2017-06-27 13:13:00 +01:00
Richard Lewis
ad9a3d9ddc
Remove unused case statement.
2017-06-27 11:55:32 +01:00
Richard Lewis
89f051e693
Fix automerge error.
2017-06-27 11:52:49 +01:00
David Baker
2aeaaf26ca
remove inline css
2017-06-27 11:52:23 +01:00
Richard Lewis
ddc0da396d
Merge in changes from develop
2017-06-27 11:44:36 +01:00
Richard Lewis
e343e99355
Cleaned up unused files and removed commented code
2017-06-27 11:28:38 +01:00
David Baker
971f7ad045
Fix avatars
2017-06-27 10:32:21 +01:00
David Baker
867b47f4a2
PR feedback: remove phases
2017-06-27 10:28:46 +01:00
David Baker
f0aaca0a31
Fix some PR feedback
2017-06-27 10:05:05 +01:00
David Baker
c033d5defd
Missing React import
2017-06-27 09:58:29 +01:00
David Baker
09b1012388
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-26 17:49:06 +01:00