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
29990296d2
Lint
2017-07-11 11:02:23 +01:00
925d5bd480
Add featured users to Group View
2017-07-10 19:32:02 +01:00
0e67a9158c
hide settings button until it's wired up
2017-07-10 15:32:57 +01:00
048912a241
Remove commented ordering code
...
No lomger needed now roosm come down in order
2017-07-10 15:17:58 +01:00
49ca29e422
Lint
2017-07-10 14:07:16 +01:00
696c72be2b
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-10 14:03:30 +01:00
1e713557bb
PR feedback
2017-07-07 18:34:40 +01:00
681fd512d7
Lint
2017-07-07 13:46:05 +01:00
c1833f9833
Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview
2017-07-07 13:44:35 +01:00
c21f90338d
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
2017-07-07 12:02:15 +01:00
bc8c2d442b
WithMatrixClient -> withMatrixClient
...
because we're using it as a function rather than a React component
2017-07-07 11:34:20 +01:00
183f45bc1f
Fix lint errors
2017-07-07 10:41:59 +01:00
45986306cc
Merge remote-tracking branch 'origin/develop' into dbkr/my_groups
2017-07-07 10:32:37 +01:00
1deb406294
Fix race
2017-07-07 10:12:06 +01:00
32a01b54b8
Merge branch 'develop' into erikj/group_server
2017-07-07 10:08:49 +01:00
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
8468a118b5
Merge remote-tracking branch 'origin/develop' into dbkr/my_groups
2017-06-30 16:15:41 +01:00
e5c1aeb14c
Make the Groups page look more like the design
2017-06-30 13:59:49 +01:00
3892362386
Make my groups page a bit saner
2017-06-29 18:30:16 +01:00
84e13d5437
Add GroupAvatar to handle fallback images etc.
...
And a few misc tidyups
2017-06-29 17:51:38 +01:00
d6ecec1987
Behave better on rooms with no avatar / name
...
Also add translation strings
2017-06-29 17:17:43 +01:00
f99c540b3d
Groups page / Create Group dialog
2017-06-29 17:03:05 +01:00
a2ff289ed8
Add 'groups' page
2017-06-28 13:56:18 +01:00
ff1636aaf5
Simplify boolean assignment.
2017-06-28 12:21:05 +01:00
06dafdc099
Remove unused state variable.
2017-06-28 12:20:07 +01:00
bf2a4afce5
Change to allow setting of DEBUG at run-time.
2017-06-28 12:02:07 +01:00
8dfd047f03
Don't show widgets when editing room settings and lint fixes.
2017-06-27 17:39:29 +01:00
aa7a113324
More PR feedback
2017-06-27 13:41:43 +01:00
6c9716637e
Fix linting errors
2017-06-27 13:13:00 +01:00
ad9a3d9ddc
Remove unused case statement.
2017-06-27 11:55:32 +01:00
89f051e693
Fix automerge error.
2017-06-27 11:52:49 +01:00
2aeaaf26ca
remove inline css
2017-06-27 11:52:23 +01:00
ddc0da396d
Merge in changes from develop
2017-06-27 11:44:36 +01:00
e343e99355
Cleaned up unused files and removed commented code
2017-06-27 11:28:38 +01:00
971f7ad045
Fix avatars
2017-06-27 10:32:21 +01:00
867b47f4a2
PR feedback: remove phases
2017-06-27 10:28:46 +01:00
f0aaca0a31
Fix some PR feedback
2017-06-27 10:05:05 +01:00
c033d5defd
Missing React import
2017-06-27 09:58:29 +01:00
09b1012388
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-26 17:49:06 +01:00
812b3643de
Add message for HSes that don't support groups
...
Also add an unrelated missed translation
2017-06-26 17:47:17 +01:00
a26498bc6c
Make 'group not found' work
2017-06-26 17:38:10 +01:00
48c32172fd
TextualBody: only highlight code block if language was specified
...
The highlight.js autodetection is finicky and often wrong, so disable
highlighting unless the language was explicitly specified, or if the
user has explicitly enabled it in the settings.
Fixes vector-im/riot-web#508 .
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com >
2017-06-26 17:45:40 +02:00
f091d209b9
Merge branch 'develop' into luke/fix-rte-tab-complete-after-join
2017-06-26 09:39:49 +01:00
f0f4a16e97
Translate autocomplete delay
2017-06-23 18:28:02 +01:00
ddb84f034e
Update tab-complete state onRoom received after joining
...
As opposed to doing it when the component mounts.
Fixes https://github.com/vector-im/riot-web/issues/3700 (hopefully)
2017-06-23 17:52:50 +01:00
89afcfd897
Linting
2017-06-23 17:35:07 +01:00
2efa099de2
Use function from HTMLUtils for sanitizing
...
Encapsulates things a little nicer
2017-06-23 17:02:54 +01:00
87609582c6
Merge branch 'develop' into rte-fixes2
...
Conflicts:
package.json
src/autocomplete/CommandProvider.js
src/autocomplete/UserProvider.js
src/components/structures/RoomView.js
src/components/structures/UserSettings.js
src/components/views/rooms/MessageComposerInput.js
2017-06-23 15:30:06 +01:00
8f3eb89f8b
Fix potential race in setting client listeners
2017-06-23 10:48:21 +01:00
Kegsay