Skip to content

Commit

Permalink
Further changes to readies etc
Browse files Browse the repository at this point in the history
  • Loading branch information
benwerd committed May 15, 2014
1 parent 0d67f87 commit 125450b
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -12,4 +12,4 @@ services:

notifications:
email:
- hello@idno.co
- hello@withknown.com
19 changes: 11 additions & 8 deletions CONTRIBUTORS.md
@@ -1,27 +1,30 @@
Contributors to Idno
====================
Contributors to Known
=====================

The following individuals have made major contributions to idno.
The following individuals have made major contributions to Known.

Core team
---------

* Ben Werdmuller http://benwerd.com
* Ben Werdmuller http://werd.io
* Erin Jo Richey http://erinjo.is

Community contributors, by idno release
---------------------------------------
Homepage: http://withknown.com/
Team Known site: http://stream.withknown.com/

Community contributors, by Known release
----------------------------------------

0.1

* Jesse Vincent http://s.ly
* Marcus Povey http://marcus-povey.co.uk
* Erin Jo Richey http://erinjorichey.com
* Adrian Goins http://arces.net

How can I contribute?
---------------------

* Visit Idno on GitHub: https://github.com/idno/idno
* Visit Known on GitHub: https://github.com/idno/idno
* Check and file issues
* Submit pull requests
* Not a coder? No problem. Design, text copy, workflows, documentation and bug hunting are just as important as code. Ask us how!
18 changes: 9 additions & 9 deletions HARASSMENT-POLICY.md
@@ -1,7 +1,7 @@
Anti-Harassment Policy
======================

We want everyone to feel comfortable contributing to the Idno project.
We want everyone to feel comfortable contributing to the Known project.
As such, we want to make sure that we are clear about our rules as a
community with respect to harassment.

Expand All @@ -11,18 +11,18 @@ anti-harassment policy, which can be found here:
* http://geekfeminism.wikia.com/index.php?title=Conference_anti-harassment_policy

We also encourage you to use and publish the above anti-harassment policy
for any Idno-related events you may choose to run.
for any Known-related events you may choose to run.

As with all aspects of Idno, we encourage you to submit suggested changes
As with all aspects of Known, we encourage you to submit suggested changes
via GitHub: https://github.com/idno/idno/

If you're wondering about how you can contribute, please see CONTRIBUTORS.md,
or go ahead and email us: hello@idno.co. We'll be delighted to hear from
or go ahead and email us: hello@withknown.com. We'll be delighted to hear from
you.

The short version
-----------------
Idno is dedicated to providing a harassment-free community for everyone,
Known is dedicated to providing a harassment-free community for everyone,
regardless of gender, gender identity and expression, sexual orientation,
disability, physical appearance, body size, race, or religion. We do not
tolerate harassment of community participants in any form. Sexual language
Expand All @@ -45,7 +45,7 @@ If a participant engages in harassing behavior, the core team may take any
action they deem appropriate, including warning the offender or expulsion
from the community. If you are being harassed, notice that someone else is
being harassed, or have any other concerns, please contact a member of the
core team immediately. The core team can always be emailed at hello@idno.co.
core team immediately. The core team can always be emailed at hello@withknown.com.

The core team will be happy to help participants contact any appropriate
moderators, authorities or local law enforcement, or otherwise assist those
Expand All @@ -55,6 +55,6 @@ community. We value your contributions.
Get in touch with the core team
-------------------------------

* Generic email: hello@idno.co
* Ben Werdmuller: ben@benwerd.com, +1 (312) 488-9373

* Generic email: hello@withknown.com
* Ben Werdmuller: ben@withknown.com, +1 (312) 488-9373
* Erin Jo Richey: erin@withknown.com
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright Ben Werdmuller <ben@benwerd.com>
Copyright Known, Inc <hello@withknown.com>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
26 changes: 10 additions & 16 deletions README.md
@@ -1,32 +1,26 @@
idno
====
idno is a modern social networking engine, which aims to be:
Known
=====
Known is a publishing platform for everyone.

* Easy to use
* Easy to customize
* Easy to build on top of
* A social website in a box
Project homepage: <http://withknown.com>

Project homepage: <http://idno.co>
Project lead: Ben Werdmuller <http://werd.io/>

idno is under active development and an installable package is not yet available. It requires PHP 5.4+ with the MongoDB extension, Apache Web Server with the mod_rewrite extension, and MongoDB.
Known is under active development and an installable package is not yet available. It requires PHP 5.4+ with the MongoDB extension, Apache Web Server with the mod_rewrite extension, and MongoDB.

Copyright
---------
Except for included third-party projects, idno is (c) Ben Werdmuller.
For included third-party projects, see "idno also contains" below.
Except for included third-party projects, Known is (c) Known, Inc.
For included third-party projects, see "Known also contains" below.

Contributors
------------
* See CONTRIBUTORS.md

License
-------
idno is licensed under the Apache Software License 2.0. See LICENSE for more information.
Known is licensed under the Apache Software License 2.0. See LICENSE for more information.

idno also contains
------------------
Known also contains
-------------------
* Twitter Bootstrap, which is distributed under the Apache 2.0 license. Source: https://github.com/twitter/bootstrap
* Bonita, which is distributed under the Apache 2.0 license. Source: https://github.com/benwerd/bonita
* jQuery, which is distributed under the MIT License. Source: https://github.com/jquery/jquery
Expand Down
2 changes: 1 addition & 1 deletion Tests/Homepage.php
Expand Up @@ -6,7 +6,7 @@ class Homepage extends \PHPUnit_Framework_TestCase {

function testHomepageLoads() {

// Load idno framework
// Load Known framework
require_once(dirname(dirname(__FILE__)) . '/Idno/start.php');

// Get the rendered homepage
Expand Down
2 changes: 1 addition & 1 deletion css/default.css
@@ -1,5 +1,5 @@
/**
Default idno CSS
Default Known CSS
*/

body {
Expand Down
4 changes: 2 additions & 2 deletions index.php
@@ -1,13 +1,13 @@
<?php

/**
* idno index page and router.
* Known index page and router.
* It all starts here!
*
* If you're wondering what this is all about, you could do worse than
* check out the README.md file.
*
* Project homepage: http://idno.co/
* Project homepage: http://withknown.com/
* Project repo: https://github.com/idno/idno
*
* @package idno
Expand Down
2 changes: 1 addition & 1 deletion js/default.js
@@ -1,5 +1,5 @@
/**
Helper Javascript functions for idno
Helper Javascript functions for Known
If you need to add your own JavaScript, the best thing to do is to create your own js files
and reference them from a custom plugin or template.
Expand Down
4 changes: 2 additions & 2 deletions templates/default/shell.tpl.php
Expand Up @@ -35,7 +35,7 @@
<script src="<?= \Idno\Core\site()->config()->url . 'external/bootstrap/' ?>assets/js/html5shiv.js"></script>
<![endif]-->

<!-- Default idno JavaScript -->
<!-- Default Known JavaScript -->
<script src="<?= \Idno\Core\site()->config()->url . 'js/default.js' ?>"></script>

<!-- To silo is human, to syndicate divine -->
Expand Down Expand Up @@ -179,7 +179,7 @@

<script>

//$(document).pjax('a:not([href^=\\.],[href^=file])', '#pjax-container'); // In idno, URLs with extensions are probably files.
//$(document).pjax('a:not([href^=\\.],[href^=file])', '#pjax-container'); // In Known, URLs with extensions are probably files.
/*$(document).on('pjax:click', function(event) {
if (event.target.href.match('/edit/')) {
// For a reason I can't actuallly figure out, /edit pages never render with chrome
Expand Down

0 comments on commit 125450b

Please sign in to comment.