ff709ed8b1
Fix import
2017-05-04 14:53:13 +01:00
cbb32968f1
Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2
2017-05-04 14:04:33 +01:00
095da68aac
Add buttons to room sub list headers
2017-05-04 13:58:17 +01:00
c5d37ab2fb
add to manifest for #334
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-03 22:56:39 +01:00
9997cc9891
import Modal
...
class seems to be referring to Modal but does not import it
2017-05-02 22:27:30 +01:00
d5009962cd
Fix scope of callback
...
This may have led to the room list not refreshing on error of deleting alias
2017-05-02 22:19:32 +01:00
6367344181
tidy and fix flow notation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:32:34 +01:00
61c338a233
remove leading v in /version file so its semver
...
and also then consistent with electron versioning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:32:27 +01:00
9f3c1deae6
Merge pull request #3775 from t3chguy/patch-1
...
Pin filesize ver to fix break upstream
2017-04-30 13:11:33 +01:00
4a8ad53bd9
Pin filesize ver to fix break upstream
...
https://travis-ci.org/vector-im/riot-web/builds/227340622
avoidwork/filesize.js#87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
2017-04-30 13:11:01 +01:00
7676fd960e
Merge branch 'develop' into forward_message
2017-04-30 12:35:52 +01:00
67efb8bde2
Add date tooltip to timestamps
2017-04-29 00:00:37 +01:00
96c867b34b
Make left panel more friendly to new users
...
https://github.com/vector-im/riot-web/issues/3609
2017-04-28 11:23:13 +01:00
4eb0ca63a9
Revert commits acciderntally put on develop
2017-04-28 11:22:05 +01:00
73fb2c859e
Remove now-redundant grey CSS
2017-04-28 11:20:55 +01:00
431b8aaefa
Make left panel more friendly to new users
...
https://github.com/vector-im/riot-web/issues/3609
2017-04-28 11:10:41 +01:00
b637ab33cc
Merge pull request #3751 from vector-im/luke/room-directory-improve
...
Improve Room Directory Look & Feel
2017-04-27 18:28:25 +01:00
afb4b79d81
Improve Room Directory Look & Feel
...
By adding an icon next to the title.
Requires https://github.com/matrix-org/matrix-react-sdk/pull/848
2017-04-27 18:04:41 +01:00
5defd0bb74
Merge branch 'develop' of github.com:vector-im/vector-web into develop
2017-04-27 16:46:21 +01:00
e6f694307d
add word-break to RoomDirectory
2017-04-27 16:46:14 +01:00
beefcfcb8c
Merge pull request #3742 from vector-im/luke/fix-emotes-rrs
...
Fix emote RRs alignment
2017-04-26 18:25:27 +01:00
44d0e7dcba
Fix emote RRs alignment
2017-04-26 18:00:51 +01:00
71685b5eab
Merge pull request #3741 from vector-im/dbkr/remove_unused_droptarget_placeholder
...
Remove unused `placeholder` prop on RoomDropTarget
2017-04-26 16:46:47 +01:00
7b3719bc3c
Remove unused `placeholder` prop on RoomDropTarget
2017-04-26 16:27:25 +01:00
c070e86c1f
Merge pull request #3732 from vector-im/luke/css-improve-country-dd
...
Modify CSS for matrix-org/matrix-react-sdk#833
2017-04-26 10:28:07 +01:00
78cabed0bf
Modify CSS for matrix-org/matrix-react-sdk#833
2017-04-25 16:24:00 +01:00
bf88620581
Merge pull request #3727 from vector-im/dbkr/warn_when_single_instance_quit
...
Warn when exiting due to single-instance
2017-04-25 11:18:19 +01:00
777087504a
Merge branch 'release-v0.9.9'
2017-04-25 11:12:14 +01:00
aa482bae28
v0.9.9
2017-04-25 11:08:08 +01:00
6fd64d19f0
Prepare changelog for v0.9.9
2017-04-25 11:08:07 +01:00
2d311ddbf4
Released js-sdk & react-sdk
2017-04-25 11:04:03 +01:00
e24ef2bb5c
Warn when exiting due to single-instance
...
This lost me a fair bit of time trying to figure out why Riot was
starting and then immediately quitting.
2017-04-25 10:18:17 +01:00
4dd6ee681d
fix /config.json in .gitignore
2017-04-25 00:14:24 +01:00
ef057e4693
Merge pull request #3709 from t3chguy/electron_notification_causes_weirdness_onclick
...
Electron forgets it was maximized when you click on a notification
2017-04-25 00:10:20 +01:00
f53b238c24
Merge pull request #3719 from turt2live/travis/h1-h2-to-h3
...
CSS to make h1 and h2 the same size as h1.
2017-04-25 00:08:07 +01:00
7957eeba10
Merge pull request #3721 from vector-im/luke/css-fix-long-room-names
...
Prevent long room names/topics from pushing UI of the screen
2017-04-25 00:07:41 +01:00
95931918dc
Merge pull request #3717 from vector-im/luke/css-disable-dd-highlight
...
Disable dropdown highlight on focus
2017-04-25 00:07:13 +01:00
0a1ebc2487
Don't show for anything that doesn't have a msgtype and body
...
otherwise the server will just reject it anyway
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:43:02 +01:00
9124c1475a
Change redact -> remove to improve clarity
...
Addresses #2814
Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 12:48:32 -06:00
2eb715002f
Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message
...
Conflicts:
.gitignore
2017-04-24 18:38:52 +01:00
92b52a61e7
don't show forward option for things we cannot decrypt
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 18:33:25 +01:00
5326faa0b8
v0.9.9-rc.2
2017-04-24 18:26:20 +01:00
7f2fa09d4c
Prepare changelog for v0.9.9-rc.2
2017-04-24 18:26:19 +01:00
b6435502fc
New version of react-sdk
2017-04-24 18:25:13 +01:00
1701ea43a4
Remove spurious changelog entries
2017-04-24 18:22:23 +01:00
69f5833c9f
Prevent long room names/topics from pushing UI of the screen
...
This was causing the "save" button in RoomSettings to be obscured when room names were set to long strings without spaces
Fixes https://github.com/vector-im/riot-web/issues/1729
2017-04-24 16:05:49 +01:00
61bba6c31f
CSS to make h1 and h2 the same size as h1.
...
Addresses #1772
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 08:44:53 -06:00
c067800a4f
Disable dropdown highlight on focus
2017-04-24 10:00:39 +01:00
af105b1920
moar padding for _TopUnreadMessagesBar.scss
2017-04-24 01:17:17 +01:00
a414352661
re-add img to _TopUnreadMessagesBar.scss
2017-04-24 01:13:24 +01:00
David Baker