MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

    MagicMirror v2.1.0 Update error

    Scheduled Pinned Locked Moved Solved Troubleshooting
    31 Posts 12 Posters 23.5k Views 12 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • lolobyteL Offline
      lolobyte
      last edited by

      How can i fix that?

      pi@raspi3-MM2:~/MagicMirror $ sudo git pull
      Aktualisiere b8167f8…8010e62
      error: Your local changes to the following files would be overwritten by merge:
      css/main.css
      modules/default/clock/clock.js
      modules/default/compliments/compliments.js
      modules/default/currentweather/currentweather.css
      modules/default/currentweather/currentweather.js
      package.json
      Please, commit your changes or stash them before you can merge.
      Aborting

      1 Reply Last reply Reply Quote 0
      • yawnsY Offline
        yawns Moderator
        last edited by

        So you modified the original files which you should not do.

        Look at the first answer here to see your possibilities: http://stackoverflow.com/questions/15745045/how-do-i-resolve-git-saying-commit-your-changes-or-stash-them-before-you-can-me

        lolobyteL schlachtkreuzer6S 2 Replies Last reply Reply Quote 0
        • lolobyteL Offline
          lolobyte @yawns
          last edited by

          @yawns
          Thank u.
          Now i have this error!

          npm WARN grunt-yamllint@0.2.0 requires a peer of grunt@~0.4.0 but none was installed.

          1 Reply Last reply Reply Quote 0
          • lolobyteL Offline
            lolobyte
            last edited by

            Hello,

                ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
            

            I can’t insert my ip from my laptop.
            I want to access MagicMirror from laptop with Remote Control, but it’s not possible now with this update.

            Where i have to insert my ip address in the white-list?

            1 Reply Last reply Reply Quote 0
            • P Offline
              PindaPower
              last edited by

              If the original this is:

              Blockquote ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”],

              Then I guess that the modifed can look like this:

              Blockquote ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”, “192.168.0.1”, “192.168.250.250”],

              If you dont get the “::ffff:127.0.0.1” lookup “ipv4 to ipv6 translation” on google.

              lolobyteL 1 Reply Last reply Reply Quote 0
              • lolobyteL Offline
                lolobyte @PindaPower
                last edited by lolobyte

                @PindaPower

                Hi,

                at this position i must insert my ip from the notebook?

                ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”, “XXX.XXX.XXX.XXX”, “192.168.250.250”],

                And how to declare a range?

                1 Reply Last reply Reply Quote 0
                • lolobyteL Offline
                  lolobyte
                  last edited by

                  nobody can help.

                  I going to be crazy soon with this damn IP’s

                  ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”],

                  Can somebody put a example of a running ip address with a virtual IP like 192.168.123.123 to give access to remote control module ?

                  1 Reply Last reply Reply Quote 0
                  • SnilleS Offline
                    Snille Module Developer
                    last edited by

                    This should do it. :)

                    For a B-network (192.168.x.x)
                    The last two “x”:es change.

                    ipWhitelist: [
                    	"127.0.0.1",
                    	"::ffff:127.0.0.1",
                    	"::1",
                    	"::ffff:192.168.0.1/16" 
                    ],
                    

                    Or for a C-network (192.168.123.x)
                    Only the last “x” change.

                    ipWhitelist: [
                    	"127.0.0.1",
                    	"::ffff:127.0.0.1",
                    	"::1",
                    	"::ffff:192.168.123.1/24" 
                    ],
                    

                    Good luck. :)

                    If you cant find it, make it and share it!
                    Modules: MMM-homeassistant-sensors, MMM-Modulebar, MMM-Profilepicture, MMM-Videoplayer

                    1 Reply Last reply Reply Quote 0
                    • SteffS Offline
                      Steff
                      last edited by

                      This post is deleted!
                      1 Reply Last reply Reply Quote 0
                      • schlachtkreuzer6S Offline
                        schlachtkreuzer6 @yawns
                        last edited by

                        @yawns so how do i change the comments if i should´t change the comments.js ? ^^

                        yawnsY 1 Reply Last reply Reply Quote 0
                        • 1
                        • 2
                        • 3
                        • 4
                        • 1 / 4
                        • First post
                          Last post
                        Enjoying MagicMirror? Please consider a donation!
                        MagicMirror created by Michael Teeuw.
                        Forum managed by Sam, technical setup by Karsten.
                        This forum is using NodeBB as its core | Contributors
                        Contact | Privacy Policy