enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • cc7edbf86d allow for sending arbitrary events, also override highlight with event currently being forwarded while forwardingEvent is set Michael Telatynski 2017-05-19 01:29:11 +01:00
  • eaeac1230f Merge branch 'develop' of github.com:vector-im/riot-web into forward_message Michael Telatynski 2017-05-19 01:15:31 +01:00
  • 475646a2a7 Change wording Michael Telatynski 2017-05-19 00:34:35 +01:00
  • a2ab36f598 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message Michael Telatynski 2017-05-19 00:33:36 +01:00
  • bf0fe63759 don't know why I'm even tracking mounted state. Never refd Michael Telatynski 2017-05-19 00:20:51 +01:00
  • 0e7e4d8595 replace weird sidebar snapping with better ui_opacity Michael Telatynski 2017-05-19 00:20:32 +01:00
  • 7777be89ee only for finalised events Michael Telatynski 2017-05-18 23:53:37 +01:00
  • 19d727ab88 Merge pull request #904 from matrix-org/t3chguy/code_style Matthew Hodgson 2017-05-18 23:20:59 +01:00
  • 73d68c5513 no leading lines for else,finally,catch etc Michael Telatynski 2017-05-18 23:03:34 +01:00
  • 2ac3371ea4 Don't suggest vars!! Michael Telatynski 2017-05-18 22:51:22 +01:00
  • b886215fdd Merge pull request #3958 from vector-im/rav/roomdirectory_unmounting Richard van der Hoff 2017-05-18 19:06:18 +01:00
  • 4d60d444d4 Merge pull request #3956 from vector-im/rav/deflakify Richard van der Hoff 2017-05-18 19:06:01 +01:00
  • 3e7a31ac75 Revert "fix scroll behaviour on macs with no gemini" David Baker 2017-05-18 19:03:51 +01:00
  • 726cd60127 Merge pull request #902 from matrix-org/dbkr/prevent_illegal_finddomnode David Baker 2017-05-18 17:56:29 +01:00
  • 8fe3fa9178 Remove debug logging David Baker 2017-05-18 17:35:22 +01:00
  • 01955146e9 Prevent an exception getting scroll node David Baker 2017-05-18 17:33:32 +01:00
  • 46242a1703 Merge pull request #901 from matrix-org/luke/improve-country-dd-5 Luke Barnard 2017-05-18 17:23:34 +01:00
  • 32818aff4f Simplify expression Luke Barnard 2017-05-18 17:08:26 +01:00
  • ee64f4a8dd Add country prefix to country dd options Luke Barnard 2017-05-18 17:02:19 +01:00
  • 384f50609d Allow searching by partial prefix (/w or /wo '+') Luke Barnard 2017-05-18 17:01:40 +01:00
  • a425909b76 Get rid of react key warning when no results Luke Barnard 2017-05-18 17:01:01 +01:00
  • f99fa3ac1a Fixed pressing space or clicking dd input closes dd Luke Barnard 2017-05-18 16:58:57 +01:00
  • 53f0a6b360 Merge pull request #3959 from vector-im/luke/improve-country-dd-4 Luke Barnard 2017-05-18 14:38:47 +01:00
  • 90ee0c7ad9 Merge pull request #900 from matrix-org/luke/improve-country-dd-4 Luke Barnard 2017-05-18 14:38:39 +01:00
  • d0adfb6469 CSS for left_aligned Dropdowns, and adjustments for Country dd in Login Luke Barnard 2017-05-18 14:03:27 +01:00
  • 2350277d29 Add left_aligned class to CountryDropdown Luke Barnard 2017-05-18 14:03:02 +01:00
  • 1460eae280 Change background colour of login country dd to white Luke Barnard 2017-05-18 13:43:21 +01:00
  • 86055bc476 Fix some setState-after-unmount in roomdirectory Richard van der Hoff 2017-05-18 13:41:54 +01:00
  • f16086bbea Attempt to deflakify joining test Richard van der Hoff 2017-05-18 13:39:33 +01:00
  • 2ebd9b6290 Merge pull request #899 from matrix-org/luke/improve-country-dd-3 Luke Barnard 2017-05-18 13:37:28 +01:00
  • f60773ae1f mock-request: improve logging Richard van der Hoff 2017-05-18 13:37:23 +01:00
  • 01a15b2b7e Merge pull request #3953 from vector-im/luke/improve-country-dd-3-square-flags Luke Barnard 2017-05-18 13:37:17 +01:00
  • 5526525b6b Merge pull request #3954 from vector-im/dbkr/riot_bot_for_desktop David Baker 2017-05-18 13:18:19 +01:00
  • a39a7c8334 Update to more recent mock-request Richard van der Hoff 2017-05-18 12:18:57 +01:00
  • c9e821ffc5 Add config for riot-bot on desktop app build David Baker 2017-05-18 12:00:02 +01:00
  • b290a28123 Merge pull request #3952 from vector-im/dbkr/electron_copy_link_location Luke Barnard 2017-05-18 11:49:41 +01:00
  • c991b52d2c Swap to new flag files (which are stored as GB.png) Luke Barnard 2017-05-18 11:45:23 +01:00
  • 16899d3b1f Bump electron version to 1.6.8 David Baker 2017-05-18 11:38:03 +01:00
  • 7d81ade563 genflags.sh should be run from root dir Luke Barnard 2017-05-18 11:38:01 +01:00
  • bc5ad3c761 Move genflags.sh to scripts Luke Barnard 2017-05-18 11:36:24 +01:00
  • 7c764b7365 Add copyright Luke Barnard 2017-05-18 11:34:26 +01:00
  • dfb30e91de Desktop: 'copy link address' David Baker 2017-05-18 11:32:10 +01:00
  • ea03140cbd Add ellipsis overflow to long dd options Luke Barnard 2017-05-18 11:30:22 +01:00
  • 98215b4767 Adjust for 27x27 flag png size Luke Barnard 2017-05-18 11:29:57 +01:00
  • e879fb0eef Add square flag pngs /w genflags.sh script Luke Barnard 2017-05-18 11:25:42 +01:00
  • e38437e6ce Invite the welcome user after registration if configured Luke Barnard 2017-05-12 17:39:38 +01:00
  • a9a4b1c44e Get branch from various CI env vars David Baker 2017-05-18 11:05:19 +01:00
  • 0e5657333f Add app drawer and app dialog Richard Lewis 2017-05-17 23:21:02 +01:00
  • 7a63cfd717 Add stylesheet for apps Richard Lewis 2017-05-17 23:17:53 +01:00
  • 7ea6157b67 App drawer styling Richard Lewis 2017-05-17 21:16:15 +01:00
  • 7e1de2ac35 Show/hide apps panel and misc formatting and lint fixes Richard Lewis 2017-05-17 21:15:57 +01:00
  • c929cb1337 Do I mean bash? Probably David Baker 2017-05-17 18:21:58 +01:00
  • b3b44dd99e Use fetch dep script for travis David Baker 2017-05-17 18:20:25 +01:00
  • 18afbc5bec Make dep install script work David Baker 2017-05-17 18:14:28 +01:00
  • 60d33f50a7 Create node_modules if it doesn't exist David Baker 2017-05-17 16:19:19 +01:00
  • 94ac4bf490 Use fetch dep script in jenkins script David Baker 2017-05-17 16:17:08 +01:00
  • fac8906102 Add script to fetch correct dep branches David Baker 2017-05-17 16:11:34 +01:00
  • ca3921f3a0 Merge pull request #3943 from vector-im/rav/reduce_rageshake_size Richard van der Hoff 2017-05-17 15:59:10 +01:00
  • 15ab1732a2 Reduce rageshake log size to 1MB Richard van der Hoff 2017-05-17 14:43:21 +01:00
  • 338ab4d046 Merge pull request #3942 from vector-im/luke/improve-country-dd-2 Luke Barnard 2017-05-17 14:29:48 +01:00
  • a44fcd6425 Merge pull request #897 from matrix-org/luke/improve-country-dd-2 Luke Barnard 2017-05-17 14:29:39 +01:00
  • 089740a840 CSS for putting country dd on same line as phone input Luke Barnard 2017-05-17 14:25:43 +01:00
  • c44d7b6c44 Improve phone number country dropdown for registration and login Luke Barnard 2017-05-17 13:04:06 +01:00
  • 95988bd5ec Dispatch show hide app drawer events Richard Lewis 2017-05-17 12:35:25 +01:00
  • 553c53e7e8 Add apps menu icons Richard Lewis 2017-05-17 12:33:58 +01:00
  • 9dd0b9bdd1 Fix lint errrors / warnings Richard Lewis 2017-05-17 11:31:01 +01:00
  • e22712514e Add show / hide apps button Richard Lewis 2017-05-17 10:58:59 +01:00
  • 7ea0ecd125 Merge branch 'new_release_process_stable' into develop David Baker 2017-05-17 10:43:02 +01:00
  • 9352e5d78e Lets make it abundantly clear that we want attention. FLASH FLASH FLASH also improve favicon updating to not change if we're same as previous not sure how intensive the nativeImage stuff is but cheap efficiency Michael Telatynski 2017-05-17 10:39:43 +01:00
  • 8ce6da1b16 Merge branch 'new_release_process_stable' into develop David Baker 2017-05-17 10:38:09 +01:00
  • 818f21c248 Merge pull request #893 from matrix-org/luke/unit-test-rts-reg Luke Barnard 2017-05-17 10:33:26 +01:00
  • 826a571b60 apply same image to the window/taskbar too; as per request LETS MAKE IT CLEAR WE ARE NEEDY AND WANT ATTENTION Michael Telatynski 2017-05-17 10:05:50 +01:00
  • 696234694c Merge pull request #892 from matrix-org/rav/pastefiles Richard van der Hoff 2017-05-17 09:59:23 +01:00
  • 39b6c7c65d ignore electron_app subdirs properly, missed these too :L Michael Telatynski 2017-05-17 09:53:33 +01:00
  • e1089574ae Write some tests for the RTS UI Luke Barnard 2017-05-17 09:46:17 +01:00
  • 8695397abb Support for pasting files into normal composer Richard van der Hoff 2017-05-17 01:41:42 +01:00
  • 9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search" David Baker 2017-05-16 17:21:49 +01:00
  • 844ea390c8 Revert "clear the searchbox after quick-search" David Baker 2017-05-16 17:13:55 +01:00
  • fdf326c9f0 Revert "Cancel quick-search on Escape, clearing it and returning focus to composer." David Baker 2017-05-16 17:13:39 +01:00
  • 9399b7ddf0 Revert "fix incoming call box" David Baker 2017-05-16 16:35:17 +01:00
  • 03476705b1 Revert "better solution to incomingcallbox weirdness" David Baker 2017-05-16 16:35:06 +01:00
  • 3cead032c2 Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2" David Baker 2017-05-16 16:27:58 +01:00
  • 75eea89c08 Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings" David Baker 2017-05-16 16:12:57 +01:00
  • ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search" David Baker 2017-05-16 16:11:01 +01:00
  • 67c6a8b81d Revert "unbreak stack overflow which fires on tests due to mocked timers" David Baker 2017-05-16 16:02:13 +01:00
  • eddc2af92d Revert "HOW DID THIS EVER WORK?" David Baker 2017-05-16 16:01:54 +01:00
  • 7a949b6a45 Revert "oops, actually refresh roomlist when its state changes!" David Baker 2017-05-16 16:01:32 +01:00
  • b063c605a8 Revert "fix stupid typos in RoomList's shouldComponentUpdate" David Baker 2017-05-16 16:01:14 +01:00
  • 714cd6a10f Revert "recalculate roomlist when your invites change" David Baker 2017-05-16 16:00:34 +01:00
  • 1aabaec158 Revert "comment out spammy CTD logging" David Baker 2017-05-16 15:35:22 +01:00
  • ff9c40472a Revert "Merge pull request #822 from t3chguy/BaseDialog_restore_focus" David Baker 2017-05-16 14:50:29 +01:00
  • 19dcd83aeb Revert "Merge pull request #841 from matrix-org/luke/fix-double-dialogs" David Baker 2017-05-16 14:50:19 +01:00
  • 387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" David Baker 2017-05-16 14:49:55 +01:00
  • d06bd3cf9d Revert "Fix Create Room button" David Baker 2017-05-16 14:30:02 +01:00
  • f8d1a6d240 Revert "Fix 'start chat' button" David Baker 2017-05-16 14:26:46 +01:00
  • ca907f42dc Fix redundant getComponent Luke Barnard 2017-05-16 14:24:24 +01:00
  • 219bfffea2 Only dispatch password_changed when password has changed Luke Barnard 2017-05-16 14:24:09 +01:00
  • 58ada2c27d move mxEvent.status check to js-sdk Michael Telatynski 2017-05-16 14:14:06 +01:00
  • 2c5fb01f03 Fix bugs introduced by dodgy merge Luke Barnard 2017-05-16 14:13:22 +01:00
  • db78534b45 remove no longer required parseIntWithDefault Michael Telatynski 2017-05-16 14:10:00 +01:00