Skip to content

Test #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nadava wants to merge 11 commits into
base: nadava-patch-cname
Choose a base branch
from
Open

Test #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dbe228b
Merge pull request #1 from funf-org/nadava-patch-cname
nadava Sep 12, 2015
6b53bd1
Merge pull request #2 from funf-org/nadava-patch-cname
nadava Sep 12, 2015
bd4e98d
Revert "Rename CNAME to CNAME.test"
nadava Sep 12, 2015
e5bfd98
Merge pull request #3 from funf-org/revert-2-nadava-patch-cname
nadava Sep 12, 2015
30aacef
Added inabox redirect.
alanlgardner Sep 28, 2015
6418aa8
Moved inabox redirect page in order to be loaded instead of downloaded.
alanlgardner Sep 28, 2015
a13e507
Added inabox app_generator tarball to site.
alanlgardner Oct 6, 2015
63aa1ae
Update contributors.html
nadava Oct 6, 2016
bfec17b
Update contributors.html
nadava Oct 6, 2016
152e9e6
Update contributors.html
nadava Oct 6, 2016
552651d
Update CNAME
alanlgardner Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CNAME
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
www.funf.org
1 change: 0 additions & 1 deletion CNAME.test
View file
Open in desktop

This file was deleted.

Binary file added app_generator.tar.gz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions contributors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ <h2>Past Contributors</h2>

<h2>The Initial Funf Deployment</h2>
<p>
The Funf open source project grew out of the software originally developed for the <a href="http://nadav.media.mit.edu/index.html%3Fn=Projects.FriendsAndFamilyStudy.html">Friends and Family" Study</a> conducted at the <a href="http://www.media.mit.edu/">MIT Media Lab</a>'s <a href="http://hd.media.mit.edu/">Human Dynamics</a> research group, headed by Professor Alex "Sandy" Pentland.
The Funf open source project grew out of the software originally developed for the <a href=http://nadav.media.mit.edu/index.html%3Fn=Projects.FriendsAndFamilyStudy.html>"Friends and Family" Study</a> conducted at the <a href="http://www.media.mit.edu/">MIT Media Lab</a>'s <a href="http://hd.media.mit.edu/">Human Dynamics</a> research group, headed by Professor Alex "Sandy" Pentland.
</p>

<p>
The Human Dynamics group aims to develop mathematical models to help us better understand how people and communities organize and operate, and how things like news, ideas, habits, and diseases propagate through a social network. In recent years they have conducted several Reality Mining studies, in which physical communities have been transformed into living laboratories, or &quot;social observatories&quot; for months at a time. In these studies, mobile phones have been been used as social and behavioral sensors for real world data collection. These studies bring a new computational power to social science by combining traditional experimental methods with the capability of data collection by electronic media.
</p>

<p>
The contributors to the Friends and Family field deployment:
The contributors to the Friends and Family field deployment software:
</p>
<ul>
<li>Nadav Aharony</li>
Expand Down
7 changes: 7 additions & 0 deletions inabox/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url=http://inabox.funf.org/" />
</head>
</html>