Merge branch 'master' of github.com:neocities/neocities

README.md

@@ -19,7 +19,6 @@ vagrant up --provision
 
 ```
 vagrant ssh
-cd /vagrant
 bundle exec rackup -o 0.0.0.0
 ```
 

app/api.rb

@@ -32,6 +32,7 @@ get '/api/list' do
     new_file[:is_directory] = file[:is_directory]
     new_file[:size] = file[:size] unless file[:is_directory]
     new_file[:updated_at] = file[:updated_at].rfc2822
+    new_file[:sha1_hash] = file[:sha1_hash] unless file[:is_directory]
     files << new_file
   end
 

tests/api_tests.rb

@@ -37,6 +37,7 @@ describe 'api list' do
       site_file[:is_directory].must_equal file[:is_directory]
       site_file[:size].must_equal file[:size]
       site_file[:updated_at].rfc2822.must_equal file[:updated_at]
+      site_file[:sha1_hash].must_equal file[:sha1_hash]
     end
   end
 

vagrant/development.sh

@@ -17,3 +17,16 @@ sudo sh -c 'echo "local all all trust" >> /etc/postgresql/9.3/main/pg_hba.conf'
 sudo sh -c 'echo "host all all 127.0.0.1/32 trust" >> /etc/postgresql/9.3/main/pg_hba.conf'
 sudo sh -c 'echo "host all all ::1/128 trust" >> /etc/postgresql/9.3/main/pg_hba.conf'
 sudo service postgresql restart
+
+# Create empty file for disposable email accounts
+DISPOSABLE_EMAIL_PATH=/vagrant/files/disposable_email_blacklist.conf
+if [ ! -f $DISPOSABLE_EMAIL_PATH ]; then
+    sudo su vagrant -c "touch $DISPOSABLE_EMAIL_PATH"
+fi
+
+# Automatically enter the project path on vagrant ssh
+if grep -qv "cd /vagrant" /home/vagrant/.bashrc
+then
+    sudo su vagrant -c "echo 'cd /vagrant' >> ~/.bashrc"
+fi
+

views/api.erb

@@ -110,13 +110,15 @@ api.delete(['img1.jpg', 'img2.jpg'], function(resp) {
       "path": "index.html",
       "is_directory": false,
       "size": 1023,
-      "updated_at": "Sat, 13 Feb 2016 03:04:00 -0000"
+      "updated_at": "Sat, 13 Feb 2016 03:04:00 -0000",
+      "sha1_hash": "c8aac06f343c962a24a7eb111aad739ff48b7fb1"
     },
     {
       "path": "not_found.html",
       "is_directory": false,
       "size": 271,
-      "updated_at": "Sat, 13 Feb 2016 03:04:00 -0000"
+      "updated_at": "Sat, 13 Feb 2016 03:04:00 -0000",
+      "sha1_hash": "cfdf0bda2557c322be78302da23c32fec72ffc0b"
     },
     {
       "path": "images",
@@ -127,7 +129,8 @@ api.delete(['img1.jpg', 'img2.jpg'], function(resp) {
       "path": "images/cat.png",
       "is_directory": false,
       "size": 16793,
-      "updated_at": "Sat, 13 Feb 2016 03:04:00 -0000"
+      "updated_at": "Sat, 13 Feb 2016 03:04:00 -0000",
+      "sha1_hash": "41fe08fc0dd44e79f799d03ece903e62be25dc7d"
     }
   ]
 }
@@ -141,7 +144,8 @@ api.delete(['img1.jpg', 'img2.jpg'], function(resp) {
       "path": "images/cat.png",
       "is_directory": false,
       "size": 16793,
-      "updated_at": "Sat, 13 Feb 2016 03:04:00 -0000"
+      "updated_at": "Sat, 13 Feb 2016 03:04:00 -0000",
+      "sha1_hash": "41fe08fc0dd44e79f799d03ece903e62be25dc7d"
     }
   ]
 }

views/site_files/mount_info.erb

@@ -22,18 +22,21 @@
         This feature requires a supporter account. <a href="/supporter">Click here</a> to become a supporter.
       </p>
     <% else %>
-      <h2>Instructions for Windows</h2>
+      <h2>Instructions per operating system</h2>
+
+      <h3>Windows</h3>
 
       <p>
         Unfortunately, the WebDAV that comes with Windows file manager has issues with SSL,
         and the problem has not yet been fixed. We recommend using a client like <a href="https://cyberduck.io">Cyberduck</a> with Windows, which is free and has
         WebDAV support. You can also try <a href="https://mountainduck.io/">Mountain Duck</a>
         which will allow you to mount your Neocities site as a hard drive on your computer.
+      </p>
 
-      <h2>Instructions for OSX</h2>
+      <h3>macOS</h3>
 
       <p>
-        <a href="http://support.apple.com/kb/ph3857">Use these instructions</a>, and use this URL to connect: <strong>https://neocities.org/webdav</strong>
+        <a href="https://support.apple.com/en-us/guide/mac-help/connect-to-a-webdav-server-mchlp1546/mac">Use these instructions</a>, and use this URL to connect: <strong>https://neocities.org/webdav</strong>
         <br>
         Enter login info when requested.
       </p>
@@ -42,22 +45,33 @@
         You can also try out <a href="https://cyberduck.io">Cyberduck</a> or <a href="https://mountainduck.io/">Mountain Duck</a> if you run into any issues.
       </p>
 
-      <h2>Instructions for Linux (Ubuntu)</h2>
+      <h3>Linux (Gnome)</h3>
 
       <p>
         <ol>
           <li>Open Nautilus.</li>
-          <li>Press ALT-L to show the location bar.</li>
-          <li>Type davs://neocities.org/webdav into location bar.</li>
+          <li>Press CTRL-L to show the location bar.</li>
+          <li>Type <code>davs://neocities.org/webdav</code> into location bar.</li>
           <li>Enter your login into the popup.</li>
         </ol>
       </p>
 
-      <h2>Instructions for Linux (command line)</h2>
+      <h4>Linux (mount as filesystem)</h4>
 
       <p>
-        For command line, use the <a href="http://johnreid.it/2009/09/26/mount-a-webdav-folder-in-ubuntu-linux/">davfs2</a> package.
+        To mount the WebDAV as a folder in your filesystem use the <a href="https://savannah.nongnu.org/projects/davfs2">davfs2</a> package.
       </p>
+
+      <h2>Accessing multiple sites</h2>
+
+      <p>
+        By default you can use your username/password combination to access your parent site via WebDAV (This is <code><%= current_site.parent? ? current_site.username : current_site.parent.username %></code>). In case you want to access any other sites you only need to use the site's subdomain name as the username (with the same password for your account).
+      </p>
+
+      <p>
+        You can see a list of your sites in <a href="/settings">your settings page</a>.
+      </p>
+
     <% end %>
   </article>
 </div>