  David BakerandGitHub
|
8f578f7378
|
Merge pull request #6273 from vector-im/luke/fix-copy-res-gen-i18n-crash
Fix crash; fs event received /w langauge file empty
|
2018-03-05 11:29:24 +00:00 |
|
|
David BakerandGitHub
|
e1e8d9777b
|
Merge pull request #6269 from vector-im/luke/feature-disable-tag-panel
Add setting to disable TagPanel
|
2018-03-01 15:05:13 +00:00 |
|
|
David BakerandGitHub
|
e67147213b
|
Merge pull request #6096 from vector-im/luke/room-list-flux
Make room tagging flux-y
|
2018-02-13 14:18:50 +00:00 |
|
|
David BakerandGitHub
|
ec0dd63470
|
Merge pull request #6130 from vector-im/luke/move-groups-button-tp
Move groups button to TagPanel
|
2018-02-13 11:00:53 +01:00 |
|
|
David BakerandGitHub
|
456aebe240
|
Merge pull request #6040 from sim6/sim6_catalan
Add Catalan
|
2018-02-01 10:47:01 +00:00 |
|
|
David BakerandGitHub
|
66e20298a7
|
Merge pull request #5777 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-02-01 10:45:56 +00:00 |
|
|
David BakerandGitHub
|
0d229f015b
|
Merge pull request #5718 from vector-im/t3chguy/devtools-118247
make FilteredList controlled, such that it can externally persist filter
|
2018-02-01 09:48:40 +00:00 |
|
|
David BakerandGitHub
|
b0a3bd6591
|
Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear
Linear Rich Quoting
|
2018-01-24 18:53:33 +01:00 |
|
|
David BakerandGitHub
|
f940dfdd79
|
Merge pull request #5984 from vector-im/t3chguy/datesep
fix&refactor DateSeparator and MessageTimestamp
|
2018-01-15 13:45:14 +00:00 |
|
|
David BakerandGitHub
|
fc844567a6
|
Merge pull request #5978 from vector-im/t3chguy/nvl/rich_quoting
Iterative fixes on Rich Quoting
|
2018-01-15 10:06:05 +00:00 |
|
|
David BakerandGitHub
|
d3811e3287
|
Merge pull request #5653 from vector-im/t3chguy/analytics_info
move piwik whitelists to conf and add piwik config.json info to readme
|
2018-01-12 09:32:15 +00:00 |
|
|
David BakerandGitHub
|
56300f9578
|
Merge pull request #5804 from vector-im/t3chguy/nvl/rich_quoting
Implement Rich Quoting/Replies
|
2018-01-11 10:34:43 +00:00 |
|
|
David BakerandGitHub
|
1405859d2c
|
Merge pull request #5944 from vector-im/revert-3046-patch-1
Revert "Add a after timestamp"
|
2018-01-08 15:18:03 +00:00 |
|
|
David BakerandGitHub
|
24e16e5c18
|
Revert "Add a after timestamp"
|
2018-01-08 15:17:05 +00:00 |
|
|
David BakerandGitHub
|
a21bbd15c5
|
Merge pull request #3046 from rubo77/patch-1
Add a after timestamp
|
2018-01-08 15:00:45 +00:00 |
|
|
David BakerandGitHub
|
b6c002b587
|
Fix merge
|
2018-01-08 14:35:39 +00:00 |
|
|
David BakerandGitHub
|
9c3e4a1202
|
Merge branch 'develop' into patch-1
|
2018-01-08 14:31:21 +00:00 |
|
|
David BakerandGitHub
|
a346cf393d
|
Merge pull request #5630 from turt2live/travis/granular-theme
Make sure the SettingsStore is ready to load the theme before loading it
|
2017-11-27 18:11:07 +00:00 |
|
|
David BakerandGitHub
|
a1512af9f9
|
Merge pull request #5520 from vector-im/luke/right-panel-no-group
Do not init a group store when no groupId specified
|
2017-11-06 14:10:27 +00:00 |
|
|
David BakerandGitHub
|
69a82f7859
|
Merge pull request #5497 from vector-im/luke/groups-room-info
Add toggle to alter visibility of room-group association
|
2017-11-02 15:37:52 +00:00 |
|
|
David BakerandGitHub
|
2e8f960ee3
|
Merge pull request #5493 from vector-im/luke/groups-room-info
Implement simple GroupRoomInfo
|
2017-11-02 11:07:00 +00:00 |
|
|
David BakerandGitHub
|
841503f907
|
Merge pull request #5478 from vector-im/luke/css-header-name-clickable-for-members
Prevent group name looking clickable for non-members
|
2017-10-31 13:52:19 +00:00 |
|
|
David BakerandGitHub
|
f258b3253f
|
Merge pull request #5417 from vector-im/luke/groups-settings-privileged-only
CSS for preventing editing of UI requiring user privilege if user unprivileged
|
2017-10-24 15:51:07 +01:00 |
|
|
David BakerandGitHub
|
ff5fbd4863
|
Merge pull request #5407 from vector-im/luke/fix-invite-to-community
Only show "Invite to this community" when viewing group members
|
2017-10-24 11:03:44 +01:00 |
|
|
David BakerandGitHub
|
b72d35e0df
|
Merge pull request #5371 from vector-im/dbkr/fix_custom_server_text
Custom server text was i18ned by key
|
2017-10-20 14:03:48 +01:00 |
|
|
David BakerandGitHub
|
1f9b5b25cb
|
Merge pull request #5369 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-10-20 11:31:51 +01:00 |
|
|
David BakerandGitHub
|
b2e9b36978
|
Merge pull request #5346 from vector-im/dbkr/dialog_pad_right
Add padding-right to Dialogs
|
2017-10-19 16:19:40 +01:00 |
|
|
David BakerandGitHub
|
fc87fd2bb4
|
Merge pull request #5342 from vector-im/dbkr/add_rooms_button_no_swallow_clicks
Make the 'add rooms' button clickable
|
2017-10-19 15:07:52 +01:00 |
|
|
David BakerandGitHub
|
6910b83c20
|
Merge pull request #5334 from vector-im/dbkr/use_t_normally
Use _t as _t
|
2017-10-19 10:08:51 +01:00 |
|
|
David BakerandGitHub
|
e85f205e8f
|
Merge pull request #5302 from vector-im/luke/fix-overflow-entity-tile
Handle long names in EntityTiles by overflowing correctly
|
2017-10-16 16:42:44 +01:00 |
|
|
David BakerandGitHub
|
d1476e0cc7
|
Merge pull request #5275 from vector-im/dbkr/hide_join_group
Hide the join group button
|
2017-10-13 16:27:50 +01:00 |
|
|
David BakerandGitHub
|
832465655b
|
Merge pull request #5203 from vector-im/t3chguy/riot.im-logos
switch to new logos, and use import rather than VAR
|
2017-10-12 17:49:29 +01:00 |
|
|
David BakerandGitHub
|
392fea1207
|
Merge pull request #5266 from turt2live/travis/doc_integs
Clarify what an integrations server is
|
2017-10-12 17:48:30 +01:00 |
|
|
David BakerandGitHub
|
0c093b5ca2
|
Merge pull request #5269 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-10-12 17:47:39 +01:00 |
|
|
David BakerandGitHub
|
83f7af5d7e
|
Merge pull request #5197 from vector-im/dbkr/say_which_homeserver
CSS for greying out login form
|
2017-10-11 14:12:20 +01:00 |
|
 David BakerandRichard van der Hoff
|
e39730d52e
|
Say which translation file failed (#5196)
So we can see which i18n file is invalid when it fails
|
2017-10-11 09:56:38 +01:00 |
|
|
David BakerandGitHub
|
f64f293cdb
|
Merge pull request #5125 from vector-im/luke/groups-add-rooms
Implement "Add room to group" feature
|
2017-09-26 18:15:54 +01:00 |
|
|
David BakerandGitHub
|
94855c0f48
|
Merge pull request #4967 from vector-im/rob/electron-screensharing
Add Jitsi screensharing support in electron app
|
2017-09-25 17:00:00 +01:00 |
|
|
David BakerandGitHub
|
798558e5cc
|
Merge pull request #5117 from vector-im/luke/refactor-right-panel-header-buttons
Refactor right panel header buttons
|
2017-09-25 16:37:44 +01:00 |
|
|
David BakerandGitHub
|
39c7bf633d
|
Merge pull request #5051 from vector-im/dbkr/add_finnish
Include Finnish translation
|
2017-09-22 10:19:50 +01:00 |
|
|
David BakerandRichard van der Hoff
|
dbd4cf8756
|
Clean on prepublish (#5097)
Otherwise you can make broken releases on case insensitive file
systems
|
2017-09-21 18:06:41 +01:00 |
|
|
David BakerandGitHub
|
26ec25b2f7
|
Merge pull request #5090 from vector-im/dbkr/deploy_config_glob
Make --config accept globs
|
2017-09-21 10:01:05 +01:00 |
|
|
David BakerandGitHub
|
9b9073f0ed
|
Merge pull request #5093 from vector-im/luke/groups-add-featured-rooms-and-users
CSS for GroupView: Add a User
|
2017-09-21 09:55:14 +01:00 |
|
|
David BakerandGitHub
|
8fc69198b1
|
Merge pull request #5085 from vector-im/luke/fix-separate-sender-profile
Alter opacity for flair
|
2017-09-19 17:21:57 +01:00 |
|
|
David BakerandGitHub
|
283829cb0c
|
Merge pull request #5082 from vector-im/luke/fix-ugly-integ-button
Fix ugly integ button
|
2017-09-19 17:21:47 +01:00 |
|
|
David BakerandGitHub
|
ff8bc1ca68
|
Merge pull request #5053 from vector-im/dbkr/3pid_invite_update_when_joined
Fix test for new behaviour of 'joining' flag
|
2017-09-19 10:34:31 +01:00 |
|
|
David BakerandGitHub
|
f148844573
|
Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip
generic contextual menu for tooltip/responses
|
2017-09-13 14:27:28 +01:00 |
|
|
David BakerandGitHub
|
c140088f82
|
Merge pull request #5018 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-09-12 12:57:36 +01:00 |
|
|
David BakerandGitHub
|
f18f13643f
|
Merge pull request #5015 from vector-im/dbkr/active_room_observer
Avoid re-rendering RoomList on room switch
|
2017-09-11 18:52:15 +01:00 |
|
|
David BakerandGitHub
|
941f92530d
|
Merge pull request #4623 from MurzNN/patch-1
Fix menu on change keyboard language issue #4345
|
2017-09-07 16:01:04 +01:00 |
|
|
David BakerandGitHub
|
ff8527c819
|
Merge pull request #4999 from vector-im/dbkr/fix_missing_isinvite_warning
Make isInvite default to false
|
2017-09-07 14:35:35 +01:00 |
|
|
David BakerandGitHub
|
d374425a20
|
Merge pull request #4991 from vector-im/revert-4939-luke/feature-sticky-date-separators
Revert "Implement sticky date separators"
|
2017-09-06 18:06:57 +01:00 |
|
|
David BakerandGitHub
|
38575a653d
|
Revert "Implement sticky date separators"
|
2017-09-06 17:36:43 +01:00 |
|
|
David BakerandGitHub
|
b8d9276f29
|
Merge pull request #4939 from vector-im/luke/feature-sticky-date-separators
Implement sticky date separators
|
2017-09-05 14:16:21 +01:00 |
|
|
David BakerandRichard van der Hoff
|
4ff9131e61
|
Redeploy script: don't bail if bundle exists (#4977)
Just don't bother replacing that bundle. Continue redeploying the
rest as other assets (eg translation files) may have changed.
|
2017-09-05 13:54:51 +01:00 |
|
|
David BakerandGitHub
|
a94710a9a5
|
Merge pull request #4971 from vector-im/dbkr/fix_weblate_plurals
Fix plurals in translations
|
2017-09-05 11:13:58 +01:00 |
|
|
David BakerandGitHub
|
ba2f7b78e8
|
Merge pull request #4968 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-09-04 15:19:50 +01:00 |
|
|
David BakerandGitHub
|
a70e7751e9
|
Merge pull request #4943 from anoadragon453/develop
Update vector-im to riot-im on Login
|
2017-08-31 08:33:21 +01:00 |
|
|
David BakerandGitHub
|
0b29b7f9fd
|
Merge pull request #4832 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-08-22 18:17:45 +01:00 |
|
|
David BakerandGitHub
|
d610788866
|
Merge pull request #4777 from vector-im/luke/fix-quick-search-nav
move focus-via-up/down cursors to LeftPanel
|
2017-08-11 10:52:36 +01:00 |
|
|
David BakerandGitHub
|
3eeabe8d91
|
Merge pull request #4775 from vector-im/luke/fix-user-url-no-middle-panel
Remove userId property on RightPanel
|
2017-08-11 10:49:25 +01:00 |
|
|
David BakerandGitHub
|
3e96892a91
|
Merge pull request #4757 from vector-im/luke/css-feature-pills-hide-avatar-setting
Adjust CSS for optional avatars in pills
|
2017-08-08 14:01:29 +01:00 |
|
|
David BakerandGitHub
|
4b5febadb7
|
Merge pull request #4740 from vector-im/luke/upgrade-dep-draft-js-0.11.0-alpha
Update draft-js from 0.10.1 to 0.11.0-alpha
|
2017-08-03 15:55:57 +01:00 |
|
|
David BakerandGitHub
|
f5e5bb8720
|
Merge pull request #4739 from vector-im/t3chguy/mouse_forward_back-windows
electron support for mouse forward/back buttons in Windows
|
2017-08-03 15:21:33 +01:00 |
|
|
David BakerandGitHub
|
384727a553
|
Merge pull request #4693 from vector-im/luke/css-sending-event-tile
Make pills, emoji translucent when sending
|
2017-07-28 15:34:09 +01:00 |
|
|
David BakerandGitHub
|
068a2b869e
|
Merge pull request #4682 from vector-im/luke/css-fix-rte-auto-scroll
CSS required for composer autoscroll
|
2017-07-26 16:58:32 +01:00 |
|
|
David BakerandGitHub
|
ec6efd2488
|
Merge pull request #4608 from vector-im/dbkr/groupview_edit
CSS for group edit UI
|
2017-07-25 10:21:51 +01:00 |
|
|
David BakerandGitHub
|
1690f875ca
|
Merge pull request #4579 from vector-im/rav/wait_longer_for_client
Deflake the joining test
|
2017-07-14 16:43:13 +01:00 |
|
|
David BakerandGitHub
|
caa5751d50
|
Merge pull request #4577 from vector-im/rav/bump_react_versions
Bump react to 15.6 to fix build problems
|
2017-07-14 14:55:21 +01:00 |
|
|
David BakerandGitHub
|
b9b0e98ccf
|
Merge pull request #4570 from vector-im/rav/joining_test
use flushAllExpected in joining test
|
2017-07-13 13:33:50 +01:00 |
|
|
David BakerandGitHub
|
c614bc2356
|
Merge pull request #4400 from vector-im/rav/flush_logs_on_close
Attempt to flush the rageshake logs on close
|
2017-06-23 09:47:53 +01:00 |
|
|
David BakerandGitHub
|
fab50bc1f1
|
Merge pull request #4176 from vector-im/t3chguy/updating_stuff
improve update polling electron and provide a manual check for updates button
|
2017-06-22 17:36:58 +01:00 |
|
|
David BakerandGitHub
|
a1132ca7aa
|
Merge pull request #4395 from vector-im/rav/fix_braindead_firefox
Fix load failure in firefox when indexedDB is disabled
|
2017-06-22 15:30:01 +01:00 |
|
|
David BakerandGitHub
|
7d3f75ef87
|
Merge pull request #4355 from vector-im/t3chguy/electron/windows_icon_instability
explicit convert to nativeImage to stabilise trayIcon on Windows [Electron]
|
2017-06-21 15:04:36 +01:00 |
|
|
David BakerandGitHub
|
79ad89c673
|
Merge pull request #4373 from vector-im/luke/fix-pwd-nagbar-_t
Use _tJsx for PasswordNagBar (because it has <u>)
|
2017-06-21 14:14:15 +01:00 |
|
|
David BakerandGitHub
|
8dade0d84e
|
Merge pull request #4366 from vector-im/luke/feature-user-settings-password-warning
Give _t to PasswordNagBar, add CSS for UserSettings password warning
|
2017-06-20 14:31:12 +01:00 |
|
 David BakerandDavid Baker
|
6bae293bdf
|
Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-20 13:12:14 +01:00 |
|
|
David BakerandGitHub
|
556ff24c5f
|
Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-20 10:19:34 +01:00 |
|
|
David BakerandDavid Baker
|
578fa1c160
|
Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-19 11:40:17 +01:00 |
|
|
David BakerandGitHub
|
9f7cf463b9
|
Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-19 11:38:55 +01:00 |
|
|
David BakerandGitHub
|
00c2235381
|
Merge pull request #4323 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-16 12:56:41 +01:00 |
|
|
David BakerandGitHub
|
05c667b34b
|
Merge pull request #4332 from vector-im/dbkr/fix_wierd_h2
Fix h2 in markdown being weird
|
2017-06-16 11:48:31 +01:00 |
|
|
David BakerandDavid Baker
|
c3ef2f86d6
|
Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-14 10:56:22 +01:00 |
|
|
David BakerandGitHub
|
11c04abaeb
|
Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-14 10:55:42 +01:00 |
|
|
David BakerandGitHub
|
9d42a81709
|
Merge pull request #4301 from vector-im/luke/set-email-after-password-2
Ask for email address after setting password for the first time
|
2017-06-14 09:57:21 +01:00 |
|
|
David BakerandGitHub
|
7af2a6c3a6
|
Merge pull request #4299 from vector-im/luke/set-email-after-password
i18n for setting email after password flow
|
2017-06-13 18:38:21 +01:00 |
|
|
David BakerandDavid Baker
|
27b8568fc0
|
Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-13 13:07:00 +01:00 |
|
|
David BakerandGitHub
|
13231620f1
|
Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-13 10:52:06 +01:00 |
|
|
David BakerandGitHub
|
1bb7c54ab4
|
Merge pull request #4282 from vector-im/dbkr/dont_show_emptycontent_in_search
Don't show the tooltips when filtering rooms
|
2017-06-12 18:09:54 +01:00 |
|
|
David BakerandGitHub
|
1581f3f332
|
Merge pull request #4254 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-09 15:29:19 +01:00 |
|
|
David BakerandGitHub
|
f32977c0e8
|
Merge pull request #4204 from ollieh/issues/1974
Added styling for copy to clipboard button
|
2017-06-08 14:46:06 +01:00 |
|
|
David BakerandGitHub
|
e216b4da1b
|
Merge pull request #4226 from vector-im/luke/css-user-directory-invite
Update CSS for ChatInviteDialog
|
2017-06-07 18:39:38 +01:00 |
|
|
David BakerandGitHub
|
53bc78429d
|
Merge pull request #4212 from vector-im/t3chguy/package_json_fix
change electron -> electron_app which was previously missed
|
2017-06-07 14:46:54 +01:00 |
|
|
David BakerandGitHub
|
80d912bb2c
|
Merge pull request #4219 from vector-im/luke/css-fix-timestamp-align
Align message timestamp centrally about the avatar mid-point
|
2017-06-07 11:37:26 +01:00 |
|
|
David BakerandGitHub
|
9a6e0440f9
|
Merge pull request #4220 from vector-im/dbkr/right_branch_chop_origin
Chop off 'origin/'
|
2017-06-07 10:50:27 +01:00 |
|
|
David BakerandGitHub
|
ce01bcac2d
|
Merge pull request #4197 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-06 10:22:45 +01:00 |
|
|
David BakerandGitHub
|
88e843d992
|
Merge pull request #4201 from vector-im/luke/fix-tests
Fix tests for new-guest-access
|
2017-06-05 21:25:59 +01:00 |
|
|
David BakerandGitHub
|
8f5f4cb9c8
|
Merge pull request #4160 from vector-im/dbkr/missing_tr_room_dir
Add missing translation for room directory
|
2017-06-02 17:08:55 +01:00 |
|
|
David BakerandGitHub
|
19f9900b55
|
Merge pull request #4147 from vector-im/rav/fetch_deps_tweaks
Various tweaks to fetch-develop-deps
|
2017-06-01 18:48:43 +01:00 |
|
|
David BakerandGitHub
|
9e46d174a5
|
Merge pull request #4145 from vector-im/rav/pin_to_node_6.3
Don't try to build with node 6.0
|
2017-06-01 18:40:26 +01:00 |
|