repo string | commit string | message string | diff string |
|---|---|---|---|
ThomasRauch/sample_app | 509273cde9743415861b6da95c948a76bacc86c2 | Done with sign in | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e8065d9..3a1e25c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,5 @@
class ApplicationController < ActionController::Base
protect_from_forgery
+... |
ThomasRauch/sample_app | a25a578787546ff6fe03ee3d07be5dc1d9d45231 | Exercises of chapter 8 | diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a0afd5c..fb516ae 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,23 +1,25 @@
class UsersController < ApplicationController
def new
@user = User.new
@title = "Sign u... |
ThomasRauch/sample_app | 3f54f8d5c02928d0ce13b3d4ca5384945e6793c6 | User signup complete | diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5f43624..a0afd5c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,11 +1,23 @@
class UsersController < ApplicationController
def new
+ @user = User.new
@title = "Sign u... |
ThomasRauch/sample_app | 26ea010efcec01dbccc34523eb86978b8a5407e1 | User model with passwords, and a user show page | diff --git a/Gemfile b/Gemfile
index 39f8b4c..63a343b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,43 +1,45 @@
source 'http://rubygems.org'
gem 'rails', '3.0.0.rc'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'mysql'
+gem 'gravatar_image_tag'
group :development ... |
ThomasRauch/sample_app | eb6b841c6223f3b2f1e4ae91a1d0762e686eac2e | Finished first cut of the User model | diff --git a/Gemfile b/Gemfile
index 7366335..39f8b4c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,42 +1,43 @@
source 'http://rubygems.org'
gem 'rails', '3.0.0.rc'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'mysql'
group :development do
gem 'rspec-rails', '... |
ThomasRauch/sample_app | 7c7d0d6fb98373ec252df9d93545dda076e95438 | Page tests included | diff --git a/spec/requests/layout_links_spec.rb b/spec/requests/layout_links_spec.rb
index 5b968e4..1933ebe 100644
--- a/spec/requests/layout_links_spec.rb
+++ b/spec/requests/layout_links_spec.rb
@@ -1,30 +1,45 @@
require 'spec_helper'
describe "LayoutLinks" do
it "should have a Home page at '/'" do
get ... |
ThomasRauch/sample_app | 972801258d38315c918cd559e12c34a44c71197c | Template for the logo | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3447a72..68105b2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,13 +1,19 @@
module ApplicationHelper
+ #Return a logo
+ def logo
+ image_tag("logo.png", :alt => "sampleApp", :cl... |
ThomasRauch/sample_app | 21002cd3566568f1e503e7c0efa928d7ff9c656e | Finished layout and routes | diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..11a6a5e
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,6 @@
+class UsersController < ApplicationController
+ def new
+ @title = "Sign up"
+ end
+
+end
diff --git a/app/help... |
ThomasRauch/sample_app | 901cf35c8efaa6bca34bc1257dc8fc32fdb7f476 | Just for a test | diff --git a/public/stylesheets/custom.css b/public/stylesheets/custom.css
index 2c02079..2c81081 100644
--- a/public/stylesheets/custom.css
+++ b/public/stylesheets/custom.css
@@ -1,111 +1,112 @@
.container {
width: 710px;
}
body {
background: #cff;
}
header {
padding-top: 20px;
}
header img {
... |
ThomasRauch/sample_app | 2c4093a13e47be98800307731efa7fb44bc0b60f | Removed default Rails page | diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
new file mode 100644
index 0000000..db551d2
--- /dev/null
+++ b/app/views/layouts/_footer.html.erb
@@ -0,0 +1,10 @@
+<footer>
+ <nav class="round">
+ <ul>
+ <li><%= link_to "About", '#' %></li>
+ <li><%= link_to "Contact"... |
ThomasRauch/sample_app | 9df36d5660eff89ccbe780d863a1bb49a2536be1 | Add the blueprint css | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be79..3447a72 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,13 @@
module ApplicationHelper
+
+ #Return a title on a per-page basis.
+ def title
+ base_title = "SampleApp"... |
ThomasRauch/sample_app | 1b5b1b1707aa4dccdf7bb70b505d0b9ea4a41969 | Exercise b: The base_title... | diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
index b91023e..6fa73ca 100644
--- a/spec/controllers/pages_controller_spec.rb
+++ b/spec/controllers/pages_controller_spec.rb
@@ -1,50 +1,54 @@
require 'spec_helper'
describe PagesController do
render_views
+
+ ... |
ThomasRauch/sample_app | 02b7f85995c9af129a6e0ab3c9090edfba263416 | Exercise a, the Helppage done | diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 18ea3c5..7315f6d 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,14 +1,18 @@
class PagesController < ApplicationController
def home
@title = "Home"
end
def conta... |
ThomasRauch/sample_app | 4ee0afdb1fea154ad1d8343d79a94d2543dc2f35 | Done with static pages | diff --git a/Gemfile b/Gemfile
index 2e41658..7366335 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,41 +1,42 @@
source 'http://rubygems.org'
gem 'rails', '3.0.0.rc'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'mysql'
group :development do
gem 'rspec-rails', '... |
ThomasRauch/sample_app | fb70d2f89c2103169e6fffc626bd64293369f364 | Added a Pages controller | diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
new file mode 100644
index 0000000..5635120
--- /dev/null
+++ b/app/controllers/pages_controller.rb
@@ -0,0 +1,8 @@
+class PagesController < ApplicationController
+ def home
+ end
+
+ def contact
+ end
+
+end
diff --git a/app/hel... |
zonque/PulseAudioOSX | fa9ea140b4d1df5fa296cf70bffd10b1db94a547 | changed CC=gcc-4.2 to CC=gcc, to work on OS X 10.8.x | diff --git a/deploy/build_pulseaudio.sh b/deploy/build_pulseaudio.sh
index 9a1b932..4f7c931 100755
--- a/deploy/build_pulseaudio.sh
+++ b/deploy/build_pulseaudio.sh
@@ -1,35 +1,35 @@
#!/bin/sh
#
# This needs to be in its own script, as the other parts of the build system
# don't like to have environment variables... |
zonque/PulseAudioOSX | 75b5c251b056f88e33d7de9fc031892080bae001 | Fixed broken dependency for loop. | diff --git a/deploy/bootstrap_machine.sh b/deploy/bootstrap_machine.sh
index 7909757..9a9d62b 100755
--- a/deploy/bootstrap_machine.sh
+++ b/deploy/bootstrap_machine.sh
@@ -1,14 +1,14 @@
#!/bin/sh
-PORTS="autoconf automake intltool libtool libsndfile speex-devel gdbm liboil json-c; do sudo port install"
+PORTS="auto... |
zonque/PulseAudioOSX | 1986e9645161db00b56d837c44f99456c162f9e2 | PulseConsole: fix display of PASourceOutputInfo items | diff --git a/PulseConsole/Introspect.m b/PulseConsole/Introspect.m
index aa71b08..41f50e9 100644
--- a/PulseConsole/Introspect.m
+++ b/PulseConsole/Introspect.m
@@ -1,594 +1,594 @@
/***
This file is part of PulseConsole
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseConsole is free software; y... |
zonque/PulseAudioOSX | f9f017d39156662802aff7d7b39fc9f32668ecf5 | Framework, HALPlugin: work towards configurable number of channels | diff --git a/Framework/PAServerConnection.h b/Framework/PAServerConnection.h
index 1b42d49..93d14c0 100644
--- a/Framework/PAServerConnection.h
+++ b/Framework/PAServerConnection.h
@@ -1,172 +1,173 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioO... |
zonque/PulseAudioOSX | f95297594935be1c7cf965bf4c449995edd77984 | HALPlugin: some comments about FIXMEs | diff --git a/HALPlugin/Source/PADeviceAudio.m b/HALPlugin/Source/PADeviceAudio.m
index 998dfa2..914660b 100644
--- a/HALPlugin/Source/PADeviceAudio.m
+++ b/HALPlugin/Source/PADeviceAudio.m
@@ -1,284 +1,282 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
Pul... |
zonque/PulseAudioOSX | dbb41078906d064f77a59d30e540acfbdfa368f8 | version 1.pre7 | diff --git a/deploy/version.inc b/deploy/version.inc
index 3aa1cff..ebc2c56 100644
--- a/deploy/version.inc
+++ b/deploy/version.inc
@@ -1,2 +1,2 @@
-version=1.pre6
+version=1.pre7
|
zonque/PulseAudioOSX | 8e0fb4343a1474881630c26fe8e23054bf4a5c1f | deploy: make fixup_framework work again | diff --git a/deploy/fixup_framework.sh b/deploy/fixup_framework.sh
index 0a06a4c..779f9a3 100755
--- a/deploy/fixup_framework.sh
+++ b/deploy/fixup_framework.sh
@@ -1,124 +1,109 @@
#!/bin/sh
#
# This script is intended to copy resources from the PulseAudio installation
# location to the Framework bundle and make ... |
zonque/PulseAudioOSX | 9ef024bce5547b6f02b7bc1a0b63e810c8d42bf6 | version 1.pre6 | diff --git a/deploy/version.inc b/deploy/version.inc
index 290c9f4..3aa1cff 100644
--- a/deploy/version.inc
+++ b/deploy/version.inc
@@ -1,2 +1,2 @@
-version=1.pre5
+version=1.pre6
|
zonque/PulseAudioOSX | 282d056b867ad522c8879b422ac03d418d2b2f6b | delete one more reference to /opt/local/pulseaudio | diff --git a/Framework/PulseAudio.xcodeproj/project.pbxproj b/Framework/PulseAudio.xcodeproj/project.pbxproj
index 3fb8fec..ec7a017 100644
--- a/Framework/PulseAudio.xcodeproj/project.pbxproj
+++ b/Framework/PulseAudio.xcodeproj/project.pbxproj
@@ -1,509 +1,509 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
... |
zonque/PulseAudioOSX | 15a815c496a8ea20d76bc51edcb6870fbd30e0a5 | version 1.pre5 | diff --git a/deploy/version.inc b/deploy/version.inc
index 9da0059..290c9f4 100644
--- a/deploy/version.inc
+++ b/deploy/version.inc
@@ -1,2 +1,2 @@
-version=1.pre3
+version=1.pre5
|
zonque/PulseAudioOSX | 205acdf0e8fb660b00ca8975d2383e3b225ac074 | deploy/build.sh: fix the install logic | diff --git a/deploy/build.sh b/deploy/build.sh
index b88b3d2..e584be1 100755
--- a/deploy/build.sh
+++ b/deploy/build.sh
@@ -1,67 +1,70 @@
#!/bin/sh
targetdir=$1
if [ -z "${targetdir}" ]; then
echo "Usage: $0 [targetdir]"
exit 1
fi
set -x
set -e
function XcodeBuild()
{
proj=$1; shift
xcodebuild ... |
zonque/PulseAudioOSX | bfdf2d524b53ac813e7ee89d74850f5f5f4418b0 | PAHelper: use a better name for the preferences file | diff --git a/PulseAudioHelper/Preferences.m b/PulseAudioHelper/Preferences.m
index 1338f34..557e7e8 100644
--- a/PulseAudioHelper/Preferences.m
+++ b/PulseAudioHelper/Preferences.m
@@ -1,141 +1,141 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioO... |
zonque/PulseAudioOSX | 905c1802688e0e35883a4ddf512623b89843fb79 | deploy: use pa version 1.98 | diff --git a/PulseAudioHelper/ServerTask.m b/PulseAudioHelper/ServerTask.m
index f1a6e36..ddfe155 100644
--- a/PulseAudioHelper/ServerTask.m
+++ b/PulseAudioHelper/ServerTask.m
@@ -1,82 +1,82 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is ... |
zonque/PulseAudioOSX | 1324038e44c5d240c6b6a157fb68818600e1cf4f | PAHelper: Add a "copy file" phase to the application's target | diff --git a/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj b/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
index e040b42..3ac98ac 100644
--- a/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
+++ b/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
@@ -1,332 +1,345 @@
//... |
zonque/PulseAudioOSX | 15327631617a7ac197933cdff1df1853de0f4986 | version 1.pre3 | diff --git a/deploy/version.inc b/deploy/version.inc
index 3cbcae1..9da0059 100644
--- a/deploy/version.inc
+++ b/deploy/version.inc
@@ -1,2 +1,2 @@
-version=1.pre2
+version=1.pre3
|
zonque/PulseAudioOSX | 65844c9967cc4384655a2642ffbd226a14c70bf4 | PulseConsole: disable unused GUI elements | diff --git a/PulseConsole/StreamView.m b/PulseConsole/StreamView.m
index 366c76b..c105eac 100644
--- a/PulseConsole/StreamView.m
+++ b/PulseConsole/StreamView.m
@@ -1,271 +1,275 @@
/***
This file is part of PulseConsole
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseConsole is free software; y... |
zonque/PulseAudioOSX | 2f6fd70aef4d4b8c41623e63c4241a3d285b133f | PAHelper: mark Growl.framework as Copy Bundle Resource | diff --git a/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj b/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
index 90aa554..e040b42 100644
--- a/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
+++ b/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
@@ -1,330 +1,332 @@
//... |
zonque/PulseAudioOSX | a308fa2f3f866cec09ace9f632863f545118d8cc | deploy: added bootstrap_machine.sh | diff --git a/deploy/bootstrap_machine.sh b/deploy/bootstrap_machine.sh
new file mode 100755
index 0000000..7909757
--- /dev/null
+++ b/deploy/bootstrap_machine.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+PORTS="autoconf automake intltool libtool libsndfile speex-devel gdbm liboil json-c; do sudo port install"
+
+for port in $POR... |
zonque/PulseAudioOSX | 826c5ec34f32f6a8a2e9a89e7a066a5ed7eff08f | version 1.pre2 | diff --git a/deploy/version.inc b/deploy/version.inc
index 3352bc5..3cbcae1 100644
--- a/deploy/version.inc
+++ b/deploy/version.inc
@@ -1,2 +1,2 @@
-version=1.pre1
+version=1.pre2
|
zonque/PulseAudioOSX | ceb444bdbcf039ed92a30a86a1242bd2267c9a75 | PAHelper: forgot to add two files earlier | diff --git a/PulseAudioHelper/LoginItemController.h b/PulseAudioHelper/LoginItemController.h
new file mode 100644
index 0000000..98fe02d
--- /dev/null
+++ b/PulseAudioHelper/LoginItemController.h
@@ -0,0 +1,34 @@
+/*
+ The MIT License
+ Copyright (c) 2010 Justin Williams, Second Gear
+ Permission is hereby granted, fre... |
zonque/PulseAudioOSX | 8e7f54cabbacbc8690279f6bac8290c7fc1ae3f2 | PAHelper: don't ship AppKit.framework | diff --git a/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj b/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
index 8c34941..90aa554 100644
--- a/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
+++ b/PulseAudioHelper/PulseAudioHelper.xcodeproj/project.pbxproj
@@ -1,332 +1,330 @@
//... |
zonque/PulseAudioOSX | b4e1a0ceaec45b11259b1f5c01d3951a4e44ac6d | deploy: move PulseAudioHelper.app | diff --git a/Framework/install.sh b/Framework/install.sh
index 4880244..d2e7def 100755
--- a/Framework/install.sh
+++ b/Framework/install.sh
@@ -1,10 +1,11 @@
#!/bin/sh
name=PulseAudio.framework
dest=/Library/Frameworks/
config=Release
test -d $dest/$name || mkdir $dest/$name
cp -a build/$config/$name/* $dest... |
zonque/PulseAudioOSX | 8e9886ab74536e769b0d73aa1e7545af1351402d | deploy: remove some installer scripts and call PackageMaker with --no-relocate | diff --git a/deploy/InstallerResources/postupgrade b/deploy/InstallerResources/postupgrade
deleted file mode 100755
index 8794673..0000000
--- a/deploy/InstallerResources/postupgrade
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-open /Library/Frameworks/PulseAudio.framework/Resources/PulseAudioHelper.app
-
diff --git a/d... |
zonque/PulseAudioOSX | 04a873a9bc47c5490e18b3c47abfb4ceaec3611e | PulseConsole: don't ship AppKit.framework | diff --git a/PulseConsole/PulseConsole.xcodeproj/project.pbxproj b/PulseConsole/PulseConsole.xcodeproj/project.pbxproj
index 0004ac6..787ec45 100644
--- a/PulseConsole/PulseConsole.xcodeproj/project.pbxproj
+++ b/PulseConsole/PulseConsole.xcodeproj/project.pbxproj
@@ -1,367 +1,365 @@
// !$*UTF8*$!
{
archiveVersion ... |
zonque/PulseAudioOSX | 1fb6c9e346c7e92ebc932dc6fb740654b5ce2cb0 | HALPlugin: don't wait for main thread dispatching on DeviceStart | diff --git a/HALPlugin/Source/PADevice.m b/HALPlugin/Source/PADevice.m
index 237a47b..5456799 100644
--- a/HALPlugin/Source/PADevice.m
+++ b/HALPlugin/Source/PADevice.m
@@ -1,869 +1,869 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is free s... |
zonque/PulseAudioOSX | e8c84f1d83f22f7d88f9b850b96017379b976dcf | deploy: add installer scripts | diff --git a/deploy/InstallerResources/postinstall b/deploy/InstallerResources/postinstall
new file mode 100755
index 0000000..8794673
--- /dev/null
+++ b/deploy/InstallerResources/postinstall
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+open /Library/Frameworks/PulseAudio.framework/Resources/PulseAudioHelper.app
+
diff --git a/deplo... |
zonque/PulseAudioOSX | cc4a7c55266498eba1b719d2cf8a8d2efe0d13b9 | PreferencePane: removed LoginItemController code | diff --git a/PreferencePane/English.lproj/PAPreferencePane.nib/designable.nib b/PreferencePane/English.lproj/PAPreferencePane.nib/designable.nib
index db568fe..1787433 100644
--- a/PreferencePane/English.lproj/PAPreferencePane.nib/designable.nib
+++ b/PreferencePane/English.lproj/PAPreferencePane.nib/designable.nib
@@ ... |
zonque/PulseAudioOSX | 1f79997a9e9e201a673b70bc75ab7aa1c7c33fb4 | Framework: create $framework/Contents/MacOS | diff --git a/Framework/install.sh b/Framework/install.sh
index c15110c..4880244 100755
--- a/Framework/install.sh
+++ b/Framework/install.sh
@@ -1,9 +1,10 @@
#!/bin/sh
name=PulseAudio.framework
dest=/Library/Frameworks/
config=Release
test -d $dest/$name || mkdir $dest/$name
cp -a build/$config/$name/* $dest/... |
zonque/PulseAudioOSX | daef19c91a4f3ca2a8ca3ba69864f2b819407a00 | PulseAudioHelper: move the LoginItemController | diff --git a/PulseAudioHelper/ConnectionServer.h b/PulseAudioHelper/ConnectionServer.h
index b0e1b87..19de6f6 100644
--- a/PulseAudioHelper/ConnectionServer.h
+++ b/PulseAudioHelper/ConnectionServer.h
@@ -1,37 +1,40 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de... |
zonque/PulseAudioOSX | 2bac8f3f4b015e87a9e94668523beb159bde7083 | deploy/build_pulseaudio.sh: change prefix path | diff --git a/deploy/build_pulseaudio.sh b/deploy/build_pulseaudio.sh
index a13c606..9a1b932 100755
--- a/deploy/build_pulseaudio.sh
+++ b/deploy/build_pulseaudio.sh
@@ -1,35 +1,35 @@
#!/bin/sh
#
# This needs to be in its own script, as the other parts of the build system
# don't like to have environment variables... |
zonque/PulseAudioOSX | 5488a541369b527f930d6ac0463378e7905e4fe6 | deploy/fixup_framework.sh: fixes and simplifications | diff --git a/deploy/fixup_framework.sh b/deploy/fixup_framework.sh
index d7668e8..2c9e138 100755
--- a/deploy/fixup_framework.sh
+++ b/deploy/fixup_framework.sh
@@ -1,119 +1,129 @@
#!/bin/sh
#
# This script is intended to copy resources from the PulseAudio installation
# location to the Framework bundle and make ... |
zonque/PulseAudioOSX | 882423f9456a9a44122af41f0dcbfcd39b4d7c39 | deploy/fixup_framework: install stuff to $framework/Contents/MacOS | diff --git a/deploy/fixup_framework.sh b/deploy/fixup_framework.sh
index bf1e353..d7668e8 100755
--- a/deploy/fixup_framework.sh
+++ b/deploy/fixup_framework.sh
@@ -1,120 +1,119 @@
#!/bin/sh
#
# This script is intended to copy resources from the PulseAudio installation
# location to the Framework bundle and make ... |
zonque/PulseAudioOSX | 9f24135b88f4269c874b764027929415d3040690 | version 1.pre1 | diff --git a/deploy/version.inc b/deploy/version.inc
index f0c2f11..3352bc5 100644
--- a/deploy/version.inc
+++ b/deploy/version.inc
@@ -1,2 +1,2 @@
-version=0.2.0
+version=1.pre1
|
zonque/PulseAudioOSX | 00700e6b1dd66bf222e6ecd6dd074cd7b3811f5b | PAHelper: start the server backend | diff --git a/PulseAudioHelper/ServerTask.m b/PulseAudioHelper/ServerTask.m
index 2ed418d..e09bef6 100644
--- a/PulseAudioHelper/ServerTask.m
+++ b/PulseAudioHelper/ServerTask.m
@@ -1,86 +1,82 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is ... |
zonque/PulseAudioOSX | 769e8d85486b8b805255db4a783076de644bdf67 | deploy/fixup_framework.sh: don't change the name of the PulseAudio library itself | diff --git a/deploy/fixup_framework.sh b/deploy/fixup_framework.sh
index 8c94a88..bf1e353 100755
--- a/deploy/fixup_framework.sh
+++ b/deploy/fixup_framework.sh
@@ -1,119 +1,120 @@
#!/bin/sh
#
# This script is intended to copy resources from the PulseAudio installation
# location to the Framework bundle and make ... |
zonque/PulseAudioOSX | 871b12a85892f6ee5102763112a856757debac99 | PulseAudioHelper: pass --exit-idle-time=-1 to server | diff --git a/PulseAudioHelper/ServerTask.m b/PulseAudioHelper/ServerTask.m
index 97de543..2ed418d 100644
--- a/PulseAudioHelper/ServerTask.m
+++ b/PulseAudioHelper/ServerTask.m
@@ -1,85 +1,86 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is ... |
zonque/PulseAudioOSX | 719232a4323388f2180cf490a2375f9eb95f095d | HALPlugin: less debug output | diff --git a/HALPlugin/Source/PADevice.m b/HALPlugin/Source/PADevice.m
index 8097cdb..237a47b 100644
--- a/HALPlugin/Source/PADevice.m
+++ b/HALPlugin/Source/PADevice.m
@@ -1,611 +1,606 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is free s... |
zonque/PulseAudioOSX | 8379be39f07b8fabd51236d8f5f358dfb4b9c0fe | tree-wide: more build environment fixes | diff --git a/Framework/PulseAudio.xcodeproj/project.pbxproj b/Framework/PulseAudio.xcodeproj/project.pbxproj
index 036aaa4..3fb8fec 100644
--- a/Framework/PulseAudio.xcodeproj/project.pbxproj
+++ b/Framework/PulseAudio.xcodeproj/project.pbxproj
@@ -1,507 +1,509 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
... |
zonque/PulseAudioOSX | 437cfcb4ca1a9cd19a2246c02a53a0c0e0abd190 | Framework: assume socket is connected when CFSocketConnectToAddress() returns 0 | diff --git a/Framework/PAHelperConnection.m b/Framework/PAHelperConnection.m
index 1ca30e1..5842a93 100644
--- a/Framework/PAHelperConnection.m
+++ b/Framework/PAHelperConnection.m
@@ -1,222 +1,222 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioO... |
zonque/PulseAudioOSX | dee6119f130f8592cf78e1a730f3a2d9abe7fb56 | PulseConsole: fix build settings, address coding style issues | diff --git a/PulseConsole/DocumentController.h b/PulseConsole/DocumentController.h
index 1dd4c03..856d51a 100644
--- a/PulseConsole/DocumentController.h
+++ b/PulseConsole/DocumentController.h
@@ -1,32 +1,35 @@
/***
This file is part of PulseConsole.
-
+
Copyright 2009-2011 Daniel Mack <pulseaudio@zonque.de>
-
+ ... |
zonque/PulseAudioOSX | 3494b2f3a1fee7a7d07fb54b8aba6017e517bdfd | HALPlugin: fix a race condition in disconnectFromServer and the IOProc tracker logic | diff --git a/HALPlugin/Source/PADevice.m b/HALPlugin/Source/PADevice.m
index 4857a59..8097cdb 100644
--- a/HALPlugin/Source/PADevice.m
+++ b/HALPlugin/Source/PADevice.m
@@ -1,609 +1,619 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is free s... |
zonque/PulseAudioOSX | dff79c1fa76b5bfcc30cdb31d49a103a91f4b797 | Framework: retain the lastError object, so GC won't kill it behind our back | diff --git a/Framework/PAServerConnectionImplementation.m b/Framework/PAServerConnectionImplementation.m
index b72a9c4..b28a1fa 100644
--- a/Framework/PAServerConnectionImplementation.m
+++ b/Framework/PAServerConnectionImplementation.m
@@ -1,576 +1,576 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,... |
zonque/PulseAudioOSX | 3811576d85b0f8ab7a7a0a1c0eb3d55eb663a2cb | deploy: never version of PA seem to use a different location path for modules | diff --git a/deploy/fixup_framework.sh b/deploy/fixup_framework.sh
index 202bae1..8c94a88 100755
--- a/deploy/fixup_framework.sh
+++ b/deploy/fixup_framework.sh
@@ -1,119 +1,119 @@
#!/bin/sh
#
# This script is intended to copy resources from the PulseAudio installation
# location to the Framework bundle and make ... |
zonque/PulseAudioOSX | d91d4a1cf2e794cdc33a95badbf967edc64017dd | Framework: remove some debug output and fix coding style | diff --git a/Framework/PAHelperConnection.h b/Framework/PAHelperConnection.h
index 8924cd5..5f0d021 100644
--- a/Framework/PAHelperConnection.h
+++ b/Framework/PAHelperConnection.h
@@ -1,71 +1,70 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX... |
zonque/PulseAudioOSX | 9a09db17633c214c8a85ad055c67cfce4798e954 | HALPlugin: remove hackish log method | diff --git a/HALPlugin/Source/PAPlugin.m b/HALPlugin/Source/PAPlugin.m
index 3cfa139..d891243 100644
--- a/HALPlugin/Source/PAPlugin.m
+++ b/HALPlugin/Source/PAPlugin.m
@@ -1,709 +1,689 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is free s... |
zonque/PulseAudioOSX | 99904377f65156218206210b552dca32952f4a30 | PulseAudioHelper: tweak the socket's permissions | diff --git a/PulseAudioHelper/ConnectionClient.h b/PulseAudioHelper/ConnectionClient.h
index d933348..c68072b 100644
--- a/PulseAudioHelper/ConnectionClient.h
+++ b/PulseAudioHelper/ConnectionClient.h
@@ -1,52 +1,50 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de... |
zonque/PulseAudioOSX | d9fd01d11cc308b419930a1ba126eba100813f29 | HALPlugin: CodingStyle | diff --git a/HALPlugin/HALPlugin.xcodeproj/project.pbxproj b/HALPlugin/HALPlugin.xcodeproj/project.pbxproj
index 9f6811f..c8a49ed 100644
--- a/HALPlugin/HALPlugin.xcodeproj/project.pbxproj
+++ b/HALPlugin/HALPlugin.xcodeproj/project.pbxproj
@@ -1,348 +1,350 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
... |
zonque/PulseAudioOSX | 7cd8aefd1f6f1c314f422d382df8306bbb962274 | Framework: CodingStyle related issues | diff --git a/Framework/PACardInfo.h b/Framework/PACardInfo.h
index 287eb28..8360301 100644
--- a/Framework/PACardInfo.h
+++ b/Framework/PACardInfo.h
@@ -1,24 +1,24 @@
/***
This file is part of PulseAudioOSX
-
+
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
-
+
PulseAudioOSX is free software; you can r... |
zonque/PulseAudioOSX | b5b3d71afc797f6faae6ae6ee03d0ffbc3b9af97 | PulseAudioHelper: more CodingStyle related stuff | diff --git a/PulseAudioHelper/ConnectionClient.h b/PulseAudioHelper/ConnectionClient.h
index 6738b56..d933348 100644
--- a/PulseAudioHelper/ConnectionClient.h
+++ b/PulseAudioHelper/ConnectionClient.h
@@ -1,52 +1,52 @@
/***
This file is part of PulseAudioOSX
-
+
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.... |
zonque/PulseAudioOSX | a89343bd9d6961ef3d3a6fdc3895c328175ba190 | PreferencePane: some more "SetAudioClientConfig" related issues | diff --git a/PreferencePane/AudioClients.m b/PreferencePane/AudioClients.m
index b777a2a..5901a96 100644
--- a/PreferencePane/AudioClients.m
+++ b/PreferencePane/AudioClients.m
@@ -1,316 +1,320 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is ... |
zonque/PulseAudioOSX | deae43537f7a9febf6f511228cbb093a3614944e | HALPlugin: some debugging refinements | diff --git a/HALPlugin/Source/PAPlugInInterface.m b/HALPlugin/Source/PAPlugInInterface.m
index 32e538a..6f34839 100644
--- a/HALPlugin/Source/PAPlugInInterface.m
+++ b/HALPlugin/Source/PAPlugInInterface.m
@@ -1,489 +1,491 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonq... |
zonque/PulseAudioOSX | 64622a9d1ebf0476159abc41402b34b9fed3e46d | PulseAudioHelper: implemented "SetAudioDeviceConfig" functions | diff --git a/PulseAudioHelper/ConnectionClient.h b/PulseAudioHelper/ConnectionClient.h
index a1921af..6738b56 100644
--- a/PulseAudioHelper/ConnectionClient.h
+++ b/PulseAudioHelper/ConnectionClient.h
@@ -1,47 +1,52 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>... |
zonque/PulseAudioOSX | d78698e74da6d9df06e30e6296651a93c9503f81 | PulseConsole: removed a usage of deprecated APIs | diff --git a/PulseConsole/Introspect.m b/PulseConsole/Introspect.m
index 8c6395b..9d5613c 100644
--- a/PulseConsole/Introspect.m
+++ b/PulseConsole/Introspect.m
@@ -1,594 +1,594 @@
/***
This file is part of PulseConsole
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseConsole is free software; you... |
zonque/PulseAudioOSX | 653ec02bb64ed582d98e37fcc490b94ae2c473a8 | PreferencePane: working on audio client configuration code | diff --git a/PreferencePane/PreferencePane.m b/PreferencePane/PreferencePane.m
index 6bd1520..2b86a4b 100644
--- a/PreferencePane/PreferencePane.m
+++ b/PreferencePane/PreferencePane.m
@@ -1,127 +1,133 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudi... |
zonque/PulseAudioOSX | c9b252700ce2cb434be1aa78146a791811818827 | PulseAudioHelper: restucture client code a bit | diff --git a/PulseAudioHelper/ConnectionClient.h b/PulseAudioHelper/ConnectionClient.h
index 054ff2b..a1921af 100644
--- a/PulseAudioHelper/ConnectionClient.h
+++ b/PulseAudioHelper/ConnectionClient.h
@@ -1,46 +1,47 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>... |
zonque/PulseAudioOSX | b1603111ebb9ff1aba59b8e9ba9b12f548cf0412 | HALPlugin: follow recent API changes | diff --git a/HALPlugin/Source/PADevice.m b/HALPlugin/Source/PADevice.m
index ab5420c..10ceefa 100644
--- a/HALPlugin/Source/PADevice.m
+++ b/HALPlugin/Source/PADevice.m
@@ -1,638 +1,638 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX is free sof... |
zonque/PulseAudioOSX | c2bb927dfbdd31f70d70cb7c01c53dcfd1a79345 | Framework: fix message dispatching | diff --git a/Framework/PAHelperConnection.h b/Framework/PAHelperConnection.h
index 0f51e7a..4a89689 100644
--- a/Framework/PAHelperConnection.h
+++ b/Framework/PAHelperConnection.h
@@ -1,69 +1,71 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioOSX i... |
zonque/PulseAudioOSX | 52f146bc6d411e9b54e249a484b55d1d5550cf99 | deploy: fix recently introduced regression to fixup_framework.sh | diff --git a/deploy/fixup_framework.sh b/deploy/fixup_framework.sh
index 6bc8029..202bae1 100755
--- a/deploy/fixup_framework.sh
+++ b/deploy/fixup_framework.sh
@@ -1,115 +1,119 @@
#!/bin/sh
#
# This script is intended to copy resources from the PulseAudio installation
# location to the Framework bundle and make ... |
zonque/PulseAudioOSX | bf38d8b93fa7afbd13ac8b27451345c925939869 | PreferencePane: adopt to new IPC | diff --git a/PreferencePane/PreferencePane.h b/PreferencePane/PreferencePane.h
index eebc6d5..ba5624d 100644
--- a/PreferencePane/PreferencePane.h
+++ b/PreferencePane/PreferencePane.h
@@ -1,57 +1,56 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>
PulseAudioO... |
zonque/PulseAudioOSX | f5d8a78cc579fafbe8c32e51ef7d2c6e5399ea11 | PulseAudioHelper: adopt new IPC | diff --git a/PulseAudioHelper/ConnectionClient.h b/PulseAudioHelper/ConnectionClient.h
index b96f271..054ff2b 100644
--- a/PulseAudioHelper/ConnectionClient.h
+++ b/PulseAudioHelper/ConnectionClient.h
@@ -1,34 +1,46 @@
/***
This file is part of PulseAudioOSX
Copyright 2010,2011 Daniel Mack <pulseaudio@zonque.de>... |
zonque/PulseAudioOSX | 73103fede2861520580e7a47c8c1550fcc908880 | HALPlugin: adopt new IPC model | diff --git a/HALPlugin/Resources/Info.plist b/HALPlugin/Resources/Info.plist
index 162ef5a..78c6a9b 100644
--- a/HALPlugin/Resources/Info.plist
+++ b/HALPlugin/Resources/Info.plist
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/... |
facetcounter/stars | 40b119ff3e54c1ac55c6f94f07eb62a5dd232c67 | added that westarn tang | diff --git a/README b/README
index 4f26143..104c572 100644
--- a/README
+++ b/README
@@ -1,5 +1,6 @@
This is a test repo.
This is a file I found on my desktop.
It is a field of stars.
It was generated by a program, which I vaguely remember writing, but I can't find the program anymore :(
+Code blows in and out th... |
facetcounter/stars | bcc6686903cbc07653312a140b690a3a25b47b27 | added readme | diff --git a/README b/README
new file mode 100644
index 0000000..4f26143
--- /dev/null
+++ b/README
@@ -0,0 +1,5 @@
+This is a test repo.
+This is a file I found on my desktop.
+It is a field of stars.
+It was generated by a program, which I vaguely remember writing, but I can't find the program anymore :(
+
|
tamc/twenty-fifty | 7d21946df3c7156cfbea30501f6632db0240a7e9 | Fixed bug in the illustrative pathway urls when comparing levels of effort | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 17da5a0..378e57a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,122 +1,127 @@
# Methods added to this helper will be available to all templates in the application.
module ApplicationH... |
tamc/twenty-fifty | 559821dece05874559e84c3fbbd151d96ce0957d | Repositioned tooltips to top-left of cell (fixing issue #6), size with ems (fixing issue #7) and draw using css (making loading better) | diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml
index 7af90ae..8e673ac 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.haml
@@ -1,26 +1,19 @@
!!! Transitional
%html{ "xml:lang" => "en", :lang => "en", :xmlns => "http://www.w3.org/1999/xhtml" }
... |
tamc/twenty-fifty | 42746e33ea663b4a3f9a90a95b556f37a710a6a1 | Improved the message in run.sh | diff --git a/run.sh b/run.sh
index 977f10e..2a7031d 100644
--- a/run.sh
+++ b/run.sh
@@ -1,14 +1,15 @@
#!/usr/bin/env bash
ruby='ruby'
rake='rake'
$rake jobs:work RAILS_ENV=production &
$rake jobs:work RAILS_ENV=production &
$ruby script/server -e production &
echo
echo "2050 Server"
+echo "When you see INFO ... |
tamc/twenty-fifty | a25cbc3c7378bd628e55753798d5d7a31cb0404b | Remove the reference to the google.js file | diff --git a/app/views/layouts/document.haml b/app/views/layouts/document.haml
index e9c6f79..1fb1f39 100644
--- a/app/views/layouts/document.haml
+++ b/app/views/layouts/document.haml
@@ -1,14 +1,13 @@
!!! Transitional
%html{ "xml:lang" => "en", :lang => "en", :xmlns => "http://www.w3.org/1999/xhtml" }
%head
... |
tamc/twenty-fifty | 68432ba34c0aea352f5d1aad7a7692bdc0ecb77e | Added missing _changes file | diff --git a/app/views/document/_changes.html.haml b/app/views/document/_changes.html.haml
new file mode 100644
index 0000000..0e13cba
--- /dev/null
+++ b/app/views/document/_changes.html.haml
@@ -0,0 +1,4 @@
+%ul
+ %li 30 July 2010 — Updated the links to the call for evidence; added a Q and A on negative emissi... |
tamc/twenty-fifty | 59304b81f673169fb6e75afe950d969ef932e4dc | Added libxslt-dev libxml2-dev dependencies | diff --git a/bootstrap_on_ubuntu.sh b/bootstrap_on_ubuntu.sh
index f63bb20..12dd196 100644
--- a/bootstrap_on_ubuntu.sh
+++ b/bootstrap_on_ubuntu.sh
@@ -1,10 +1,10 @@
#!/bin/bash
# On Ubuntu 10.04 (and potentially other deb based linux systems)
# This script downloads the required libraries
# and then starts the ca... |
tamc/twenty-fifty | 887bf3b97ad35eae7200bb460bd315557b13c611 | Removed the (now obsolete) check for the vendored gems directory | diff --git a/bootstrap_on_ubuntu.sh b/bootstrap_on_ubuntu.sh
index 8a8c4a6..f63bb20 100644
--- a/bootstrap_on_ubuntu.sh
+++ b/bootstrap_on_ubuntu.sh
@@ -1,15 +1,10 @@
#!/bin/bash
# On Ubuntu 10.04 (and potentially other deb based linux systems)
# This script downloads the required libraries
# and then starts the ca... |
tamc/twenty-fifty | f51237a6bd0f32a9c0a5a6bba21b4e3aabfe375b | Changed the urls used for the call for evidence | diff --git a/app/controllers/document_controller.rb b/app/controllers/document_controller.rb
index b84396f..ec35386 100644
--- a/app/controllers/document_controller.rb
+++ b/app/controllers/document_controller.rb
@@ -1,12 +1,18 @@
class DocumentController < ApplicationController
+ def call_for_evidence_response
+... |
tamc/twenty-fifty | 3478700b3391e3738ae48f98aec1ac6b4b90ea75 | Fixed typos on the front page and sector pages | diff --git a/app/views/document/_short_help.html.haml b/app/views/document/_short_help.html.haml
index 77b1eb7..412fc38 100644
--- a/app/views/document/_short_help.html.haml
+++ b/app/views/document/_short_help.html.haml
@@ -1,53 +1,53 @@
= link_to image_tag("2050Tutorial.jpg", :border=>0, :alt => "download a quick vi... |
tamc/twenty-fifty | b1e75dff6d062fe0315efa0efdad053b0b20b0a9 | Added a publicly viewable changelog | diff --git a/app/views/document/help.html.haml b/app/views/document/help.html.haml
index 21c7ba7..e700531 100644
--- a/app/views/document/help.html.haml
+++ b/app/views/document/help.html.haml
@@ -1,69 +1,72 @@
%h1 How to use this tool
%p.link_back= link_to 'Return to the calculator', primary_energy_chart_pathway_u... |
tamc/twenty-fifty | d5a66a1dfaa174b168bcbe80af3ab994783ff868 | Added links to the pathways mentioned in the call for evidence report | diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml
index 9b48837..7af90ae 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.haml
@@ -1,23 +1,26 @@
!!! Transitional
%html{ "xml:lang" => "en", :lang => "en", :xmlns => "http://www.w3.org/1999/xhtml" }
... |
tamc/twenty-fifty | 0207f8397faa74a58ee1867245bde2f9ef001093 | Fixed an error in the response headers on caching | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 02d3a30..130df2e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,24 +1,24 @@
# Filters added to this controller apply to all controllers in the applicati... |
tamc/twenty-fifty | de4d59f2eb6d578890cd36a0c0aaf62c6ac158bd | Added a link to the DECC website in the README | diff --git a/README b/README
index fe8cd98..6a75af9 100644
--- a/README
+++ b/README
@@ -1,19 +1,25 @@
+DECC 2050 CALCULATOR TOOL
+A web interface to the www.decc.gov.uk 2050 energy and climate change calculator
+
+Further detail on the project:
+http://www.decc.gov.uk/en/content/cms/what_we_do/lc_uk/2050/2050.aspx
+
... |
spool/nxigraph | e0708f58841d7bd1b1d75e00a5173f34c81cf171 | Added name handling and tests. | diff --git a/__init__.py b/__init__.py
index 287ac4e..8ee051b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,51 +1,54 @@
"""
Provides a toolkit for interoperability between igraph and networkx
>>> h = networkx.erdos_renyi_graph(30, .6)
>>> g = NXiGraph(h)
>>> networkx.clustering(g) == networkx.clustering(h)
T... |
spool/nxigraph | b21da74ef088f29e1cc8e599e50f8b95e06457e8 | Removed nx2igraph function. | diff --git a/__init__.py b/__init__.py
index 89d7efb..287ac4e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,62 +1,51 @@
"""
Provides a toolkit for interoperability between igraph and networkx
>>> h = networkx.erdos_renyi_graph(30, .6)
>>> g = NXiGraph(h)
>>> networkx.clustering(g) == networkx.clustering(h)
T... |
spool/nxigraph | bbe6039a53118039b94fab0b9a145cf5b202b397 | Added new doctest to prove we can use the inherited __init__ to convert NetworkX graphs to NXiGraphs | diff --git a/__init__.py b/__init__.py
index 36c2c42..89d7efb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,54 +1,62 @@
"""
Provides a toolkit for interoperability between igraph and networkx
+
+>>> h = networkx.erdos_renyi_graph(30, .6)
+>>> g = NXiGraph(h)
+>>> networkx.clustering(g) == networkx.clustering(h)
+T... |
spool/nxigraph | 03111cb533406e68c0440d4bd9a0e2796c1d42cb | Switched to class properties, refactoring out nx2igraph. | diff --git a/__init__.py b/__init__.py
index 92d888d..36c2c42 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,46 +1,54 @@
"""
Provides a toolkit for interoperability between igraph and networkx
"""
import networkx
import igraph
def nx2igraph(nxgraph):
"""
Converts a networkx graph to an igraph graph.... |
spool/nxigraph | 44646e298762b8c8212b95c6af74c9d1f758aa76 | Changed SGraph to NXiGraph. | diff --git a/__init__.py b/__init__.py
index 1db3273..92d888d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,46 +1,46 @@
"""
Provides a toolkit for interoperability between igraph and networkx
"""
import networkx
import igraph
def nx2igraph(nxgraph):
"""
Converts a networkx graph to an igraph graph.... |
spool/nxigraph | a9031c940fcae8fd8e4e086f7ada01dd4a97f5ae | Added doctest to insure nx changes propagate to igraph changes. | diff --git a/__init__.py b/__init__.py
index 3de7456..1db3273 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,24 +1,46 @@
"""
Provides a toolkit for interoperability between igraph and networkx
"""
-
import networkx
import igraph
+def nx2igraph(nxgraph):
+ """
+ Converts a networkx graph to an igraph grap... |
spool/nxigraph | 5ab90199676ca7f73cb0faee7c600487bdbe061e | Initial class definition and conversion function. | diff --git a/__init__.py b/__init__.py
index e69de29..3de7456 100644
--- a/__init__.py
+++ b/__init__.py
@@ -0,0 +1,24 @@
+"""
+Provides a toolkit for interoperability between igraph and networkx
+"""
+
+import networkx
+import igraph
+
+class SGraph(networkx.Graph):
+ """
+ Extends the networkx Graph class with ... |
spool/nxigraph | 2a9a920a02a5bdd8e62eaf82a2afe3cab02a18f9 | Basic python module: __init__ and .gitignore. | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d18402d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+.*.swp
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..e69de29
|
hiroeorz/netdic | 978005346f9e027d613ed82348e2ed06dae7b521 | version up | diff --git a/VERSION b/VERSION
index 77d6f4c..6e8bf73 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.0
+0.1.0
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.