  Matthew HodgsonandGitHub
|
20dc7068af
|
Merge pull request #8550 from abeluck/develop
Make scripts/make-icons.sh work on linux
|
2019-02-15 12:28:58 +00:00 |
|
|
Matthew HodgsonandGitHub
|
a50db80510
|
Merge pull request #8502 from jjerphan/develop
README.md : Syntax Coloring
|
2019-02-10 09:29:48 +00:00 |
|
|
Matthew HodgsonandGitHub
|
ad41229bb6
|
Merge pull request #7948 from vector-im/toml/experimental-feedback
Update issue templates
|
2018-12-24 09:54:59 +00:00 |
|
|
Matthew HodgsonandGitHub
|
a38661c0f0
|
Merge pull request #7387 from vector-im/matthew/webpack4
Webpack4
|
2018-09-27 16:21:43 +01:00 |
|
|
Matthew HodgsonandGitHub
|
841c8fd41d
|
Merge pull request #7355 from vector-im/travis/build-process
Reduce the number of terminals required to build riot-web to 1
|
2018-09-25 23:54:34 +01:00 |
|
|
Matthew HodgsonandGitHub
|
1b0cafd956
|
Merge pull request #7274 from gusttt/patch-1
Small typo in release notes v0.16.3
|
2018-09-04 09:50:39 +01:00 |
|
|
Matthew HodgsonandGitHub
|
6b2c8539a3
|
Merge pull request #6573 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-04-24 09:43:03 +01:00 |
|
|
Matthew HodgsonandGitHub
|
845bb3fa09
|
Merge pull request #6588 from vector-im/dbkr/fix_media_2
Copy media from react-sdk
|
2018-04-23 18:12:34 +01:00 |
|
|
Matthew HodgsonandGitHub
|
ddc20e2a60
|
Merge pull request #6500 from vector-im/matthew/fix_layering
move everything not explicitly riot (or status) branded into matrix-react-sdk
|
2018-04-18 16:30:57 +01:00 |
|
|
Matthew HodgsonandGitHub
|
976c818406
|
Merge pull request #5881 from turt2live/travis/remove-presence
Remove presence management
|
2018-04-12 11:46:26 +01:00 |
|
|
Matthew HodgsonandGitHub
|
74b45322b2
|
Merge pull request #6289 from vector-im/luke/fix-tag-panel-clear-cosmetics
Correctly position mx_TagPanel_clearButton
|
2018-03-12 18:05:59 +00:00 |
|
|
Matthew HodgsonandGitHub
|
5bfa052a48
|
Merge pull request #6290 from vector-im/luke/fix-tag-tile-avatar-border-gap
Fix gap between avatar and border
|
2018-03-12 18:05:22 +00:00 |
|
|
Matthew HodgsonandGitHub
|
5ade4b2bcf
|
Merge pull request #6281 from vector-im/luke/fix-room-tile-cosmetics
Add transparent CSS class for RoomTile
|
2018-03-06 09:56:22 +00:00 |
|
|
Matthew HodgsonandGitHub
|
2d7f60efee
|
Merge pull request #6246 from rbozhkova/patch-2
Add Bulgarian to the list of languages
|
2018-02-26 12:20:27 +00:00 |
|
|
Matthew HodgsonandGitHub
|
09619339fd
|
Merge pull request #6245 from spantaleev/wider-media-dropdown
Make media dropdown wider
|
2018-02-26 12:19:32 +00:00 |
|
|
Matthew HodgsonandGitHub
|
aeb423ce1b
|
Merge pull request #6244 from spantaleev/gracefully-degrading-dropdowns
Make dropdowns with long options degrade more gracefully
|
2018-02-26 12:18:53 +00:00 |
|
|
Matthew HodgsonandGitHub
|
3bf04095b1
|
Merge pull request #6223 from vector-im/luke/fix-tag-tile-context-tinting
Fix un-tinted "View Community" icon in TagTile context menu
|
2018-02-23 16:42:55 +00:00 |
|
|
Matthew HodgsonandGitHub
|
93c2462089
|
Merge pull request #6160 from vector-im/luke/fix-room-list-drop-target-bg
Fix RoomDropTarget and emptySubListTip to have containers
|
2018-02-23 16:36:14 +00:00 |
|
|
Matthew HodgsonandGitHub
|
15b7af9a84
|
Merge pull request #6154 from rugk/patch-2
Fix syntax error of wrong use of self-closing HTML tag
|
2018-02-23 16:28:28 +00:00 |
|
|
Matthew HodgsonandGitHub
|
c315a59717
|
remove doubly-closed tag
|
2018-02-23 16:27:34 +00:00 |
|
|
Matthew HodgsonandGitHub
|
d3fe023ec4
|
Merge pull request #6227 from vector-im/luke/fix-room-list-tinting-css
Use translucent black for RoomSubList bg to fix tinting
|
2018-02-22 14:50:43 +00:00 |
|
|
Matthew HodgsonandGitHub
|
d806707de0
|
Merge pull request #6216 from vector-im/luke/feature-tag-panel-global-filter-cross
CSS for changing "R" to "X" for clearing group filter
|
2018-02-21 18:05:53 +00:00 |
|
|
Matthew HodgsonandGitHub
|
c3e34e5f05
|
Merge pull request #6194 from turt2live/patch-1
Separate the middle panel from the room list
|
2018-02-16 22:22:32 +00:00 |
|
|
Matthew HodgsonandGitHub
|
7aea7f9400
|
Merge pull request #6134 from vector-im/luke/fix-tag-panel-collapse
Fix TagPanel from collapsing to < 60px when LP collapsed
|
2018-02-13 22:02:58 +00:00 |
|
|
Matthew HodgsonandGitHub
|
9abda76d9e
|
Merge branch 'develop' into luke/fix-tag-panel-collapse
|
2018-02-13 22:02:49 +00:00 |
|
|
Matthew HodgsonandGitHub
|
0b5fe1232f
|
Merge pull request #6137 from rbozhkova/patch-1
Fix typo
|
2018-02-13 17:32:50 +00:00 |
|
|
Matthew HodgsonandGitHub
|
d484a1cd85
|
Merge pull request #6106 from vector-im/luke/fix-long-group-name
Fix long group name pushing settings cog into void
|
2018-02-07 18:03:43 +00:00 |
|
|
Matthew HodgsonandGitHub
|
5c3e2dca17
|
Merge pull request #6103 from vector-im/luke/fix-composer-horizontal-scroll
Fix horizontal scrollbar under certain circumstances
|
2018-02-07 12:14:10 +00:00 |
|
|
Matthew HodgsonandGitHub
|
c8e87cb5a2
|
Merge pull request #5950 from vector-im/t3chguy-patch-1
Change author
|
2018-01-08 21:33:22 +00:00 |
|
|
Matthew HodgsonandGitHub
|
bddab533a3
|
Merge pull request #5938 from osoitz/master
Corrected language name
|
2018-01-07 20:34:19 +00:00 |
|
|
Matthew HodgsonandGitHub
|
bfb60265cb
|
Merge pull request #5610 from vector-im/t3chguy/devtools-1
add dark theme styling to devtools input box
|
2017-12-18 21:44:43 +00:00 |
|
|
Matthew HodgsonandGitHub
|
fbbca2e466
|
Merge pull request #5824 from pafcu/patch-1
Instructions on security issues
|
2017-12-18 12:35:00 +00:00 |
|
|
Matthew HodgsonandGitHub
|
89efbd0a71
|
Merge pull request #5786 from vector-im/rxl881/titleBar
Widget title bar max / min visual cues.
|
2017-12-08 19:18:52 +01:00 |
|
|
Matthew HodgsonandGitHub
|
9835e2e0b4
|
Merge pull request #5759 from vector-im/luke/renumerate-broken-ordered-sublists
Implement renumeration of ordered tags upon collision
|
2017-12-04 18:09:23 +00:00 |
|
|
Matthew HodgsonandGitHub
|
2a402985aa
|
Merge pull request #5685 from aidalgol/root-lang-attrib-fix
Set html lang attribute from language setting
|
2017-11-30 10:12:40 +00:00 |
|
|
Matthew HodgsonandGitHub
|
c28d9e5cde
|
Merge pull request #5661 from pafcu/sidebar-a11y
Add some aria-labels to RightPanel
|
2017-11-21 18:47:37 +00:00 |
|
|
Matthew HodgsonandGitHub
|
21d7c4d92a
|
Merge pull request #5640 from turt2live/travis/granular-language
Exclude the default language on page load
|
2017-11-18 12:25:50 +00:00 |
|
|
Matthew HodgsonandGitHub
|
58f2e51af5
|
Merge pull request #5615 from turt2live/travis/granular_bugs
Use SettingsStore to get the default theme
|
2017-11-16 13:08:48 +00:00 |
|
|
Matthew HodgsonandGitHub
|
ffada4f6fe
|
Merge pull request #5468 from turt2live/travis/granular
Granular settings
|
2017-11-15 10:56:08 +00:00 |
|
|
Matthew HodgsonandGitHub
|
3e72d8d969
|
Merge pull request #5286 from turt2live/travis/presence
CSS/components for custom presence controls
|
2017-11-14 23:53:26 +00:00 |
|
|
Matthew HodgsonandGitHub
|
534504b618
|
Merge pull request #5573 from vector-im/rxl881/visualCue
Widget styling tweaks
|
2017-11-14 18:05:27 +00:00 |
|
|
Matthew HodgsonandGitHub
|
bea95fde3a
|
Merge pull request #5567 from vector-im/rxl881/mixedContentWarnings
Center mixed content warnings in panel.
|
2017-11-14 18:03:08 +00:00 |
|
|
Matthew HodgsonandGitHub
|
557fd8f734
|
Merge pull request #5578 from vector-im/matthew/status
Status.im theme
|
2017-11-13 19:22:38 +00:00 |
|
|
Matthew HodgsonandGitHub
|
c7dba61d92
|
Merge pull request #5511 from turt2live/travis/more-pinned-css
CSS for pinned indicators
|
2017-11-07 18:52:39 +00:00 |
|
|
Matthew HodgsonandGitHub
|
9ff1fe8a72
|
Merge pull request #5535 from vector-im/luke/groups-new-group-settings
CSS for improving group creation UX, namely setting long description
|
2017-11-07 10:43:59 +00:00 |
|
|
Matthew HodgsonandGitHub
|
31c5122fa6
|
Merge pull request #5293 from turt2live/travis/pinned-led-css
CSS for new pinned events indicator
|
2017-11-03 23:10:31 +00:00 |
|
|
Matthew HodgsonandGitHub
|
c0b343c89f
|
Merge pull request #5471 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
|
2017-11-03 23:10:00 +00:00 |
|
|
Matthew HodgsonandGitHub
|
c90834114b
|
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms
Use margin to separate "perms" in the room directory
|
2017-11-03 22:44:41 +00:00 |
|
|
Matthew HodgsonandGitHub
|
3df1808fd0
|
Merge pull request #5453 from VickyKoblinski/es6-notifications
Leverages ES6 in Notifications
|
2017-10-27 09:15:22 +01:00 |
|
|
Matthew HodgsonandGitHub
|
f143315618
|
Merge pull request #5142 from turt2live/travis/pinned_messages
Message/event pinning
|
2017-10-15 01:02:49 +01:00 |
|
|
Matthew HodgsonandGitHub
|
6f819606c1
|
Merge pull request #4054 from ollieh/issues/3771
Sorting of networks within a protocol based on name
|
2017-10-14 23:21:51 +01:00 |
|
|
Matthew HodgsonandGitHub
|
2667ed2561
|
Merge pull request #4988 from vector-im/t3chguy/hide_notification_body
allow hiding of notification body for privacy reasons
|
2017-10-14 23:07:31 +01:00 |
|
|
Matthew HodgsonandGitHub
|
5bb2992f93
|
Merge pull request #5281 from turt2live/travis/display-name-lightbox
Don't use MXIDs on the lightbox if possible
|
2017-10-14 22:46:13 +01:00 |
|
|
Matthew HodgsonandGitHub
|
b70bd1987a
|
Merge pull request #5267 from turt2live/travis/alone_warning_css
CSS for lonely room message
|
2017-10-14 22:44:58 +01:00 |
|
|
Matthew HodgsonandGitHub
|
5c1e2a8a82
|
Merge pull request #5037 from turt2live/travis/code_block_border
Bring back dark theme code block border
|
2017-10-14 22:32:45 +01:00 |
|
|
Matthew HodgsonandGitHub
|
6f81142bde
|
Merge pull request #5282 from turt2live/travis/unset_avatar
CSS for remove avatar buttons
|
2017-10-14 22:11:02 +01:00 |
|
|
Matthew HodgsonandGitHub
|
fbe1c82dfa
|
Merge pull request #5074 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
|
2017-09-19 22:14:52 +01:00 |
|
|
Matthew HodgsonandGitHub
|
26c8d23c21
|
Merge pull request #5080 from vector-im/t3chguy/fix-powersave-typo
fix really dumb blunder/typo preventing system from going to sleep.
|
2017-09-19 08:13:26 +01:00 |
|
|
Matthew HodgsonandGitHub
|
828e9d5eb4
|
Merge pull request #4735 from vector-im/t3chguy/devtools
T3chguy/devtools
|
2017-09-17 23:15:28 +01:00 |
|
|
Matthew HodgsonandGitHub
|
662431043e
|
Merge pull request #5042 from turt2live/travis/ignored_users
CSS for unignore button in UserSettings
|
2017-09-17 22:38:31 +01:00 |
|
|
Matthew HodgsonandGitHub
|
7f746ce2c6
|
Merge pull request #5044 from turt2live/travis/home_page_identity_room
Fix alias on home page for identity room
|
2017-09-15 16:37:38 +01:00 |
|
|
Matthew HodgsonandGitHub
|
9f3c33758c
|
Merge pull request #4464 from vsund/patch-1
Fix signing key url in readme
|
2017-08-06 20:11:32 +01:00 |
|
|
Matthew HodgsonandGitHub
|
bf38fead18
|
Merge pull request #4749 from jfmherokiller/gitignore-update
update gitignore to allow .idea directory to exist in subdirs
|
2017-08-06 20:11:00 +01:00 |
|
|
Matthew HodgsonandGitHub
|
a98c734eb5
|
Merge pull request #4665 from uhoreg/compact
tweak compact theme
|
2017-08-06 20:10:27 +01:00 |
|
|
Matthew HodgsonandGitHub
|
23a0e9a96c
|
Merge pull request #4401 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-22 21:42:58 +01:00 |
|
|
Matthew HodgsonandGitHub
|
7fda26f268
|
Merge pull request #4360 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-19 15:43:34 +01:00 |
|
 Matthew HodgsonandDavid Baker
|
0da4834360
|
Merge pull request #4346 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-19 11:32:28 +01:00 |
|
|
Matthew HodgsonandDavid Baker
|
adbe5c71b7
|
Merge pull request #4337 from vector-im/t3chguy/fix_forwarding
change dispatcher forward_event signature
|
2017-06-19 11:31:17 +01:00 |
|
|
Matthew HodgsonandDavid Baker
|
a9dfd4da2d
|
Merge pull request #4259 from ollieh/code-block-border
Add border on hover for code blocks
|
2017-06-19 11:30:57 +01:00 |
|
|
Matthew HodgsonandGitHub
|
6bee3f22da
|
Merge pull request #4346 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-18 23:49:20 +01:00 |
|
|
Matthew HodgsonandGitHub
|
cf9cd503e5
|
Merge pull request #4337 from vector-im/t3chguy/fix_forwarding
change dispatcher forward_event signature
|
2017-06-18 23:45:12 +01:00 |
|
|
Matthew HodgsonandGitHub
|
4afec6fb7f
|
Merge pull request #4259 from ollieh/code-block-border
Add border on hover for code blocks
|
2017-06-18 21:37:17 +01:00 |
|
|
Matthew HodgsonandGitHub
|
c34bc2d946
|
Merge pull request #4266 from MTRNord/patch-2
Add missing VOIP Dropdown width
|
2017-06-11 00:40:32 +01:00 |
|
|
Matthew HodgsonandGitHub
|
23a1efa6ed
|
Merge pull request #4261 from MTRNord/patch-1
Update import and directory path in the Translations dev guide
|
2017-06-11 00:40:14 +01:00 |
|
|
Matthew HodgsonandGitHub
|
f874134a31
|
Merge pull request #4260 from krombel/patch-1
Use Thai string for Thai in Language-Chooser
|
2017-06-11 00:39:41 +01:00 |
|
|
Matthew HodgsonandGitHub
|
7b4be59e0e
|
Merge pull request #4169 from vector-im/t3chguy/random_fix_1
add explicit import to utf8 polyfill and rip out unused imports
|
2017-06-08 15:58:58 +01:00 |
|
|
Matthew HodgsonandGitHub
|
d8f7262eac
|
Merge branch 'develop' into t3chguy/random_fix_1
|
2017-06-08 15:58:49 +01:00 |
|
|
Matthew HodgsonandGitHub
|
080cbea080
|
Merge pull request #4211 from uhoreg/compact
adjust alignment of message menu button in compact layout
|
2017-06-06 18:07:32 +01:00 |
|
|
Matthew HodgsonandGitHub
|
dbbb916be8
|
Merge pull request #4207 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-06 16:45:09 +01:00 |
|
|
Matthew HodgsonandGitHub
|
58433423f4
|
Merge pull request #4193 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-05 14:31:18 +01:00 |
|
|
Matthew HodgsonandGitHub
|
7b9ae0157a
|
Merge pull request #4183 from vector-im/t3chguy/electron_logo_windows_weirdness
to make the windows volume mixer not explode as it can't resize icons.
|
2017-06-04 22:58:17 +01:00 |
|
|
Matthew HodgsonandGitHub
|
1bc30021c8
|
Merge pull request #4186 from vector-im/t3chguy/electron_devtools
provide react devtools in electron dev runs
|
2017-06-04 22:57:26 +01:00 |
|
|
Matthew HodgsonandGitHub
|
8cd4bf5342
|
Merge pull request #4184 from MTRNord/patch-1
Fix DeprecationWarning
|
2017-06-04 22:55:12 +01:00 |
|
|
Matthew HodgsonandGitHub
|
0d7aefb7c1
|
Merge pull request #4178 from vector-im/t3chguy/patch-4
room link should be a matrix.to one
|
2017-06-03 22:33:57 +01:00 |
|
|
Matthew HodgsonandGitHub
|
43f8b22737
|
Merge pull request #4152 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-02 12:27:03 +01:00 |
|
|
Matthew HodgsonandGitHub
|
e6745e5eea
|
Merge pull request #4150 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-02 01:08:49 +01:00 |
|
|
Matthew HodgsonandGitHub
|
949fd71c17
|
Merge pull request #4019 from vector-im/t3chguy/webrtc_settings
styling for webrtc settings
|
2017-06-02 00:48:06 +01:00 |
|
|
Matthew HodgsonandGitHub
|
ac2a5a882d
|
Merge pull request #4140 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-01 21:34:02 +01:00 |
|
|
Matthew HodgsonandGitHub
|
f099f56f01
|
Merge pull request #4132 from uhoreg/compact
add styles for compact layout
|
2017-06-01 21:32:46 +01:00 |
|
|
Matthew HodgsonandGitHub
|
1fbec01edb
|
Merge pull request #4143 from turt2live/travis/date-sep-12h
Support 12hr time on DateSeparator
|
2017-06-01 18:29:53 +01:00 |
|
|
Matthew HodgsonandGitHub
|
29e58be7f4
|
Merge pull request #4129 from vector-im/matthew/i18n-welcome
i18n welcome
|
2017-06-01 18:08:17 +01:00 |
|
|
Matthew HodgsonandGitHub
|
a8f0ed60cf
|
Merge branch 'new-guest-access' into matthew/i18n-welcome
|
2017-06-01 11:16:50 +01:00 |
|
|
Matthew HodgsonandGitHub
|
21cf79bc54
|
Merge pull request #4030 from vector-im/t3chguy/electron_profiles
basic electron profile support
|
2017-06-01 01:33:01 +01:00 |
|
|
Matthew HodgsonandGitHub
|
6f9d94f72f
|
Merge pull request #4122 from vector-im/kegan/translation-macaque
Finish translations for vector-im/riot-web
|
2017-06-01 00:36:54 +01:00 |
|
|
Matthew HodgsonandGitHub
|
aa5587ba95
|
Merge branch 'develop' into kegan/translation-macaque
|
2017-06-01 00:36:37 +01:00 |
|
|
Matthew HodgsonandGitHub
|
bac5ae89ce
|
Merge pull request #4119 from vector-im/kegan/translation-chimp
Translate src/vector
|
2017-06-01 00:34:45 +01:00 |
|
|
Matthew HodgsonandGitHub
|
d988eb58c1
|
Merge pull request #4128 from vector-im/t3chguy/electron_flash
electron flashFrame was way too annoying
|
2017-06-01 00:14:58 +01:00 |
|
|
Matthew HodgsonandGitHub
|
448c10736a
|
Merge pull request #4012 from vector-im/t3chguy/electron_settings
auto-launch support [Electron]
|
2017-05-30 23:59:15 +01:00 |
|
|
Matthew HodgsonandGitHub
|
64a67583e0
|
Merge pull request #4038 from vector-im/tom-welcome-page
Tom welcome page
|
2017-05-30 21:36:21 +01:00 |
|
|
Matthew HodgsonandGitHub
|
4493994dd5
|
Merge pull request #4092 from turt2live/travis/12hrtime-hotfix
Show 12hr time on hover too
|
2017-05-30 20:15:00 +01:00 |
|