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

Commit Graph

  • cf23db709d Merge pull request #508 from matrix-org/dbkr/linkify_213 Richard van der Hoff 2016-10-04 11:59:00 +01:00
  • 7785797be0 Update to linkify 2.1.3 David Baker 2016-10-04 11:29:13 +01:00
  • 52cae92dd7 Update to linkify 2.1.3 David Baker 2016-10-04 11:28:28 +01:00
  • b80b08f04f Specify width on icons & comment David Baker 2016-10-04 11:14:36 +01:00
  • 304e5b997a PR Freedback David Baker 2016-10-04 11:04:01 +01:00
  • 6b4dbfbd62 Change default brand to Riot David Baker 2016-10-04 10:23:38 +01:00
  • 000ca35727 Don't pop up errors when this API fails for guests David Baker 2016-10-03 16:30:57 +01:00
  • 776fe2ad70 Different way of getting fields for 3p location David Baker 2016-10-03 13:42:55 +01:00
  • 9d303712f2 more s/Vector/Riot/ Matthew Hodgson 2016-10-03 10:18:32 +01:00
  • 9174b32ef1 Upgrade to babel6 and enable some presets. Aviral Dasgupta 2016-10-02 17:28:24 +05:30
  • 2d173d83b9 Upgrade to babel6 and enable some presets. Aviral Dasgupta 2016-10-02 17:27:45 +05:30
  • 91771ec17d Ce n'est pas Python David Baker 2016-10-01 10:34:21 +01:00
  • 6abf6c9ec0 Merge pull request #505 from matrix-org/dbkr/dont_replacestate David Baker 2016-09-30 14:32:01 +01:00
  • be99f17ee0 Oops, right variable David Baker 2016-09-30 14:05:01 +01:00
  • 8aeb0cfb68 Dedicated function for resetting screen state David Baker 2016-09-30 11:56:32 +01:00
  • c41a8da4be Argh, there's more David Baker 2016-09-30 11:40:27 +01:00
  • 2f7366cb8a Comment state fields David Baker 2016-09-30 11:37:50 +01:00
  • 602727b7ad Merge pull request #2383 from vector-im/dbkr/sign_in_not_log_in Richard van der Hoff 2016-09-30 11:31:15 +01:00
  • dca19a4940 Merge pull request #506 from matrix-org/dbkr/sign_in_not_log_in Richard van der Hoff 2016-09-30 11:30:00 +01:00
  • 302074c71f Merge pull request #504 from matrix-org/dbkr/fix_login_if_joined Richard van der Hoff 2016-09-30 11:04:18 +01:00
  • 56deea9f10 Merge pull request #2382 from vector-im/dbkr/networkdropdown_size_jump Richard van der Hoff 2016-09-30 10:59:15 +01:00
  • 8e0be29c13 Merge pull request #2380 from vector-im/dbkr/roomdir_no_results Richard van der Hoff 2016-09-30 10:23:23 +01:00
  • b71b1b5535 Use more variables David Baker 2016-09-30 09:39:30 +01:00
  • ca5204c3f8 fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381 Matthew Hodgson 2016-09-30 00:17:47 +01:00
  • 5b3524f174 better wordwrap on RightPanels Matthew Hodgson 2016-09-29 17:41:29 +01:00
  • f9a70a8b04 Use 'Sign In' / 'Sign Out' universally David Baker 2016-09-29 17:40:19 +01:00
  • d5af2d2c52 Use 'Sign In' / 'Sign Out' universally David Baker 2016-09-29 17:38:52 +01:00
  • 8cbddfcf28 Fix version going blank after logging in David Baker 2016-09-29 17:23:07 +01:00
  • 7b28dde263 Prevent error when clicking 'log in' David Baker 2016-09-29 16:57:10 +01:00
  • b652ea5024 Prevent network dropdown resizing slightly David Baker 2016-09-29 16:49:44 +01:00
  • 2a37a0cb19 Room directory: indicate when there are no results David Baker 2016-09-29 15:45:45 +01:00
  • 60ce49910a Merge pull request #497 from matrix-org/dbkr/richtext_use_markdown_wrapper David Baker 2016-09-29 15:33:18 +01:00
  • 761600f325 Add native joining of 3p networks to room dir David Baker 2016-09-29 15:30:54 +01:00
  • 9a633ee449 Move 'show join button' functionality out David Baker 2016-09-29 15:05:15 +01:00
  • 65f14c7d21 Stop random rooms appearing when switching network David Baker 2016-09-28 14:18:40 +01:00
  • 864ba52bc5 Relative img paths please David Baker 2016-09-28 12:03:35 +01:00
  • fdb5020c0c Oops, fix undefined variable David Baker 2016-09-28 11:56:07 +01:00
  • 62344b5194 Merge pull request #2362 from vector-im/dbkr/roomdir_filter_3pnetworks Richard van der Hoff 2016-09-28 11:38:03 +01:00
  • 0db12fcd22 Move method & don't wastefullt create elements David Baker 2016-09-28 11:05:14 +01:00
  • 455ee4f91b Argh, tabs David Baker 2016-09-28 11:04:54 +01:00
  • 5ca391f914 Replace double truth test with something sane David Baker 2016-09-28 11:04:13 +01:00
  • a32abae5a3 Don't use _matrix as default if there isn't one David Baker 2016-09-28 10:58:01 +01:00
  • b2dd3ecf3a Add the _matrix network to the sample config David Baker 2016-09-28 10:44:29 +01:00
  • cc7017b62d Emptry commit to force re-test David Baker 2016-09-28 10:22:29 +01:00
  • 66ef1e8156 Merge pull request #501 from matrix-org/dbkr/get_hs_name David Baker 2016-09-28 10:22:11 +01:00
  • 4942f4f35c Typo David Baker 2016-09-28 10:17:47 +01:00
  • f852e8a01d Update sample config David Baker 2016-09-28 10:13:35 +01:00
  • 6ff1c30a4b Fix spurious fill requests when switching networks David Baker 2016-09-28 10:08:03 +01:00
  • b366973151 let anyone create aliases - fixes https://github.com/vector-im/vector-web/issues/1585 Matthew Hodgson 2016-09-27 23:39:25 +01:00
  • 85ea45a64a Room dir: New filtering & 3rd party networks David Baker 2016-09-27 19:39:20 +01:00
  • c7ad9bfdad Add 'getHomeServerName' util to client peg David Baker 2016-09-27 19:38:10 +01:00
  • b9576754e6 Nomenclature David Baker 2016-09-27 14:49:57 +01:00
  • 7b258bc229 it's called Riot Matthew Hodgson 2016-09-27 12:27:06 +01:00
  • ea25e48ccb Merge pull request #499 from matrix-org/dbkr/fix_markdown_links Richard van der Hoff 2016-09-27 11:57:03 +01:00
  • 5ba3499f56 Merge pull request #2359 from vector-im/dbkr/linkify_version Richard van der Hoff 2016-09-27 11:30:16 +01:00
  • e403bcd770 Merge pull request #500 from matrix-org/dbkr/linkify_fail_fast Richard van der Hoff 2016-09-27 11:29:39 +01:00
  • 30ce35c3b4 Merge pull request #498 from matrix-org/dbkr/fast_lgm Richard van der Hoff 2016-09-27 11:28:48 +01:00
  • f4a6a3c4b2 Update linkify version David Baker 2016-09-27 10:40:02 +01:00
  • 0448dca832 Fail hard & fast if linkifyjs version is wrong David Baker 2016-09-27 10:38:01 +01:00
  • 2be1cc9f85 Give DMRoomMap an explicit makeShared David Baker 2016-09-27 09:56:31 +01:00
  • 9bffd8da75 Fix markdown link syntax David Baker 2016-09-26 20:09:36 +01:00
  • 690309adfc Bring back the little green men without slowness David Baker 2016-09-26 18:02:14 +01:00
  • 5967dc4983 Merge pull request #2339 from vector-im/dbkr/directory_search_box David Baker 2016-09-26 15:43:39 +01:00
  • 2e1644877d Merge pull request #496 from matrix-org/dbkr/directory_search_box David Baker 2016-09-26 15:38:45 +01:00
  • bf58c340bc Oops, missed the ref David Baker 2016-09-26 15:30:42 +01:00
  • ba090a1198 Trailing .+ was redundant David Baker 2016-09-26 15:13:57 +01:00
  • 9333f91533 Give react callbacks underscores too David Baker 2016-09-26 14:29:12 +01:00
  • 2dd0165bfc Correct regex for hash at the start David Baker 2016-09-26 14:24:35 +01:00
  • dc0b15bdfa Remove unused variable / function David Baker 2016-09-26 14:17:36 +01:00
  • bbfc05b0c0 Fix name of text emote sending & fix tests David Baker 2016-09-26 10:20:56 +01:00
  • be6fbc2432 let's stick with the vector-web GA target for riot-web Matthew Hodgson 2016-09-25 13:24:07 +01:00
  • 40ba1ff5aa disable LGM badges for DMs temporarily - see https://github.com/vector-im/vector-web/issues/2343 Matthew Hodgson 2016-09-24 00:43:46 +01:00
  • bf037ed6c7 Add comment David Baker 2016-09-23 19:09:32 +01:00
  • db3f0d298a Make RTE mode use the new Markdown wrapper class David Baker 2016-09-23 18:50:25 +01:00
  • 51a5542446 Make tests pass David Baker 2016-09-23 18:20:31 +01:00
  • 3938abc5dd add webkit vendor prefixed properties David Baker 2016-09-23 17:18:52 +01:00
  • fa193e775a Implement join button appearing David Baker 2016-09-23 16:34:47 +01:00
  • 4961a97ed4 More css: David Baker 2016-09-23 16:33:28 +01:00
  • fb477fad1e Less hardcoded CSS David Baker 2016-09-23 15:58:28 +01:00
  • eb5b175213 Layout to support less hardcoded CSS David Baker 2016-09-23 15:58:11 +01:00
  • a070bccffb Hacky hardcoded css for join button David Baker 2016-09-23 15:26:08 +01:00
  • b1e4c911eb WIP omnipresent join button David Baker 2016-09-23 15:25:38 +01:00
  • 8e1105b12a Oops, wrong function David Baker 2016-09-23 15:25:13 +01:00
  • 6281d76ade Merge remote-tracking branch 'origin/develop' into dbkr/directory_search_box David Baker 2016-09-23 14:43:13 +01:00
  • 18cbd452b0 Merge pull request #495 from matrix-org/dbkr/irc_links Richard van der Hoff 2016-09-23 14:31:30 +01:00
  • d0a15975c8 Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive David Baker 2016-09-23 14:31:20 +01:00
  • 93e4a04118 Chrome manifest branding David Baker 2016-09-23 14:26:09 +01:00
  • 6e3313b461 More missed rebranding David Baker 2016-09-23 14:24:47 +01:00
  • 90c9d51c7d Typos David Baker 2016-09-23 14:15:48 +01:00
  • 898d792336 Update to linkifyjs 2.1.1 David Baker 2016-09-23 14:05:31 +01:00
  • 2120963c7a More linkifier fixes David Baker 2016-09-23 14:02:14 +01:00
  • fae9b048dd Merge remote-tracking branch 'origin/develop' into dbkr/irc_links David Baker 2016-09-23 13:50:03 +01:00
  • eeac0619f4 reskindex David Baker 2016-09-23 13:49:35 +01:00
  • 2e77b0a3c7 Use directory search box component David Baker 2016-09-23 13:48:44 +01:00
  • 61b48a5b1a Add component for the directory search box David Baker 2016-09-23 13:48:24 +01:00
  • 16c22e07b8 Missed some mstile icons David Baker 2016-09-23 13:46:46 +01:00
  • c8f6902da8 Merge pull request #494 from matrix-org/rav/reinstate_device_id David Baker 2016-09-23 09:40:06 +01:00
  • dd2da20031 Add the deviceId back to memberdeviceinfo Richard van der Hoff 2016-09-22 19:28:50 +01:00
  • 2f7b4f74fd Move the device verification buttons to their own class Richard van der Hoff 2016-09-22 19:23:34 +01:00
  • 6ba20ec012 Better logic for wrapping in p tags or not David Baker 2016-09-22 18:57:46 +01:00