Commit Graph

  • 6b6de05c75 Merge pull request #52 from matrix-org/bwindels/fixsynapseinstallation3 David Baker 2019-06-24 14:40:37 +01:00
  • a72934556c look for activate in cwd Bruno Windels 2019-06-24 15:30:18 +02:00
  • c76dc87412 Merge pull request #51 from matrix-org/bwindels/fixsynapseinstallation2 David Baker 2019-06-24 14:04:22 +01:00
  • d9def18184 adjust path to register script for pip installation Bruno Windels 2019-06-24 15:00:51 +02:00
  • 26f9dd071a Merge pull request #50 from matrix-org/bwindels/fixsynapseinstallation David Baker 2019-06-24 12:06:07 +01:00
  • 894a07484c generate signing keys without generating config file and then overwr. it Bruno Windels 2019-06-24 12:51:51 +02:00
  • 7a15acf224 install synapse/develop (and deps) from pip Bruno Windels 2019-06-24 12:51:05 +02:00
  • fff67e27af Merge pull request #3129 from matrix-org/jryans/context-menu-slim J. Ryan Stinnett 2019-06-24 10:53:07 +01:00
  • 9e7a70b9d5 When joining from room directory, use auto_join Michael Telatynski 2019-06-23 22:39:04 +01:00
  • f3641eaa32 Add ability to render null-rejoins in Timeline and MELS Michael Telatynski 2019-06-23 21:41:28 +01:00
  • 5fa3f70fb4 feature flag for displaying edits as well Bruno Windels 2019-06-21 18:32:15 +02:00
  • 1c7af38d83 Merge pull request #3126 from matrix-org/bwindels/caret-refactoring Bruno Windels 2019-06-21 15:02:41 +00:00
  • c443dd7a32 clarify why use a BOM marker for the caret nodes Bruno Windels 2019-06-21 16:37:29 +02:00
  • 80d73d8430 Add optional rounded chevron for tooltip J. Ryan Stinnett 2019-06-21 13:48:20 +01:00
  • 3bd247ebaa Tweak interactive tooltip to match design J. Ryan Stinnett 2019-06-21 11:41:19 +01:00
  • 32bf4588dd Center tooltip along top or bottom of target J. Ryan Stinnett 2019-06-20 18:33:45 +01:00
  • 6dcdad028e Clone ContextualMenu to InteractiveTooltip J. Ryan Stinnett 2019-06-20 12:03:22 +01:00
  • 50315557ba Merge pull request #3130 from matrix-org/bwindels/disable-left-right-autocomplete Bruno Windels 2019-06-21 12:32:11 +00:00
  • cf0799289d Disable left/right arrow navigating completions for now Bruno Windels 2019-06-21 13:48:52 +02:00
  • 701e18d588 Merge pull request #3128 from matrix-org/bwindels/edit-nested-lists Bruno Windels 2019-06-21 10:55:37 +00:00
  • b5598df3f7 Remove redundant extra chevrons from ContextualMenu J. Ryan Stinnett 2019-06-21 11:06:27 +01:00
  • 503d702f47 take list nesting into account for indenting Bruno Windels 2019-06-21 11:40:27 +02:00
  • da766b8cba caretNode is a better className Bruno Windels 2019-06-21 11:21:38 +02:00
  • c5c987f62e use BOM marker instead of ZWS Bruno Windels 2019-06-21 11:21:13 +02:00
  • d3b552411c Merge pull request #3127 from matrix-org/t3chguy/file_upload_filesize J. Ryan Stinnett 2019-06-21 09:19:27 +01:00
  • dea412c906 Add file size to UploadConfirmDialog Michael Telatynski 2019-06-21 09:03:28 +01:00
  • 2a0660c545 Merge pull request #3123 from matrix-org/travis/sas-timeouts Travis Ralston 2019-06-20 14:29:20 -06:00
  • 0f8dd102bf Move early-cancel stuff to constructor Travis Ralston 2019-06-20 14:17:06 -06:00
  • 55eec80771 Merge pull request #3124 from matrix-org/travis/sas-ok Travis Ralston 2019-06-20 07:58:38 -06:00
  • 366a4aa308 put zero-width spaces in caret nodes so chrome doesn't ignore them Bruno Windels 2019-06-20 14:44:18 +02:00
  • 796a8a182f Merge pull request #3125 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2019-06-20 11:03:05 +01:00
  • fceb05e646 Merge pull request #10124 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2019-06-20 11:00:34 +01:00
  • a03a2d5b0f Translated using Weblate (Italian) random 2019-06-20 09:12:54 +00:00
  • a39420f72c Translated using Weblate (Esperanto) Tirifto 2019-06-19 19:54:03 +00:00
  • cbce373697 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-06-20 00:56:20 +00:00
  • 1d4089dda7 Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-06-20 06:24:27 +00:00
  • bf443149b5 Make the verification cancelled dialog say OK instead of Cancel Travis Ralston 2019-06-19 15:07:33 -06:00
  • ff3c52a736 Consider cancelled verifications when mounting IncomingSasDialog Travis Ralston 2019-06-19 14:59:59 -06:00
  • a14505fe4c Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 18:18:41 +00:00
  • b16a3c53cd Merge pull request #3122 from matrix-org/jryans/slim-contextualmenu J. Ryan Stinnett 2019-06-19 19:18:37 +01:00
  • c8ae58e06e Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 18:18:19 +00:00
  • 78b0f61efe Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button J. Ryan Stinnett 2019-06-19 19:18:15 +01:00
  • b16bc0178a insert manually, as insertHTML command moves caret inconsistently Bruno Windels 2019-06-19 17:37:52 +02:00
  • f0271b593d remove special casing for moving caret after newline and pills Bruno Windels 2019-06-19 17:37:17 +02:00
  • a229641985 use caret nodes in caret positioning code, to move caret out of pills Bruno Windels 2019-06-19 17:36:17 +02:00
  • 607fc328ed also process first part when processing empty and mergeable parts Bruno Windels 2019-06-19 10:57:29 +02:00
  • 75fc769742 insert "caret nodes" where pills don't have an adjacent text node Bruno Windels 2019-06-18 18:53:55 +02:00
  • c0e81e7808 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 15:04:21 +00:00
  • 470f6a8cbc Translated using Weblate (Finnish) Tuomas Hietala 2019-06-19 12:28:30 +00:00
  • 6f1ce750bf Merge branch 'master' into develop RiotRobot 2019-06-19 16:03:22 +01:00
  • 672cf1a46e v1.2.2 v1.2.2 RiotRobot 2019-06-19 16:00:42 +01:00
  • 5f7ee3f4ee Prepare changelog for v1.2.2 RiotRobot 2019-06-19 16:00:42 +01:00
  • 80262314f3 v1.2.2 RiotRobot 2019-06-19 15:59:10 +01:00
  • 48b6f8c954 Released js-sdk & react-sdk RiotRobot 2019-06-19 15:55:02 +01:00
  • 1af4587a69 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 14:53:44 +00:00
  • dc947ab21c Translated using Weblate (Finnish) Tuomas Hietala 2019-06-19 12:36:03 +00:00
  • e675244d40 Merge branch 'master' into develop RiotRobot 2019-06-19 15:53:16 +01:00
  • 2d6317fdd0 v1.2.2 RiotRobot 2019-06-19 15:52:18 +01:00
  • b91e5a7d7c Prepare changelog for v1.2.2 RiotRobot 2019-06-19 15:52:17 +01:00
  • 21344609a4 released js-sdk RiotRobot 2019-06-19 15:47:31 +01:00
  • dc9282c539 Remove unused ContextualMenu features J. Ryan Stinnett 2019-06-19 13:57:37 +01:00
  • c7023951dd Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 12:33:23 +00:00
  • 5c5c4cfbc1 Translated using Weblate (Finnish) Tuomas Hietala 2019-06-19 12:30:22 +00:00
  • 2247c5953d Fix conflicting PRs David Baker 2019-06-19 13:33:06 +01:00
  • 1441b68953 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 12:30:10 +00:00
  • 86081c3c8f Merge pull request #3120 from matrix-org/dbkr/badges_remove_dupe_code David Baker 2019-06-19 13:30:04 +01:00
  • 9fb8d1d410 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 12:29:23 +00:00
  • 057f2da327 Translated using Weblate (French) Kévin C 2019-06-19 10:47:22 +00:00
  • a10675a400 Translated using Weblate (Finnish) Tuomas Hietala 2019-06-19 12:23:43 +00:00
  • 399f59130e Translated using Weblate (Albanian) Besnik Bleta 2019-06-19 09:01:35 +00:00
  • 97d8fe6db3 Merge pull request #3121 from matrix-org/dbkr/count_rooms_with_notifs David Baker 2019-06-19 13:29:17 +01:00
  • 6eddce8c32 lint David Baker 2019-06-19 12:13:17 +01:00
  • 23b29ce3f5 Use the variables we just defined above David Baker 2019-06-19 12:12:19 +01:00
  • edd43a2706 Fix favicon/title badge count David Baker 2019-06-19 12:06:32 +01:00
  • 0e6f401b62 copyright David Baker 2019-06-19 11:48:47 +01:00
  • c57d93702a De-duplicate notif badge code David Baker 2019-06-19 11:46:24 +01:00
  • bb4b5d7798 TooltipButton rename step 2 of 2 J. Ryan Stinnett 2019-06-19 11:32:03 +01:00
  • ab4c5f0152 TooltipButton rename step 1 of 2 J. Ryan Stinnett 2019-06-19 11:30:37 +01:00
  • 4ec7a8ddff Fix casing of TooltipButton J. Ryan Stinnett 2019-06-19 11:26:11 +01:00
  • b062bb6553 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 08:31:16 +00:00
  • 9591e6b0d3 Merge pull request #3071 from matrix-org/t3chguy/authentication_password_field J. Ryan Stinnett 2019-06-19 09:31:11 +01:00
  • 0c71aa2a57 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-19 08:27:37 +00:00
  • 6970552a87 Translated using Weblate (Hungarian) Szimszon 2019-06-18 18:33:29 +00:00
  • e69e9dd705 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-06-19 02:29:24 +00:00
  • 9641110315 Merge pull request #3118 from matrix-org/dbkr/already_registered David Baker 2019-06-19 09:27:31 +01:00
  • c8e121dc70 Restore warning for if you're already logged in David Baker 2019-06-18 18:43:14 +01:00
  • 456fa7a26b Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 16:44:47 +00:00
  • bb97653455 Merge pull request #3113 from matrix-org/bwindels/mediadeviceslabels Bruno Windels 2019-06-18 16:44:43 +00:00
  • 1a23265742 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 16:43:19 +00:00
  • 63fba611c0 Merge pull request #3108 from matrix-org/bwindels/edit-room-notif-pill Bruno Windels 2019-06-18 16:43:14 +00:00
  • cece9a5028 Merge branch 'origin/develop' into Weblate. Weblate 2019-06-18 16:35:30 +00:00
  • b7a19c6d16 Merge pull request #10097 from vector-im/jryans/linux-icons J. Ryan Stinnett 2019-06-18 17:35:34 +01:00
  • f3bfb08280 Update Electron's runtime PNG icon to match others J. Ryan Stinnett 2019-06-18 16:19:26 +01:00
  • 292427c275 Move default Electron icons outside asar J. Ryan Stinnett 2019-06-18 16:12:38 +01:00
  • db77d91500 v1.2.2-rc.2 v1.2.2-rc.2 RiotRobot 2019-06-18 16:02:21 +01:00
  • 290a99ba85 Prepare changelog for v1.2.2-rc.2 RiotRobot 2019-06-18 16:02:21 +01:00
  • a86f1e8a90 v1.2.2-rc.2 RiotRobot 2019-06-18 15:58:36 +01:00
  • 589aa19246 js-sdk & react-sdk rc.2 RiotRobot 2019-06-18 15:57:30 +01:00
  • a835d916e1 v1.2.2-rc.2 RiotRobot 2019-06-18 15:52:29 +01:00
  • 043cae2aa9 Prepare changelog for v1.2.2-rc.2 RiotRobot 2019-06-18 15:52:29 +01:00