Skip to content
This repository has been archived by the owner on Jan 8, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wlanslovenija/PiplMesh
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: DenBo/PiplMesh
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 16 commits
  • 23 files changed
  • 4 contributors

Commits on Feb 26, 2012

  1. Test1

    JakaCikac committed Feb 26, 2012
    Copy the full SHA
    af89d87 View commit details
  2. Test2

    JakaCikac committed Feb 26, 2012
    Copy the full SHA
    8fee11b View commit details
  3. Local testing

    JakaCikac committed Feb 26, 2012
    Copy the full SHA
    8d1bfdf View commit details

Commits on Feb 27, 2012

  1. Created project piplmesh

    JakaCikac committed Feb 27, 2012
    Copy the full SHA
    6576e7a View commit details
  2. Copy the full SHA
    f3be42d View commit details
  3. issue #3 - Added requirements

    JakaCikac committed Feb 27, 2012
    Copy the full SHA
    bfb44ea View commit details
  4. Ignore *.pyc files.

    mihano committed Feb 27, 2012
    Copy the full SHA
    5a18849 View commit details
  5. Copy the full SHA
    20c224b View commit details
  6. Copy the full SHA
    64cbc05 View commit details
  7. Issue #10 - correction

    Ignome all files in the env_piplmesh directory, relative to the repo.
    andrejcesen committed Feb 27, 2012
    Copy the full SHA
    112df57 View commit details
  8. Copy the full SHA
    d4718ac View commit details
  9. Copy the full SHA
    14522f2 View commit details
  10. Copy the full SHA
    38a2145 View commit details
  11. Views.py defined

    andrejcesen committed Feb 27, 2012
    Copy the full SHA
    bf51dc5 View commit details
  12. Copy the full SHA
    517b555 View commit details
  13. Added some basic html in base.html, fixed bug in urls.py, changed

    settings.py to enable templates, fixed bug with "non ascii char" in
    views.py
    aljana committed Feb 27, 2012
    Copy the full SHA
    7caeff4 View commit details
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#ignore *.pyc files
*.pyc
#ignore env_piplmesh directory
env_piplmesh/
32 changes: 32 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Copyright (C) 2009-2012 wlan slovenija, open wireless network of Slovenia

This program is free software: you can redistribute it and/or modify it under
the terms of the GNU Affero General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option) any
later version.

This program is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU Affero General Public License for more
details.

You should have received a copy of the GNU Affero General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.

Together with the source code this program may contain also additional content.
Unless specified otherwise, this content is available under Creative Commons
Attribution-ShareAlike license, either version 3.0 of the license, or (at your
option) any later version. You are free to copy, distribute, transmit, adapt
and/or commercially use this content or part(s) of it, provided you publicly,
clearly and visibly attribute wlan slovenija, open wireless network of
Slovenia, and provide a link to its website <http://wlan-si.net/>, if
applicable. If you alter, transform, or build upon this content or part(s) of
it, you may distribute the results only under the same or similar license to
this one.

For more information about Creative Commons Attribution-ShareAlike license see
<http://creativecommons.org/>.

This program may contain, use, link to and/or distribute also parts under third
party copyright with possibly different licensing conditions. Make sure you
check and respect also those conditions.
661 changes: 661 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
PiplMesh repository.

This should be local.
Empty file added piplmesh/__init__.py
Empty file.
Empty file added piplmesh/account/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions piplmesh/account/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.db import models

# Create your models here.
Empty file added piplmesh/api/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions piplmesh/api/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.db import models

# Create your models here.
Empty file added piplmesh/formats/__init__.py
Empty file.
Empty file added piplmesh/frontend/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions piplmesh/frontend/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.db import models

# Create your models here.
8 changes: 8 additions & 0 deletions piplmesh/frontend/templates/base.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<html>
<head>
<title>{{ title }}</title>
</head>
<body>
{{ title }}
</body>
</html>
1 change: 1 addition & 0 deletions piplmesh/frontend/templates/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions piplmesh/frontend/templates/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions piplmesh/frontend/templates/home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

16 changes: 16 additions & 0 deletions piplmesh/frontend/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"""
This file demonstrates writing tests using the unittest module. These will pass
when you run "manage.py test".
Replace this with more appropriate tests for your application.
"""

from django.test import TestCase


class SimpleTest(TestCase):
def test_basic_addition(self):
"""
Tests that 1 + 1 always equals 2.
"""
self.assertEqual(1 + 1, 2)
Empty file.
7 changes: 7 additions & 0 deletions piplmesh/frontend/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Create your views here.

from django.http import HttpResponse
from django.shortcuts import render_to_response

def first(request):
return render_to_response('base.html', {'title': 'PiplMesh'})
14 changes: 14 additions & 0 deletions piplmesh/manage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env python
from django.core.management import execute_manager
import imp
try:
imp.find_module('settings') # Assumed to be in the same directory.
except ImportError:
import sys
sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
sys.exit(1)

import settings

if __name__ == "__main__":
execute_manager(settings)
147 changes: 147 additions & 0 deletions piplmesh/settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
# Django settings for piplmesh project.
import os

DEBUG = True
TEMPLATE_DEBUG = DEBUG

ADMINS = (
# ('Your Name', 'your_email@example.com'),
)

MANAGERS = ADMINS

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
'NAME': '', # Or path to database file if using sqlite3.
'USER': '', # Not used with sqlite3.
'PASSWORD': '', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
}
}

# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# On Unix systems, a value of None will cause Django to use the same
# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'America/Chicago'

# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us'

SITE_ID = 1

# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True

# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale
USE_L10N = True

# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/"
MEDIA_ROOT = ''

# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash.
# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
MEDIA_URL = ''

# Absolute path to the directory static files should be collected to.
# Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/"
STATIC_ROOT = ''

# URL prefix for static files.
# Example: "http://media.lawrence.com/static/"
STATIC_URL = '/static/'

# URL prefix for admin static files -- CSS, JavaScript and images.
# Make sure to use a trailing slash.
# Examples: "http://foo.com/static/admin/", "/static/admin/".
ADMIN_MEDIA_PREFIX = '/static/admin/'

# Additional locations of static files
STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)

# List of finder classes that know how to find static files in
# various locations.
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
)

# Make this unique, and don't share it with anybody.
SECRET_KEY = '02dl2nfiacp)87-1g2$=l@b(q5+qs^)qo=byzdvgx+35q)gw&^'

# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.Loader',
)

MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
)

ROOT_URLCONF = 'piplmesh.urls'

TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
os.path.join(os.path.dirname(__file__), 'frontend/templates').replace('\\','/'),
)

INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
# Uncomment the next line to enable the admin:
# 'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
)

# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error.
# See http://docs.djangoproject.com/en/dev/topics/logging for
# more details on how to customize your logging configuration.
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'handlers': {
'mail_admins': {
'level': 'ERROR',
'class': 'django.utils.log.AdminEmailHandler'
}
},
'loggers': {
'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': True,
},
}
}
20 changes: 20 additions & 0 deletions piplmesh/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
from django.conf.urls.defaults import patterns, include, url
from frontend.views import *

# Uncomment the next two lines to enable the admin:
# from django.contrib import admin
# admin.autodiscover()

urlpatterns = patterns('',
('^$', first),
# Examples:
# url(r'^$', 'piplmesh.views.home', name='home'),
# url(r'^piplmesh/', include('piplmesh.foo.urls')),

# Uncomment the admin/doc line below to enable admin documentation:
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),

# Uncomment the next line to enable the admin:
# url(r'^admin/', include(admin.site.urls)),

)
53 changes: 53 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
Django==1.3.1
PyRSS2Gen==1.0.0
Twisted==11.0.0
altgraph==0.7.1
bdist-mpkg==0.4.4
bonjour-py==0.3
include-server==3.1-toolwhip.1
macholib==1.3
modulegraph==0.8.1
numpy==1.5.1
py2app==0.5.3
pyOpenSSL==0.12
pyobjc-core==2.3.2a0
pyobjc-framework-AddressBook==2.3.2a0
pyobjc-framework-AppleScriptKit==2.3.2a0
pyobjc-framework-AppleScriptObjC==2.3.2a0
pyobjc-framework-Automator==2.3.2a0
pyobjc-framework-CFNetwork==2.3.2a0
pyobjc-framework-CalendarStore==2.3.2a0
pyobjc-framework-Cocoa==2.3.2a0
pyobjc-framework-Collaboration==2.3.2a0
pyobjc-framework-CoreData==2.3.2a0
pyobjc-framework-CoreLocation==2.3.2a0
pyobjc-framework-CoreText==2.3.2a0
pyobjc-framework-DictionaryServices==2.3.2a0
pyobjc-framework-ExceptionHandling==2.3.2a0
pyobjc-framework-FSEvents==2.3.2a0
pyobjc-framework-InputMethodKit==2.3.2a0
pyobjc-framework-InstallerPlugins==2.3.2a0
pyobjc-framework-InstantMessage==2.3.2a0
pyobjc-framework-InterfaceBuilderKit==2.3.2a0
pyobjc-framework-LatentSemanticMapping==2.3.2a0
pyobjc-framework-LaunchServices==2.3.2a0
pyobjc-framework-Message==2.3.2a0
pyobjc-framework-OpenDirectory==2.3.2a0
pyobjc-framework-PreferencePanes==2.3.2a0
pyobjc-framework-PubSub==2.3.2a0
pyobjc-framework-QTKit==2.3.2a0
pyobjc-framework-Quartz==2.3.2a0
pyobjc-framework-ScreenSaver==2.3.2a0
pyobjc-framework-ScriptingBridge==2.3.2a0
pyobjc-framework-SearchKit==2.3.2a0
pyobjc-framework-ServerNotification==2.3.2a0
pyobjc-framework-ServiceManagement==2.3.2a0
pyobjc-framework-SyncServices==2.3.2a0
pyobjc-framework-SystemConfiguration==2.3.2a0
pyobjc-framework-WebKit==2.3.2a0
pyobjc-framework-XgridFoundation==2.3.2a0
python-dateutil==1.5
virtualenv==1.7.1.2
wsgiref==0.1.2
xattr==0.6.1
zope.interface==3.5.1