J. Ryan Stinnett
d8de607edc
Update RoomTile on status change
2019-01-15 10:54:29 -06:00
J. Ryan Stinnett
77cee8e67e
Update MemberTile on status change
2019-01-15 10:54:29 -06:00
J. Ryan Stinnett
443198c180
Fix lints in MemberTile.js
2019-01-15 10:54:29 -06:00
J. Ryan Stinnett
c76b273fae
Update RoomTiles on custom status change
2019-01-15 10:54:29 -06:00
Bruno Windels
77a62b9174
style search bar
2019-01-15 16:20:04 +01:00
Bruno Windels
1bbf1502ec
Merge branch 'experimental' into bwindels/smarterresizer
2019-01-15 10:23:50 +01:00
Bruno Windels
7e395f0fb6
cleanup - part II
...
reshuffle file structure to make more sense
2019-01-14 20:33:33 +01:00
Bruno Windels
9ecb23ce71
cleanup
...
- move some methods to ResizeItem subclass
- allow distributor to instanciate sizer and resizeitem it needs
through static factory methods, instead of passing in another ctor
a distributor can only function with the right item and sizer anyways.
- use consistent import/export style
- remove obsolete code
2019-01-14 20:24:54 +01:00
David Baker
e0bc0494fa
Merge pull request #2433 from matrix-org/travis/rver/7992
...
Recalculate the visible rooms when rooms are upgraded
2019-01-11 10:37:32 +00:00
David Baker
93cf281ff9
Merge pull request #2432 from matrix-org/travis/rver/7998
...
Navigate to the upgraded room's create event where possible
2019-01-11 10:35:30 +00:00
Travis Ralston
33eef6f5ac
Merge pull request #2428 from matrix-org/travis/rver/7991
...
Set which servers to try and join upgraded rooms through
2019-01-10 16:28:11 -07:00
Travis Ralston
7d4b6add2c
Recalculate the visible rooms when rooms are upgraded
...
We also do this when they are created just in case we missed the tombstone event.
Fixes https://github.com/vector-im/riot-web/issues/7992
2019-01-10 15:43:22 -07:00
Travis Ralston
b09219fe33
Navigate to the upgraded room's create event where possible
...
Fixes https://github.com/vector-im/riot-web/issues/7998
2019-01-10 15:29:12 -07:00
Travis Ralston
e24d3cd671
Render a tile for tombstone events
...
Fixes https://github.com/vector-im/riot-web/issues/7997
This isn't super elegant, but it also provides some amount of utility for people. As users might leave the old room, it might be useful to see when exactly a room was upgraded. We should fix the underlying cause for infinite back pagination though.
2019-01-10 15:15:45 -07:00
Travis Ralston
cec9c908fc
Set which servers to try and join upgraded rooms through
...
Fixes https://github.com/vector-im/riot-web/issues/7991
2019-01-10 14:33:46 -07:00
David Baker
fc346b2766
Merge pull request #2423 from matrix-org/dbkr/lint_messagecomposerinput
...
Fix lint errors in MessageComposerInput
2019-01-10 18:33:52 +00:00
Bruno Windels
92b9a8cc1f
persist cleared size sublists
2019-01-10 18:40:26 +01:00
Erik Johnston
cbf9ff6aee
Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters
2019-01-10 16:56:47 +00:00
Erik Johnston
fa6b33d629
Only update component state when feature is enabled
2019-01-10 16:54:08 +00:00
David Baker
9903c61a21
Fix lint errors in MessageComposerInput
...
and remove from ignored files
Missed a load of the async arrows functions when changing them because
they were in the ignored files, so trying to chip away at this.
A lot of these were unused imports / variables. Probably the only
interesting one was a 'this' in a non-member function which I've moved
to be a member function.
2019-01-10 09:41:26 +00:00
David Baker
3555b02f34
Merge remote-tracking branch 'origin/experimental' into dbkr/fix_recovery_reminder_cancel
2019-01-10 09:39:57 +00:00
David Baker
b9719abbc2
Oops, missed some asyncs
2019-01-09 19:36:34 +00:00
David Baker
f269b5fbbc
Fix spaceless async in ignored files too
2019-01-09 19:14:30 +00:00
David Baker
7381879e3a
Fix a few things with cancelling recovery reminder
...
* Put a cancel button on the first page of the create key backup
dialog
* Move settings logic into the room reminder: I know this is moving
logic *into* a view but RoomView is quite heavyweight as it is.
* Give the recovery reminder an explicit 'onDontAskAgainSet' rather
than onFinished which was getting called with false when the last
screen of the dialog was closed with the cancel 'x' rather than
the 'close' button.
https://github.com/vector-im/riot-web/issues/8066
2019-01-09 16:27:41 +00:00
Bruno Windels
254427461d
fix PR feedback
2019-01-09 12:48:13 +01:00
Erik Johnston
07c2010cce
Use state rather than forceUpdate
2019-01-08 11:14:31 +00:00
Bruno Windels
56726ba8e5
fix lint
2019-01-08 12:10:42 +01:00
Bruno Windels
7227049c2a
add right panel toggle button to room header when in grid
2019-01-08 12:05:39 +01:00
Erik Johnston
4c204e88be
Add feature flag for counters
2019-01-07 13:52:13 +00:00
Erik Johnston
712241d710
Add simple state counters to room heading
2019-01-07 13:52:13 +00:00
Bruno Windels
290dc9d8fb
Merge branch 'experimental' into bwindels/roomgridview-experimental
2019-01-07 14:17:57 +01:00
Travis Ralston
5a2113e1a9
Fix a comparison bug in ordering the MemberList
2019-01-03 21:56:19 -07:00
Travis Ralston
77dfba8a22
Add unit tests for MemberList
...
Particularly the ordering of the tiles.
2019-01-03 21:55:52 -07:00
Travis Ralston
cc8fa7911b
Merge remote-tracking branch 'origin/experimental' into travis/fix-memberlist-order
2019-01-03 20:01:28 -07:00
J. Ryan Stinnett
920911c0a1
Room list fixes for custom status
2019-01-03 18:49:15 -06:00
Travis Ralston
1481dcf9d7
Don't re-sort the room list if the user is hovering over it
...
Fixes vector-im/riot-web#5624
2019-01-03 16:27:59 -07:00
Travis Ralston
8017f0a4a1
Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real
2019-01-03 16:00:23 -07:00
David Baker
f928be6f59
Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
...
This reverts commit ad47144355
.
2019-01-03 15:37:03 -07:00
Travis Ralston
d111fe27bb
Revert "Merge pull request #2396 from matrix-org/travis/room-list-hover"
...
This reverts commit 5098b28672
.
2019-01-03 15:36:56 -07:00
Travis Ralston
223a49d81f
Don't re-sort the room list if the user is hovering over it
...
Fixes vector-im/riot-web#5624
2019-01-03 13:57:20 -07:00
Travis Ralston
95844ebf9d
Comment out debugging statements
...
They are useful to have around, but not to have enabled all the time.
2019-01-03 12:15:27 -07:00
Travis Ralston
63a7b86eac
Flatten and simplify the memberlist sorting algorithm
...
The previous algorithm had a bug where it was getting stuck on the power level comparison, leaving the memberlist incorrectly ordered. The new algorithm uses less branching to try and walk through the different cases instead. Additionally, the steps used to determine the order have changed slightly to better represent an active member list.
This commit also includes changes to try and re-sort the member list more often during presence changes. Events are not always emitted, however. This may be a js-sdk bug but appears to happen prior to these changes as well.
Fixes https://github.com/vector-im/riot-web/issues/6953
2019-01-03 12:15:19 -07:00
David Baker
982e037822
Fix merge
2019-01-03 18:05:38 +00:00
David Baker
7d161de35b
Partial merge of develop to experimental
...
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00:00
J. Ryan Stinnett
402f58225f
Show in-room reminder when key backup creating device unverified
...
If the current device hasn't verified the device that created the account's
current key backup version, then the current device is won't use the key backup.
This change adjusts an existing in-room reminder to do the right thing for this
case by allowing the user to verify the device that created the key backup.
Fixes vector-im/riot-web#7902 .
2019-01-02 15:36:40 -06:00
Travis Ralston
f5ff580e35
Add some logging for riot-web#7838
...
See https://github.com/vector-im/riot-web/issues/7838
2018-12-21 14:51:05 -07:00
Travis Ralston
04c9fff6ce
Add a feature flag for custom status messages
2018-12-18 15:11:08 -07:00
Bruno Windels
1d43712a8f
Merge branch 'experimental' into nadonomy/icons
2018-12-18 18:22:24 +01:00
Nad Chishtie
074c96cd3e
First pass of normalising icons.
2018-12-18 16:48:20 +00:00
Bruno Windels
5e2ee883aa
Merge pull request #2366 from matrix-org/bwindels/fixrhscollapse
...
Redesign: fix remaining right panel collapse issues.
2018-12-18 16:19:02 +00:00
Bruno Windels
4b788fcb7e
fix lint
2018-12-18 16:29:31 +01:00
Bruno Windels
2cb817ae26
remove dead code (collapse button was removed)
2018-12-18 15:33:28 +01:00
Bruno Windels
acba36c975
Merge pull request #2364 from matrix-org/bwindels/fixresizepersistenceandscrollindicator-again
...
Redesign: left panel fixes
2018-12-18 14:23:38 +00:00
Bruno Windels
2cda6d8f35
fix empty comment line
2018-12-18 15:06:56 +01:00
Bruno Windels
cdcb3c1a55
check overflow and restore sizes in more places inside RoomList:
...
check overflow on mount
restore size on query change (in case a sublist appeared)
check overflow when updating rooms
avoid duplicating for restoring size and checking overflow
2018-12-18 14:26:33 +01:00
Bruno Windels
b359a2edee
call header clicked callback after rerendering, so resizer has DOM nodes
2018-12-18 10:56:00 +01:00
Bruno Windels
0676c1b8ad
Merge pull request #2361 from matrix-org/bwindels/collapserhs
...
Redesign: allow to hide the right panel when clicking already active button & persist
2018-12-18 09:46:30 +00:00
Bruno Windels
a734fb9d35
dont set initial phase, show panel when collapsed
2018-12-17 15:55:26 +01:00
Bruno Windels
65f9bc9754
remove expand button in room header
2018-12-17 15:23:46 +01:00
Bruno Windels
242b0c21ac
make avatar 24px and tile height 32px
2018-12-17 14:03:48 +01:00
Bruno Windels
3ea0fd1a2f
fix overflow indicators not being updated when searching
2018-12-14 17:06:51 +01:00
Travis Ralston
63658e0441
Add a missing null check
2018-12-13 14:29:12 -07:00
Bruno Windels
c8243357ea
disable editor history/persistence when in grid to avoid pesky bug
2018-12-13 13:01:59 +01:00
Bruno Windels
f593bff3c3
show right panel tabs inside panel instead of room header in grid mode
2018-12-13 13:01:59 +01:00
Bruno Windels
44200a6f78
only listen and dispatch to room-local dispatcher in room view, composer
2018-12-13 13:01:59 +01:00
Bruno Windels
720bc11aa4
avoid using roomviewstore for detecting selected room
2018-12-13 13:01:59 +01:00
Bruno Windels
43efa29ef8
track active room with OpenRoomsStore
2018-12-13 12:59:18 +01:00
Bruno Windels
df8539d6bc
pass the RoomViewStore down with a prop instead of global var.
...
this will allow to have more than 1 RoomView further on
2018-12-13 12:59:18 +01:00
Travis Ralston
f2649f7807
Use the now-prefixed js-sdk status message API
...
See 08b3dfa3b5
2018-12-12 23:07:03 -07:00
Travis Ralston
99f5b9e39b
Misc cleanup of whitespace
2018-12-12 18:18:43 -07:00
Travis Ralston
a91963e5ee
Replace the avatar next to the composer with a status entry menu
...
The checkmark might change, and there appears to be some state tracking mishaps that need to be worked out.
Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-12 18:03:30 -07:00
Travis Ralston
dd382ecb05
Fix a bug with determining 1:1 rooms
...
We shouldn't consider rooms where people have left or been banned
2018-12-12 13:20:26 -07:00
Travis Ralston
cd9ea2b2d7
Fix alignment of avatars and status messages
...
also introduce the status message to the MemberInfo pane
Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-12 12:57:48 -07:00
Bruno Windels
9f5a0250bf
Merge pull request #2345 from matrix-org/bwindels/jumptofirstunread-rebased
...
Redesign: restyle jump to first unread message & rework read marker logic (rebased)
2018-12-12 10:13:51 +00:00
Travis Ralston
ce7969e3d5
Display custom status messages in the UI
...
Part of https://github.com/vector-im/riot-web/issues/1528
2018-12-11 21:40:11 -07:00
Bruno Windels
ac9902e52a
apply redesign to topunreadmessagebar
...
with placeholder for message count
2018-12-11 15:43:00 +01:00
Bruno Windels
3040f2d2e2
remove try/catch as the error is already prevented inside resize
2018-12-11 10:51:14 +01:00
Bruno Windels
f4e61b2bf1
fixup for roomsublist fix
2018-12-10 16:53:04 +01:00
J. Ryan Stinnett
a92d2902c4
Add an in-room reminder to set up key recovery
...
This adds an in-room reminder above the message timeline to set up Secure
Message Recovery so that your keys will be backed up. If you try to ignore it,
an additional dialog is shown to confirm.
Fixes vector-im/riot-web#7783 .
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-07 14:13:02 -06:00
Travis Ralston
ca1313099f
Show the IncomingCallBox if the call is for the RoomSubList
...
Fixes https://github.com/vector-im/riot-web/issues/4369
Previously the RoomSubList would filter its list of rooms to verify that the incoming call belongs to it. This causes problems when the sub list is being told some rooms don't exist (ie: the list is filtered). It is trivial for the RoomList to instead track which RoomSubList (tag) it should be handing the call off to so we do that instead now. The RoomSubList trusts that the caller has already filtered it and will render the IncomingCallBox if it has an incoming call.
2018-12-06 11:45:58 -07:00
Travis Ralston
0f348a7c78
Merge branch 'develop' into travis/invite-errors
2018-12-05 11:25:45 -07:00
Bruno Windels
13491e797d
persists & load collapsed room sub lists
2018-12-03 10:39:31 +01:00
Will Hunt
2b077b4f5d
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
2018-12-01 16:24:43 +00:00
Travis Ralston
987ad0b0db
Check if users exist before inviting them and communicate errors
...
Fixes https://github.com/vector-im/riot-web/issues/3283
Fixes https://github.com/vector-im/riot-web/issues/3968
Fixes https://github.com/vector-im/riot-web/issues/4308
Fixes https://github.com/vector-im/riot-web/issues/1597
Fixes https://github.com/vector-im/riot-web/issues/6790
This does 3 things:
* Makes the `MultiInviter` check for a user profile before attempting an invite. This is to prove the user exists.
* Use the `MultiInviter` everywhere to avoid duplicating the logic. Although a couple places only invite one user, it is still worthwhile.
* Communicate errors from the `MultiInviter` to the user in all cases. This is done through dialogs, where some existed previously but were not invoked.
Specifically to the 403 error not working: What was happening was the `MultiInviter` loop was setting the `fatal` flag, but that didn't resolve the promise it stored. This caused a promise to always be open, therefore never hitting a dialog.
2018-11-29 15:05:53 -07:00
Bruno Windels
8f4292399b
Merge pull request #2297 from matrix-org/bwindels/roomlistsizingimprovements
...
Redesign: improve room sub list sizing & persist sizes
2018-11-27 13:40:48 +00:00
Bruno Windels
887defda9c
temp solution to make room settings usable
...
make mx_fadable not do anything anymore, and make room settings
full size.
Room settings haven't been designed yet, so all of this will
have a full pass when we have a go at it.
2018-11-26 17:58:51 +01:00
Bruno Windels
0c7d51d70d
persist room sub list sizes
2018-11-26 16:46:57 +01:00
Bruno Windels
8929ff9b5e
use room resize classes
2018-11-26 14:42:01 +01:00
Bruno Windels
67e0030ccd
Merge branch 'develop' into experimental
2018-11-26 13:10:29 +01:00
David Baker
985966f8be
Update async dialog interface to use promises
...
Hopefully makes the syntax a bit nicer. Also uses ES6 async import
rather than require.ensure which is now deprecated. Also also
displays an error if the component fails to load rather than falling
over in a heap, which is nice.
2018-11-21 16:56:44 +00:00
Bruno Windels
ece549bf71
fix lint
2018-11-13 09:17:37 +01:00
Bruno Windels
ffc73c59b4
make padding and DOM more like event tile
2018-11-13 09:15:43 +01:00
Bruno Windels
8ddd2dd078
scroll down when showing typing notif and stuck at bottom
2018-11-13 09:15:16 +01:00
Bruno Windels
20b8994714
simplify DOM and style to design
2018-11-12 18:19:18 +01:00
Bruno Windels
7df47cbc87
move typing notifications to WhoIsTypingTile, shown in ScrollPanel
2018-11-12 16:09:51 +01:00
Bruno Windels
883126a528
Merge branch 'experimental' into bwindels/memberqueryfield
2018-11-07 13:29:28 +01:00
Bruno Windels
9e95a1402c
Merge pull request #2269 from matrix-org/bwindels/roomlistpolish
...
Redesign: room list visual polish
2018-11-07 11:44:47 +00:00
Bruno Windels
4e773c2665
Make right panel a dark-panel instead of every descendant.
...
Also move bg color central.
2018-11-06 14:47:58 +01:00
Bruno Windels
92e43ea181
move filter member field to bottom of memberlist
...
reorganize styles as well
2018-11-06 14:47:11 +01:00
Bruno Windels
ef26189add
add dedicated menu button to room tile with new design
2018-11-05 17:42:25 +01:00
Bruno Windels
c0becc7664
fix roomtile badge
...
only put it in the dom if it has
anything to show as it has a border now in collapsed mode
2018-11-05 14:24:12 +01:00
Bruno Windels
3cd32e2f44
update search icon(s)
2018-11-05 13:07:49 +01:00
Bruno Windels
064662380f
support search icon in mx_textinput, use in memberlist
2018-11-05 09:35:27 +01:00
Bruno Windels
46389457e3
add input styling for light and dark panels (leftpanel vs room header)
2018-11-05 09:32:37 +01:00
Bruno Windels
e29227db4e
bring back "filter rooms" field
...
this does the filtering in RoomList instead of RoomSubList, so
we can hide sections that don't have any results.
The filtering does happen with every rerender of RoomList,
but only does something while searching, so the performance
implications are probably negligible.
2018-11-02 15:27:17 +01:00
Bruno Windels
b4dd739771
Merge branch 'experimental' into bwindels/rightpanelbelowheader
2018-10-31 14:57:16 +01:00
Bruno Windels
ba83166661
Merge branch 'develop' into experimental
2018-10-31 14:54:22 +01:00
Bruno Windels
e80a1c5051
move room/group panel header buttons into room/group header
2018-10-30 17:15:19 +01:00
Aaron Raimist
49ce4ef117
eslint --fix src/
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:50:38 -05:00
David Baker
156ffd1334
Fix autoreplacement of ascii emoji
...
More slate API updates in code paths I didn't test
Fixes https://github.com/vector-im/riot-web/issues/7509
2018-10-26 17:01:44 +01:00
Bruno Windels
2c039483c6
Merge branch 'develop' into experimental
2018-10-26 15:33:39 +02:00
David Baker
85bb8392c4
Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement
...
Fix emoji replacement in composer
2018-10-25 16:23:13 +01:00
David Baker
5e81e5b8b8
Fix variable scope
2018-10-25 15:07:19 +01:00
David Baker
401f6333ed
Do...while loops are a thing
2018-10-25 14:54:32 +01:00
David Baker
adee0fdcef
Merge pull request #2248 from matrix-org/bwindels/memberpanel
...
Redesign: basic makeover of member info panel
2018-10-25 14:52:54 +01:00
Bruno Windels
3096bf42ef
fix css in chrome
2018-10-25 15:20:51 +02:00
Bruno Windels
030deba90c
avoid downloading avatars at full resolution
2018-10-25 15:20:33 +02:00
Will Hunt
8118a9c71a
Wall devtools button behind a setting
2018-10-24 18:15:35 +01:00
Will Hunt
44a41b589d
Comma on strings and styling button
2018-10-24 17:50:27 +01:00
Will Hunt
79d467c551
Add button to open devtools in roomsettings
2018-10-24 17:36:58 +01:00
Bruno Windels
e4dfb90b85
basic makeover of member panel with big avatar
2018-10-24 18:23:34 +02:00
Bruno Windels
873ff7fc29
make EntityTile responsive
2018-10-24 18:22:57 +02:00
David Baker
78d8d22457
Fix emoji replacement in composer
...
* Re-scan the slate document tree on each emoji replacement since
doing a replacement will invalidate all the offsets we have.
* Reset the emoji regex each time we use it.
Fixes https://github.com/vector-im/riot-web/issues/7550
2018-10-24 16:46:06 +01:00
Bruno Windels
7244d30c9c
guard against empty roomId/non-existant room
2018-10-24 16:44:18 +02:00
Bruno Windels
8c62dddb32
one big commit, sorry
...
changing looks of input & buttons
changing background color of right panels
moving invite button around
change margins and paddings in memberlist
2018-10-24 13:50:58 +02:00
Bruno Windels
5425eda438
Merge pull request #2241 from matrix-org/bwindels/redesignicons1
...
Redesign: update (most) icons
2018-10-23 19:40:59 +00:00
Bruno Windels
eb453f4539
make icons in composer smaller, better spacing
2018-10-23 18:11:15 +02:00
Bruno Windels
18fedb23ec
fix basic room header layout
...
make room name take as much space as it needs (but not more than width)
put all items apart from right buttons in one flex container
so name and topic can grow as required
more small tweaks
2018-10-23 16:57:56 +02:00
Travis Ralston
78f527cf95
Remove unused classes
2018-10-22 15:14:21 -06:00
Bruno Windels
ebd3d34106
make sure no resize handle is put after last sublist
2018-10-19 18:35:27 +02:00
Bruno Windels
c6924c47fa
no need for self
2018-10-19 14:43:54 +02:00
Bruno Windels
d48f19bc19
remove alwaysShowHeader, as now onAddRoom prop determines this
2018-10-19 14:43:02 +02:00
Bruno Windels
5091aa3b43
get rid of emptyContent, also cleanup sublist render method
...
also assume empty list in css by default and add nonEmpty class
2018-10-19 14:41:51 +02:00
Bruno Windels
0386a1e048
get rid of obsolete showEmpty prop
2018-10-19 14:32:49 +02:00
Bruno Windels
ae8723451a
remove onShowMoreRooms, as room tiles & scrollbar rendered at same level
2018-10-19 14:27:36 +02:00
Bruno Windels
f14c2cf2b2
don't hide empty sections that have a (+) button
2018-10-19 12:46:59 +02:00
Bruno Windels
6af61ebb09
add plus button for rooms and people
2018-10-19 12:07:36 +02:00
Bruno Windels
d264687796
don't scroll sub list header
2018-10-18 16:25:22 +02:00
Bruno Windels
01082c8595
hook up resizer events
2018-10-18 15:51:58 +02:00
Bruno Windels
39ab3d86bd
create sizer that sets item size with flex-basis
...
works with the flex-grow we set initially for the sub lists
2018-10-18 15:51:22 +02:00
Bruno Windels
c1e602d56f
scrollbars and resize handles around room sub lists
2018-10-18 15:19:45 +02:00
Bruno Windels
99982b1164
put repeated props in process function
2018-10-18 15:15:56 +02:00
Bruno Windels
c12368ea48
process RoomSubList props through function before creating them
...
this way, we'll be able to add adjacent resize handles and scroll wrappers
2018-10-18 15:09:58 +02:00
Bruno Windels
81d0ce2bcf
remove sticky header code
2018-10-18 15:08:32 +02:00
Travis Ralston
af8dfda9a7
Add a bit of text to explain the purpose of the RoomPreviewSpinner
...
Fixes https://github.com/vector-im/riot-web/issues/5869
2018-10-17 13:53:12 -06:00
Bruno Windels
6906d5a5f9
remove DND for room tiles
2018-10-17 16:02:35 +02:00
Bruno Windels
cc29dd08da
don't always show badge (leftover)
2018-10-16 14:54:14 +02:00
Bruno Windels
01471abdc5
Merge branch 'bwindels/redesign' into bwindels/resizehandles
2018-10-16 11:57:59 +02:00
Bruno Windels
6878ce3c6a
Merge branch 'develop' into bwindels/redesign
2018-10-16 11:57:44 +02:00
Will Hunt
5a72a5863f
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
2018-10-15 19:20:55 +01:00