 David Baker
|
c32e736754
|
Comment why we don't expect joining flag to reset
|
2017-09-19 10:23:12 +01:00 |
|
|
David Baker
|
30efd02d22
|
Fix test for new behaviour of 'joining' flag
It's no longer reset when the join request completes, so don't
assert it. (The important test is later, asserting that the room
object is non-null).
|
2017-09-15 15:57:37 +01:00 |
|
|
David Baker
|
06fe240be2
|
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
|
2017-09-13 16:35:37 +01:00 |
|
|
David Baker
|
3ac154b7da
|
Add comment to update shouldComponentUpdate
if adding new props
|
2017-09-11 18:30:43 +01:00 |
|
|
David Baker
|
47ddc6dedf
|
Comment typo
|
2017-09-11 18:29:20 +01:00 |
|
|
David Baker
|
82f2e47667
|
Avoid re-rendering RoomList on room switch
See https://github.com/matrix-org/matrix-react-sdk/pull/1375
|
2017-09-11 17:06:40 +01:00 |
|
|
David Baker
|
079f39efed
|
Add New Vector windows build signing cert
As the signing process needs it.
|
2017-09-11 17:04:10 +01:00 |
|
|
David Baker
|
76be54b2be
|
Make isInvite default to false
as things are assuming it's optional but it isn't which is causing
a ton of warnings.
|
2017-09-07 13:35:13 +01:00 |
|
|
David Baker
|
7202556f45
|
Don't delete dist dir after putting stuff in it
|
2017-09-06 14:37:57 +01:00 |
|
|
David Baker
|
8b250bda64
|
Merge branch 'master' into develop
|
2017-09-06 13:36:11 +01:00 |
|
|
David Baker
|
92d31a8890
|
v0.12.3
|
2017-09-06 13:32:33 +01:00 |
|
|
David Baker
|
1b3ffb150b
|
Prepare changelog for v0.12.3
|
2017-09-06 13:32:32 +01:00 |
|
|
David Baker
|
2ab9dc4270
|
v0.12.3
|
2017-09-06 13:31:31 +01:00 |
|
|
David Baker
|
e8dd7be8a3
|
matrix-react-sdk v0.10.3
|
2017-09-06 13:31:00 +01:00 |
|
|
David Baker
|
e6d43f9d77
|
Edit electron build script fior signed win builds
Don't copy them to pub: let the signing process do that
|
2017-09-06 13:28:21 +01:00 |
|
|
David Baker
|
c1e2ee8123
|
v0.12.3-rc.3
|
2017-09-05 13:43:40 +01:00 |
|
|
David Baker
|
308bcc4ab9
|
Prepare changelog for v0.12.3-rc.3
|
2017-09-05 13:43:39 +01:00 |
|
|
David Baker
|
0ced816505
|
v0.12.3-rc.3
|
2017-09-05 13:42:47 +01:00 |
|
|
David Baker
|
ac3c664385
|
Merge remote-tracking branch 'origin/develop' into release-v0.12.3
|
2017-09-05 13:42:07 +01:00 |
|
|
David Baker
|
17bf8cb4ab
|
v0.12.3-rc.2
|
2017-09-05 13:15:56 +01:00 |
|
|
David Baker
|
6f5054f645
|
Prepare changelog for v0.12.3-rc.2
|
2017-09-05 13:15:55 +01:00 |
|
|
David Baker
|
0c04df88cd
|
v0.12.3-rc.2
|
2017-09-05 13:14:33 +01:00 |
|
|
David Baker
|
32423654b4
|
new react-sdk rc
|
2017-09-05 13:13:58 +01:00 |
|
|
David Baker
|
b55174e5e9
|
Fix plurals in translations
See https://github.com/matrix-org/matrix-react-sdk/pull/1358
Requires https://github.com/matrix-org/matrix-react-sdk/pull/1358
|
2017-09-04 17:18:27 +01:00 |
|
|
David Baker
|
1f3f7af1e1
|
Revert accidental merge
|
2017-09-04 17:16:13 +01:00 |
|
|
David Baker
|
1e203cade7
|
Fix plurals in translations
See https://github.com/matrix-org/matrix-react-sdk/pull/1358
Requires https://github.com/matrix-org/matrix-react-sdk/pull/1358
|
2017-09-04 17:14:41 +01:00 |
|
|
David Baker
|
3f8564f641
|
v0.12.3-rc.1
|
2017-09-01 16:22:24 +01:00 |
|
|
David Baker
|
cb42ae0719
|
Prepare changelog for v0.12.3-rc.1
|
2017-09-01 16:22:23 +01:00 |
|
|
David Baker
|
8b59c8c167
|
v0.12.3-rc.1
|
2017-09-01 16:21:38 +01:00 |
|
|
David Baker
|
c1fe3dff22
|
react-sdk v0.10.3
|
2017-09-01 16:19:08 +01:00 |
|
|
David Baker
|
e5912b996d
|
copyright
|
2017-08-30 09:23:20 +01:00 |
|
|
David Baker
|
a673cbcf1e
|
s/member/groupMember/
|
2017-08-25 13:00:43 +01:00 |
|
|
David Baker
|
65f0bd04f2
|
v0.12.2
|
2017-08-24 14:53:02 +01:00 |
|
|
David Baker
|
0e87deb9ff
|
Prepare changelog for v0.12.2
|
2017-08-24 14:53:02 +01:00 |
|
|
David Baker
|
843b608939
|
v0.12.2
|
2017-08-24 14:51:11 +01:00 |
|
|
David Baker
|
f69d5d7e3f
|
Released js-sdk & react-sdk
|
2017-08-24 14:50:44 +01:00 |
|
|
David Baker
|
a65196ee8c
|
Update electron version
|
2017-08-23 21:17:07 +01:00 |
|
|
David Baker
|
9e57c9d78f
|
v0.12.1
|
2017-08-23 15:58:50 +01:00 |
|
|
David Baker
|
16bc5359e4
|
Prepare changelog for v0.12.1
|
2017-08-23 15:58:49 +01:00 |
|
|
David Baker
|
2cec34021a
|
v0.12.1
|
2017-08-23 15:58:05 +01:00 |
|
|
David Baker
|
c900b58120
|
Released js-sdk & react-sdk
|
2017-08-23 15:57:45 +01:00 |
|
|
David Baker
|
f523d93720
|
v0.12.1-rc.1
|
2017-08-22 18:57:20 +01:00 |
|
|
David Baker
|
6c7fa77684
|
Prepare changelog for v0.12.1-rc.1
|
2017-08-22 18:57:19 +01:00 |
|
|
David Baker
|
c7ddf6a80d
|
v0.12.1-rc.1
|
2017-08-22 18:56:13 +01:00 |
|
|
David Baker
|
ab2a72a193
|
Bump version temporarily
so we get the diff from v0.12.0-rc.2
|
2017-08-22 18:55:33 +01:00 |
|
|
David Baker
|
6bdad8b5f6
|
Released js-sdk & react-sdk
|
2017-08-22 18:55:09 +01:00 |
|
|
David Baker
|
bbe00b2f54
|
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
|
2017-08-22 11:08:58 +01:00 |
|
|
David Baker
|
f551cfef81
|
Retest please
|
2017-08-22 10:53:24 +01:00 |
|
|
David Baker
|
013f2ce66a
|
More CSS for group membership lifecycle
|
2017-08-21 19:34:31 +01:00 |
|
|
David Baker
|
07b6e215a1
|
CSS for group invite tiles
|
2017-08-18 11:24:52 +01:00 |
|
|
David Baker
|
ee6e36cd90
|
Allow extra tiles to be put into room sub lists
So we can put in tiles for group invites & other stuff
|
2017-08-18 11:23:55 +01:00 |
|
|
David Baker
|
1a7a670c96
|
Show the group invite dialog
What to TODO said!
|
2017-08-16 14:59:00 +01:00 |
|
|
David Baker
|
57eb2feeb6
|
Make right panel collpasing work in GroupView
|
2017-08-15 13:18:16 +01:00 |
|
|
David Baker
|
be611f53e1
|
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
|
2017-08-15 10:49:20 +01:00 |
|
|
David Baker
|
7c4b6739fc
|
Add group member right panel
|
2017-08-09 15:36:51 +01:00 |
|
|
David Baker
|
12628b67ea
|
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
|
2017-08-09 13:46:40 +01:00 |
|
|
David Baker
|
4fa85723ab
|
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
|
2017-07-25 17:16:05 +01:00 |
|
|
David Baker
|
3ff628254d
|
CSS for group userlist
|
2017-07-25 15:56:40 +01:00 |
|
|
David Baker
|
d2f02e8e99
|
Swap classes instead of using 0 height elements
|
2017-07-21 14:14:27 +01:00 |
|
|
David Baker
|
5ba3453dcc
|
cursor: pointer on avatar picker
|
2017-07-21 11:12:46 +01:00 |
|
|
David Baker
|
fc470cd20d
|
Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit
|
2017-07-18 11:14:27 +01: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 |
|
|
David Baker
|
54f44af494
|
Make editing prettier
|
2017-07-14 17:23:44 +01:00 |
|
|
David Baker
|
8c9afc2dfd
|
Make GroupView more consistent with RoomView
|
2017-07-14 15:39:46 +01:00 |
|
|
David Baker
|
e60bf48134
|
CSS for start of group edit support
|
2017-07-13 18:42:14 +01:00 |
|
|
David Baker
|
cefc3e6da9
|
Make CSS more generic
|
2017-07-10 19:32:25 +01:00 |
|
|
David Baker
|
7a1494fc46
|
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
|
2017-07-10 14:35:51 +01:00 |
|
|
David Baker
|
5f5a802b44
|
Add CSS from react-sdk PR feedback
|
2017-07-07 18:34:57 +01:00 |
|
|
David Baker
|
052f9effc1
|
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
|
2017-07-07 12:02:38 +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 |
|
|
David Baker
|
e04f34a202
|
More CSS for group view
|
2017-07-06 19:14:12 +01:00 |
|
|
David Baker
|
2ccd36d09e
|
Merge remote-tracking branch 'origin/develop' into erikj/group_server
|
2017-07-05 10:13:53 +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 |
|
|
David Baker
|
105c54a1f1
|
CSS for Groups page
|
2017-06-28 13:57:20 +01:00 |
|
|
David Baker
|
f6627937fa
|
CSS for GroupView
|
2017-06-27 11:52:46 +01:00 |
|
|
David Baker
|
8b65b96adf
|
Merge branch 'master' into develop
|
2017-06-22 12:08:14 +01:00 |
|
|
David Baker
|
cf5cf02529
|
v0.11.4
|
2017-06-22 12:04:49 +01:00 |
|
|
David Baker
|
26ea8a7494
|
Prepare changelog for v0.11.4
|
2017-06-22 12:04:49 +01:00 |
|
|
David Baker
|
27d83ba440
|
v0.11.4
|
2017-06-22 12:01:05 +01:00 |
|
|
David Baker
|
c380e7566a
|
Released js-sdk & react-sdk
|
2017-06-22 11:58:57 +01:00 |
|
|
David Baker
|
8f8b28425d
|
Fix json fail
|
2017-06-20 15:55:35 +01:00 |
|
|
David Baker
|
3926e4dd98
|
Merge branch 'master' into develop
|
2017-06-20 13:18:58 +01:00 |
|
|
David Baker
|
639b17c663
|
v0.11.3
|
2017-06-20 13:15:36 +01:00 |
|
|
David Baker
|
ea8a49f1b7
|
Prepare changelog for v0.11.3
|
2017-06-20 13:15:35 +01:00 |
|
|
David Baker
|
eda3f20b26
|
v0.11.3
|
2017-06-20 13:13:28 +01:00 |
|
|
David Baker
|
6ef32f182a
|
react-sdk 0.9.6
|
2017-06-20 13:13:03 +01:00 |
|
|
David Baker
|
5b5e6d83d9
|
Merge branch 'master' into develop
|
2017-06-19 13:24:58 +01:00 |
|
|
David Baker
|
448e33bb65
|
v0.11.2
|
2017-06-19 13:20:45 +01:00 |
|
|
David Baker
|
88950f29c5
|
Prepare changelog for v0.11.2
|
2017-06-19 13:20:44 +01:00 |
|
|
David Baker
|
3e279746d5
|
v0.11.2
|
2017-06-19 13:19:09 +01:00 |
|
|
David Baker
|
f420a18696
|
Released js-sdk & react-sdk
|
2017-06-19 13:12:40 +01:00 |
|
|
David Baker
|
c9715e02d9
|
Merge remote-tracking branch 'weblate/develop' into develop
|
2017-06-19 11:39:59 +01:00 |
|
|
David Baker
|
07103431a9
|
Merge remote-tracking branch 'weblate/develop' into develop
|
2017-06-19 11:37:55 +01:00 |
|
|
David Baker
|
8cf6712426
|
v0.11.2-rc.2
|
2017-06-16 13:32:57 +01:00 |
|
|
David Baker
|
37a219006d
|
Prepare changelog for v0.11.2-rc.2
|
2017-06-16 13:32:57 +01:00 |
|
|
David Baker
|
97611cfd27
|
v0.11.2-rc.2
|
2017-06-16 13:30:49 +01:00 |
|
|
David Baker
|
1a12528634
|
react-sdk rc.2
|
2017-06-16 13:30:27 +01:00 |
|