David Baker
7ea0ecd125
Merge branch 'new_release_process_stable' into develop
...
This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
2017-05-17 10:43:02 +01:00
David Baker
9fc9de3af5
Revert "Merge pull request #3654 from vector-im/matthew/quick-search"
...
This reverts commit 8f20fcfa6b
, reversing
changes made to 751f715e77
.
2017-05-16 17:21:49 +01:00
David Baker
844ea390c8
Revert "clear the searchbox after quick-search"
...
This reverts commit ddd12edc06
.
2017-05-16 17:13:55 +01:00
David Baker
fdf326c9f0
Revert "Cancel quick-search on Escape, clearing it and returning focus to composer."
...
This reverts commit 52a119244b
.
2017-05-16 17:13:39 +01:00
David Baker
9399b7ddf0
Revert "fix incoming call box"
...
This reverts commit b3431bb750
.
2017-05-16 16:35:17 +01:00
David Baker
03476705b1
Revert "better solution to incomingcallbox weirdness"
...
This reverts commit be52787473
.
2017-05-16 16:35:06 +01:00
David Baker
3cead032c2
Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2"
...
This reverts commit e6133820a2
, reversing
changes made to d1db602b3a
.
2017-05-16 16:27:58 +01:00
Matthew Hodgson
fe61a7eefd
fix off-by-one pixel errors in login field heights - fixes https://github.com/vector-im/riot-web/issues/3738
2017-05-15 02:32:25 +01:00
Matthew Hodgson
582a34c937
cursor pointer for avatar upload in user settings
2017-05-15 02:24:34 +01:00
Matthew Hodgson
c3477a30a7
oops, rebuild modernizr to pull in new tests
2017-05-15 01:22:32 +01:00
Matthew Hodgson
8e2e6cee35
require indexeddb & webworkers in modernizr
2017-05-15 01:07:25 +01:00
Matthew Hodgson
25a727b8d8
use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874
2017-05-15 00:26:02 +01:00
Luke Barnard
0e0918d07c
Merge pull request #3888 from vector-im/pr/3799
...
move manifest.json outward so it is scoped properly
2017-05-11 13:20:33 +01:00
Michael Telatynski
3c5594e034
move manifest.json outward so it is scoped properly
...
this will matter more when we add a service worker
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 13:12:26 +01:00
Luke Barnard
6d94f35c33
Automatically update component-index
...
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.
-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
2017-05-11 10:37:13 +01:00
David Baker
e6133820a2
Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2
...
Make left panel better for new users (mk II)
2017-05-08 10:37:59 +01:00
David Baker
6013a3e71d
Merge pull request #3683 from t3chguy/t3chguy/electron_version_inconsistency
...
Remove leading v in /version file, for SemVer and to match Electron ver
2017-05-05 18:28:16 +01:00
David Baker
0deed1b511
Merge pull request #3790 from t3chguy/patch-2
...
Fix scope of callback
2017-05-05 18:25:29 +01:00
David Baker
c27f39714a
Dedicated classes for the buttons
2017-05-05 14:26:13 +01:00
Luke Barnard
e1cd046c1a
Prevent zalgo-like text overflowing MELS summary
2017-05-05 09:54:00 +01:00
Luke Barnard
ae76c76558
Fix #3450 - RM hidden by things
2017-05-04 21:27:33 +01:00
David Baker
1001c98a3c
Align buttons better with the text
2017-05-04 18:23:04 +01:00
David Baker
23a141c5ad
Remove slightly misleading commented code
2017-05-04 17:46:44 +01:00
David Baker
da960e776d
Remove commented code
2017-05-04 17:45:11 +01:00
David Baker
d419024da9
Merge pull request #3809 from vector-im/rav/include_mx_id_in_rageshake
...
Include MXID and device id in rageshakes
2017-05-04 17:30:51 +01:00
Richard van der Hoff
45efdbdd43
Include MXID and device id in rageshakes
...
- to make for easier triage
2017-05-04 17:21:16 +01:00
David Baker
2bf0074953
Make bottom left menu buttons use RoleButton too
2017-05-04 15:38:53 +01:00
David Baker
ff709ed8b1
Fix import
2017-05-04 14:53:13 +01:00
David Baker
cbb32968f1
Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2
2017-05-04 14:04:33 +01:00
David Baker
095da68aac
Add buttons to room sub list headers
2017-05-04 13:58:17 +01:00
Michael Telatynski
9997cc9891
import Modal
...
class seems to be referring to Modal but does not import it
2017-05-02 22:27:30 +01:00
Michael Telatynski
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
Michael Telatynski
6367344181
tidy and fix flow notation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:32:34 +01:00
Matthew Hodgson
67efb8bde2
Add date tooltip to timestamps
2017-04-29 00:00:37 +01:00
David Baker
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
David Baker
4eb0ca63a9
Revert commits acciderntally put on develop
2017-04-28 11:22:05 +01:00
David Baker
73fb2c859e
Remove now-redundant grey CSS
2017-04-28 11:20:55 +01:00
David Baker
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
Luke Barnard
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
Luke Barnard
5defd0bb74
Merge branch 'develop' of github.com:vector-im/vector-web into develop
2017-04-27 16:46:21 +01:00
Luke Barnard
e6f694307d
add word-break to RoomDirectory
2017-04-27 16:46:14 +01:00
Luke Barnard
44d0e7dcba
Fix emote RRs alignment
2017-04-26 18:00:51 +01:00
David Baker
7b3719bc3c
Remove unused placeholder
prop on RoomDropTarget
2017-04-26 16:27:25 +01:00
David Baker
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
Luke Barnard
78cabed0bf
Modify CSS for matrix-org/matrix-react-sdk#833
2017-04-25 16:24:00 +01:00
Matthew Hodgson
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
Matthew Hodgson
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
Matthew Hodgson
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
Matthew Hodgson
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
Luke Barnard
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