Datasets:
numerata
/
diffs

Dataset card Data Studio Files
xet
 Community
1
repo
string
commit
string
message
string
diff
string
nateleavitt/infusionsoft
c57d2cb0b47ebd97c5c8db6779e57fcc347e80fb
Make variable names match response type
diff --git a/lib/infusionsoft/client/contact.rb b/lib/infusionsoft/client/contact.rb index 509816a..fa4ab38 100644 --- a/lib/infusionsoft/client/contact.rb +++ b/lib/infusionsoft/client/contact.rb @@ -1,189 +1,189 @@ module Infusionsoft class Client # Contact service is used to manage contacts. You can add, up...
nateleavitt/infusionsoft
ba81581fb49daff070e28cfba1b9e86e7390e564
Add email optin to the add_dup method, since it's in both add and update seperately
diff --git a/lib/infusionsoft/client/contact.rb b/lib/infusionsoft/client/contact.rb index aaa05f0..509816a 100644 --- a/lib/infusionsoft/client/contact.rb +++ b/lib/infusionsoft/client/contact.rb @@ -1,187 +1,189 @@ module Infusionsoft class Client # Contact service is used to manage contacts. You can add, up...
nateleavitt/infusionsoft
70f432522ce907ffd3e1ad915db645e82bc45bf1
v1.1.7b
diff --git a/lib/infusionsoft/version.rb b/lib/infusionsoft/version.rb index 057e397..98153aa 100644 --- a/lib/infusionsoft/version.rb +++ b/lib/infusionsoft/version.rb @@ -1,4 +1,4 @@ module Infusionsoft # The version of the gem - VERSION = '1.1.7a'.freeze unless defined?(::Infusionsoft::VERSION) + VERSION = '1....
nateleavitt/infusionsoft
f87c5e4a1d7428b1439585c88a12affd005b1863
removing comma on last error type
diff --git a/lib/infusionsoft/exception_handler.rb b/lib/infusionsoft/exception_handler.rb index 617f6dd..0f1dc05 100644 --- a/lib/infusionsoft/exception_handler.rb +++ b/lib/infusionsoft/exception_handler.rb @@ -1,32 +1,32 @@ require 'infusionsoft/exceptions' class Infusionsoft::ExceptionHandler ERRORS = { ...
nateleavitt/infusionsoft
5dca91aa1924819b2c571c5d30ce4896bb8f58aa
adding space for result to match all logger outputs
diff --git a/lib/infusionsoft/connection.rb b/lib/infusionsoft/connection.rb index 5625d7b..b75bf8b 100644 --- a/lib/infusionsoft/connection.rb +++ b/lib/infusionsoft/connection.rb @@ -1,42 +1,42 @@ require "xmlrpc/client" require 'infusionsoft/exception_handler' module Infusionsoft module Connection priva...
nateleavitt/infusionsoft
7b2c141ee9efad311f9343f50275e74799ecd568
v1.1.7a
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2ac39bf --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.gem +log/*.log +tmp/**/* +.DS_Store +rdoc/ diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..c7febe1 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,22 @@ +The MIT License ...
nateleavitt/infusionsoft
8c9340a7cde6d2309b8417e538cb36e82c3bbf43
Fixed default logger implementation to add new lines
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2ac39bf --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.gem +log/*.log +tmp/**/* +.DS_Store +rdoc/ diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..c7febe1 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,22 @@ +The MIT License ...
nmccrina/game_of_life
a0a3b8864b6574460f9109414eb35dbcc802f215
Added build instructions in README
diff --git a/README b/README index 11ddb59..cfa7731 100644 --- a/README +++ b/README @@ -1,10 +1,14 @@ ABOUT ------------------------------------------------------------------------------- This is a Java implementation of the Game of Life, a cellular automaton devised by the mathematician John Conway. For more in...
nmccrina/game_of_life
78f4596cb150b80497160760c2c0ddf101851909
Added build.xml
diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..c127776 --- /dev/null +++ b/build.xml @@ -0,0 +1,34 @@ +<project name="GameOfLife" basedir="." default="main"> + + <property name="src.dir" value="src" /> + <property name="build.dir" value="build" /> + <property name="classes.dir" value="${build.di...
nmccrina/game_of_life
6d1c5cefea5f97c78e843f5d50559b404a7e5c25
Added README
diff --git a/README b/README new file mode 100644 index 0000000..11ddb59 --- /dev/null +++ b/README @@ -0,0 +1,10 @@ +ABOUT +------------------------------------------------------------------------------- + +This is a Java implementation of the Game of Life, a cellular automaton devised +by the mathematician John Conwa...
isiri/wordpress_import
7d609398a5a4b6876098df9b641946463b038559
modified: url_mapping.rb
diff --git a/url_mapping.rb b/url_mapping.rb index 841dd4f..2e903af 100755 --- a/url_mapping.rb +++ b/url_mapping.rb @@ -8,1694 +8,1694 @@ def url_mapping_arr [ ' are-the-big-four-econ-errors-biases ' , ' the_big_four_ec ' ], [ ' surprisingly-friendly-suburbs ' , ' surprisingly_fr ' ], [ ' beware-amateur-science-his...
isiri/wordpress_import
ce081c59893f6ec616c3a01d50b0e410d2864ac1
url mapping fixes
diff --git a/url_mapping.rb b/url_mapping.rb index 7613419..841dd4f 100755 --- a/url_mapping.rb +++ b/url_mapping.rb @@ -1,1351 +1,1351 @@ def url_mapping_arr [ [ ' macro-shares-prediction-markets-via-stock-exchanges ' , ' macro_shares_pr ' ], [ ' thank-you-maam-may-i-have-another ' , ' thank_you_maam_ ' ], [ ' be...
isiri/wordpress_import
c2349ec4ac92959a74df1c7d039a4b895202915d
modified: fix_broken_url.rb
diff --git a/fix_broken_url.rb b/fix_broken_url.rb index 0f37dde..02078bd 100755 --- a/fix_broken_url.rb +++ b/fix_broken_url.rb @@ -1,51 +1,51 @@ def fix_broken_url logger = Logger.new('broken_url_fix.log') all_posts = WpPost.find(:all) broken_url_match = ['http://en.wikipedia.org/wiki/Hawthorne...
isiri/wordpress_import
1cb9e870fa484d71856196d7110aacb3a3f931ff
modified: fix_broken_url.rb
diff --git a/fix_broken_url.rb b/fix_broken_url.rb index 5542f72..0f37dde 100755 --- a/fix_broken_url.rb +++ b/fix_broken_url.rb @@ -1,51 +1,51 @@ def fix_broken_url logger = Logger.new('broken_url_fix.log') all_posts = WpPost.find(:all) broken_url_match = ['http://en.wikipedia.org/wiki/Hawthorne...
isiri/wordpress_import
563d68a15ef3c0194a937c005b1edfcf07e94b7a
url fixes
diff --git a/fix_broken_url.rb b/fix_broken_url.rb new file mode 100755 index 0000000..5542f72 --- /dev/null +++ b/fix_broken_url.rb @@ -0,0 +1,51 @@ +def fix_broken_url + logger = Logger.new('broken_url_fix.log') + all_posts = WpPost.find(:all) + + broken_url_match = ['http://en.wikipedia.org/wiki/Hawtho...
isiri/wordpress_import
a40e703b4288b82bc983857b5d35110197545ff5
image parse fix
diff --git a/image_parse.rb b/image_parse.rb index 132e698..1d22bbf 100755 --- a/image_parse.rb +++ b/image_parse.rb @@ -1,31 +1,42 @@ def process_images - + logger = Logger.new('error_image_parse.log') all_posts = WpPost.find(:all) all_posts.each do |post| html_doc = Nokogiri::HTML(post.post_content)...
isiri/wordpress_import
6329625f9c667a194d0c1f1c4e6cd0f97741cdc8
modified: url_mapping.rb
diff --git a/url_mapping.rb b/url_mapping.rb index 443511a..7613419 100755 --- a/url_mapping.rb +++ b/url_mapping.rb @@ -1,1808 +1,1808 @@ def url_mapping_arr [ [ ' macro-shares-prediction-markets-via-stock-exchanges ' , ' macro_shares_pr ' ], [ ' thank-you-maam-may-i-have-another ' , ' thank_you_maam_ ' ], [ ' be...
isiri/wordpress_import
02f6c79a2c225db73dcaeddff49f16fea9e65053
removed user updation
diff --git a/process_script.rb b/process_script.rb index 6cf7cac..485a8a9 100755 --- a/process_script.rb +++ b/process_script.rb @@ -1,39 +1,35 @@ require 'global_settings' require 'importer.rb' require 'splitter.rb' require 'image_parse.rb' require 'update_links.rb' require 'configure_wordpress.rb' require 'upd...
isiri/wordpress_import
e423079e26a3434c09867933bbb708e5ec2f4e58
modified: global_settings_example.rb
diff --git a/global_settings_example.rb b/global_settings_example.rb index 9fb4ef0..d9873d0 100755 --- a/global_settings_example.rb +++ b/global_settings_example.rb @@ -1,58 +1,63 @@ #Rename this file to global_settings.rb and update the below configurations. #TODO: cleaning up some of the duplication #Global sett...
isiri/wordpress_import
2cac096eb49ce434fc12e0bb4d2340877f3fc321
modified: update_users.rb
diff --git a/update_users.rb b/update_users.rb index 16d387e..ecde4e9 100755 --- a/update_users.rb +++ b/update_users.rb @@ -1,26 +1,26 @@ def update_users users = WpUser.find(:all, :conditions => "user_login != '' and user_login != 'admin'") agent = WWW::Mechanize.new page = agent.get("#{$base_url}/wp-lo...
isiri/wordpress_import
87e8d1ac3739af376d5e9bea8b6466941f839539
updating users
diff --git a/process_script.rb b/process_script.rb index aeeecde..6cf7cac 100755 --- a/process_script.rb +++ b/process_script.rb @@ -1,36 +1,39 @@ require 'global_settings' require 'importer.rb' require 'splitter.rb' require 'image_parse.rb' require 'update_links.rb' require 'configure_wordpress.rb' +require 'upd...
isiri/wordpress_import
7d554b050599a1b3bcabb7060ba6e01cbab8f71b
modified: global_settings_example.rb
diff --git a/global_settings_example.rb b/global_settings_example.rb index 5a2fbf3..9fb4ef0 100755 --- a/global_settings_example.rb +++ b/global_settings_example.rb @@ -1,56 +1,58 @@ +#Rename this file to global_settings.rb and update the below configurations. +#TODO: cleaning up some of the duplication + #Global sett...
isiri/wordpress_import
33dfd61aa96e3f0c6d019fb922919b76aa773714
changes
diff --git a/image_parse.rb b/image_parse.rb index d81f482..132e698 100755 --- a/image_parse.rb +++ b/image_parse.rb @@ -1,30 +1,31 @@ def process_images all_posts = WpPost.find(:all) all_posts.each do |post| html_doc = Nokogiri::HTML(post.post_content) (html_doc/"img").each do |img| img_src = ...
isiri/wordpress_import
9b21e49e2ebf3b82e30bcaa61f390dd17d62bb3e
changes
diff --git a/configure_wordpress.rb b/configure_wordpress.rb index 3334b7b..0d802b1 100755 --- a/configure_wordpress.rb +++ b/configure_wordpress.rb @@ -1,20 +1,17 @@ -require 'rubygems' -require 'mechanize' - def configure_wordpress agent = WWW::Mechanize.new - page = agent.get('http://localhost/wordpress/wp-login....
isiri/wordpress_import
e3bd48a942b14b99876f09ae7e6eb29329c9fd6e
configuring wordpress
diff --git a/configure_wordpress.rb b/configure_wordpress.rb new file mode 100755 index 0000000..3334b7b --- /dev/null +++ b/configure_wordpress.rb @@ -0,0 +1,20 @@ +require 'rubygems' +require 'mechanize' + +def configure_wordpress + agent = WWW::Mechanize.new + page = agent.get('http://localhost/wordpress/wp-login.ph...
isiri/wordpress_import
a31730a2c411099d60cafd4e88ae893987b1d7a7
some fixes
diff --git a/image_parse.rb b/image_parse.rb index 23172cc..74b2528 100755 --- a/image_parse.rb +++ b/image_parse.rb @@ -1,50 +1,51 @@ require 'rubygems' require 'pathname' require 'open-uri' require 'nokogiri' require 'activerecord' ActiveRecord::Base.establish_connection( :adapter => "mysql", :databas...
isiri/wordpress_import
2c49ba2411c5a9911aec5319eae5cf63be25cff7
modified: image_parse.rb
diff --git a/image_parse.rb b/image_parse.rb index b151a08..23172cc 100755 --- a/image_parse.rb +++ b/image_parse.rb @@ -1,52 +1,50 @@ require 'rubygems' require 'pathname' require 'open-uri' require 'nokogiri' require 'activerecord' ActiveRecord::Base.establish_connection( :adapter => "mysql", :databas...
isiri/wordpress_import
ccd211aa8bea5af6f608cbbb1e9d5b499bcba113
modified: image_parse.rb
diff --git a/image_parse.rb b/image_parse.rb index be0d036..b151a08 100755 --- a/image_parse.rb +++ b/image_parse.rb @@ -1,50 +1,52 @@ require 'rubygems' require 'pathname' require 'open-uri' require 'nokogiri' require 'activerecord' ActiveRecord::Base.establish_connection( :adapter => "mysql", :databas...
isiri/wordpress_import
da0c8982bc50e97e13046d54fbb2fe7c74b2b164
removed extra func. call
diff --git a/update_links.rb b/update_links.rb index e9383ed..4d46548 100755 --- a/update_links.rb +++ b/update_links.rb @@ -1,38 +1,37 @@ require 'url_mapping.rb' require 'rubygems' require 'activerecord' ActiveRecord::Base.establish_connection( :adapter => "mysql", :database => "word_press2", :userna...
isiri/wordpress_import
dedf36fbbae701104cc6590b76bc76d2be5a2673
initial files
diff --git a/image_parse.rb b/image_parse.rb new file mode 100755 index 0000000..be0d036 --- /dev/null +++ b/image_parse.rb @@ -0,0 +1,50 @@ +require 'rubygems' +require 'pathname' +require 'open-uri' +require 'nokogiri' +require 'activerecord' + +ActiveRecord::Base.establish_connection( + :adapter => "mysql", + :d...
svetlyak40wt/django-apps
2669d5b1904508dec640f5e9defcf13c5d412b61
Small fix in the readme.
diff --git a/README.md b/README.md index 6b89eef..66236d0 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,38 @@ django-apps =========== Installation ------------ As usual. Place django_apps somewhere in your python path or install it using easy_install: easy_install django-apps Then, add `django_a...
svetlyak40wt/django-apps
657e09734c6e683236e9e3524d56cd155f4a53e1
Descriptions for some applications, ready for i18n.
diff --git a/django_apps/descriptions.py b/django_apps/descriptions.py new file mode 100644 index 0000000..9a701b4 --- /dev/null +++ b/django_apps/descriptions.py @@ -0,0 +1,38 @@ +import re +from django.utils.translation import ugettext_lazy as _ + +_apps_descriptions = [ + (r'.*django_dzenlog', _('Ab...
svetlyak40wt/django-apps
9f0c066c900bcc14a70a238b4f9eebd29635c2dc
First implementation, without apps descriptions.
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..672c4a2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.pyc +.*.swp +django_apps.egg-info +build +dist diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..eb71f2f --- /dev/null +++ b/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2008, A...
svetlyak40wt/django-apps
63f37ffa03d217a323d29184207b87892d6fd0d9
Initial empty app.
diff --git a/django_apps/__init__.py b/django_apps/__init__.py new file mode 100755 index 0000000..e69de29 diff --git a/django_apps/models.py b/django_apps/models.py new file mode 100755 index 0000000..71a8362 --- /dev/null +++ b/django_apps/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your model...
andreisavu/django-jack
9a5a776c561abc7f1371b9a6a29f08ec70100ca7
Document multiple databases
diff --git a/README b/README index c7708a4..182e09a 100644 --- a/README +++ b/README @@ -1,32 +1,33 @@ Jack - Beanstalkd web administration interface ============================================== What is beanstalkd? ------------------- "... a fast, general-purpose work queue." See http://xph.us/software/...
andreisavu/django-jack
76f94f416c61737c59afa790ae3995ddfd80ad71
Add basic multiple beanstalkd support
diff --git a/jack/beanstalk/client.py b/jack/beanstalk/client.py index bf084dc..7e43797 100644 --- a/jack/beanstalk/client.py +++ b/jack/beanstalk/client.py @@ -1,16 +1,22 @@ from django.conf import settings from beanstalkc import Connection, CommandFailed from beanstalkc import SocketError as ConnectionError ...
andreisavu/django-jack
0b0b8177fb132daa40ad8ab3c0fe857e00f8fa5c
fixed 'all' stats to always appear on left side of the page, before any tube stats'
diff --git a/jack/beanstalk/templates/beanstalk/stats_table.html b/jack/beanstalk/templates/beanstalk/stats_table.html index 59d0e53..f03c76c 100644 --- a/jack/beanstalk/templates/beanstalk/stats_table.html +++ b/jack/beanstalk/templates/beanstalk/stats_table.html @@ -1,44 +1,58 @@ {% extends "beanstalk/base.html" %} ...
andreisavu/django-jack
b9e964f1c2348f3880e1bebe746d636f76e5ca4d
fixed link to stats_table under 'all' link in /stats
diff --git a/jack/beanstalk/templates/beanstalk/stats.html b/jack/beanstalk/templates/beanstalk/stats.html index ad5bad9..f7d3e47 100644 --- a/jack/beanstalk/templates/beanstalk/stats.html +++ b/jack/beanstalk/templates/beanstalk/stats.html @@ -1,36 +1,36 @@ {% extends "beanstalk/base.html" %} {% block content %} ...
andreisavu/django-jack
241811d1eabe9e1edfd11e291371761169c145f1
added new tube 'stats table' view at /beanstalk/stats_table/
diff --git a/jack/beanstalk/templates/beanstalk/base.html b/jack/beanstalk/templates/beanstalk/base.html index 3e4bd42..4cfaa51 100644 --- a/jack/beanstalk/templates/beanstalk/base.html +++ b/jack/beanstalk/templates/beanstalk/base.html @@ -1,104 +1,134 @@ <html> <head> <title>{% block title %}Jack and the Beans...
andreisavu/django-jack
59203d1c1d730e0ff6bd9384fcfca896ee9400e8
added path to sqlite db
diff --git a/jack/settings.py b/jack/settings.py index c2a4d6b..58ecea8 100644 --- a/jack/settings.py +++ b/jack/settings.py @@ -1,109 +1,109 @@ # Django settings for jack project. from abspath import abspath DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) ...
andreisavu/django-jack
f30b912a98e13c630b95f2d5917371a3c3ccacca
Fix kick jobs on non-default tubes.
diff --git a/jack/beanstalk/templates/beanstalk/inspect.html b/jack/beanstalk/templates/beanstalk/inspect.html index 2807f4f..7fac87e 100644 --- a/jack/beanstalk/templates/beanstalk/inspect.html +++ b/jack/beanstalk/templates/beanstalk/inspect.html @@ -1,55 +1,56 @@ {% extends "beanstalk/base.html" %} {% block cont...
andreisavu/django-jack
f6c8e1e090f828bbc0544d822616e3b5efe2a905
removed extra specific install instructions
diff --git a/README b/README index 1e0bd86..c7708a4 100644 --- a/README +++ b/README @@ -1,71 +1,32 @@ Jack - Beanstalkd web administration interface ============================================== What is beanstalkd? ------------------- "... a fast, general-purpose work queue." See http://xph.us/software/...
andreisavu/django-jack
f18b841b3105861fbe38683368637d6ce2aa25ab
adding adjustments (cherry picked from commit 508976e52d9ba1512f5b9255341fc5f7506a8806)
diff --git a/README b/README index c7708a4..1e0bd86 100644 --- a/README +++ b/README @@ -1,32 +1,71 @@ Jack - Beanstalkd web administration interface ============================================== What is beanstalkd? ------------------- "... a fast, general-purpose work queue." See http://xph.us/software/...
andreisavu/django-jack
bde7fafcaf311326f22c082fe46684264dbd6155
fixed title tag to make page render in chrome
diff --git a/jack/beanstalk/templates/beanstalk/base.html b/jack/beanstalk/templates/beanstalk/base.html index 36866a7..1089b25 100644 --- a/jack/beanstalk/templates/beanstalk/base.html +++ b/jack/beanstalk/templates/beanstalk/base.html @@ -1,103 +1,103 @@ <html> <head> - <title>{% block title %}Jack and the Beans...
andreisavu/django-jack
d903e3d7f01add54fe1b8db7d33229f90092a851
add setup.py for use with pip et al
diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..2632044 --- /dev/null +++ b/setup.py @@ -0,0 +1,20 @@ +from distutils.core import setup + +setup(name='django-jack', + version='0.1', + description='Jack and the Beanstalkd. Webapp for basic work queue administration', + long_descriptio...
andreisavu/django-jack
5c9f89a2499e8f3452ac433a751d522cf40b9fca
implemented basic check for buried jobs
diff --git a/jack/beanstalk/checks/README b/jack/beanstalk/checks/README new file mode 100644 index 0000000..b2e7a95 --- /dev/null +++ b/jack/beanstalk/checks/README @@ -0,0 +1,5 @@ + +This folder contains work queue status checkers + +Take a look at buried.py if you want to know how to implement a new one. + diff --g...
andreisavu/django-jack
430a2b7682e9a45120c1737ae34083c3cdeea2a6
display uptime in days
diff --git a/jack/beanstalk/views.py b/jack/beanstalk/views.py index 812a60e..b84bd43 100644 --- a/jack/beanstalk/views.py +++ b/jack/beanstalk/views.py @@ -1,198 +1,201 @@ from django.shortcuts import render_to_response, redirect from django.contrib.auth.decorators import login_required from django.http import ...
andreisavu/django-jack
a03c146b7b2dc90233db7671804048dae5527d09
display small stats about each active tube
diff --git a/jack/beanstalk/templates/beanstalk/index.html b/jack/beanstalk/templates/beanstalk/index.html index 3879b05..2f4e3af 100644 --- a/jack/beanstalk/templates/beanstalk/index.html +++ b/jack/beanstalk/templates/beanstalk/index.html @@ -1,28 +1,42 @@ {% extends "beanstalk/base.html" %} {% block content %} ...
andreisavu/django-jack
d3fb14f496efba3dafd25f4e8d3f19cee921ef64
show some global statistics and a dummy system ok
diff --git a/jack/beanstalk/templates/beanstalk/index.html b/jack/beanstalk/templates/beanstalk/index.html index 3e12d46..3879b05 100644 --- a/jack/beanstalk/templates/beanstalk/index.html +++ b/jack/beanstalk/templates/beanstalk/index.html @@ -1,8 +1,28 @@ {% extends "beanstalk/base.html" %} {% block content %} ...
andreisavu/django-jack
ed6a298afe62b59181e45bcf9acfc5aaa2b8b365
moved stats page. the home page is going to be used for system overview
diff --git a/jack/beanstalk/templates/beanstalk/base.html b/jack/beanstalk/templates/beanstalk/base.html index 5543a29..36866a7 100644 --- a/jack/beanstalk/templates/beanstalk/base.html +++ b/jack/beanstalk/templates/beanstalk/base.html @@ -1,102 +1,103 @@ <html> <head> <title>{% block title %}Jack and the Beans...
andreisavu/django-jack
e44cd9d0b52d44a5cfe24c94f6dc044002ef2c0c
added license: apache 2.0
diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, R...
andreisavu/django-jack
167cb3054042a750d61c2095d4f4fcd7cb157322
- is allowed in node name
diff --git a/jack/beanstalk/urls.py b/jack/beanstalk/urls.py index 28d4b74..0aa46a3 100644 --- a/jack/beanstalk/urls.py +++ b/jack/beanstalk/urls.py @@ -1,15 +1,15 @@ from django.conf.urls.defaults import * import views urlpatterns = patterns('', (r'^$', views.index), (r'^put/$', views.put), - (r'^r...
andreisavu/django-jack
08adb8cf6d2e41974dc67f1f178fa572a5d94b6e
added extra path in wsgi
diff --git a/jack/django.wsgi b/jack/django.wsgi index 3cc0d9b..b3b5ebb 100644 --- a/jack/django.wsgi +++ b/jack/django.wsgi @@ -1,11 +1,12 @@ import os, sys os.environ['DJANGO_SETTINGS_MODULE'] = 'jack.settings' import django.core.handlers.wsgi sys.path.append(os.path.join(os.path.dirname(os.path.abspath(_...
andreisavu/django-jack
243dc9bf8ad2fe8c3650b8bc0a7e0f6ea9c4c628
database path is absolute
diff --git a/jack/settings.py b/jack/settings.py index 49bdd9e..c42a7a8 100644 --- a/jack/settings.py +++ b/jack/settings.py @@ -1,105 +1,105 @@ # Django settings for jack project. from abspath import abspath DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) ...
andreisavu/django-jack
0ce7052dd67764985d4e32326462a1e831588c72
load local settings if available
diff --git a/jack/.gitignore b/jack/.gitignore index 9e9af13..ab7b7d3 100644 --- a/jack/.gitignore +++ b/jack/.gitignore @@ -1,3 +1,4 @@ *.pyc *.swp database.db +local_settings.py diff --git a/jack/settings.py b/jack/settings.py index 000de81..49bdd9e 100644 --- a/jack/settings.py +++ b/jack/settings.py @@ -1,98 +1,...
andreisavu/django-jack
dc2cfeffe5d89d1d394b330c7810e3e3ebd8194f
added script for wsgi deployment
diff --git a/jack/django.wsgi b/jack/django.wsgi new file mode 100644 index 0000000..3cc0d9b --- /dev/null +++ b/jack/django.wsgi @@ -0,0 +1,11 @@ + +import os, sys + +os.environ['DJANGO_SETTINGS_MODULE'] = 'jack.settings' + +import django.core.handlers.wsgi + +sys.path.append(os.path.join(os.path.dirname(os.path.abspa...
andreisavu/django-jack
270a234d01c48c661e421c87e2a810cb549c8754
allow tube selection on peek
diff --git a/jack/beanstalk/templates/beanstalk/inspect.html b/jack/beanstalk/templates/beanstalk/inspect.html index 09b9842..2807f4f 100644 --- a/jack/beanstalk/templates/beanstalk/inspect.html +++ b/jack/beanstalk/templates/beanstalk/inspect.html @@ -1,48 +1,55 @@ {% extends "beanstalk/base.html" %} {% block cont...
andreisavu/django-jack
3cdc3dce772b0c534ee79eef975a996935cb3614
implemented delete and kick operations for jobs
diff --git a/jack/beanstalk/urls.py b/jack/beanstalk/urls.py index 0990330..4b890ee 100644 --- a/jack/beanstalk/urls.py +++ b/jack/beanstalk/urls.py @@ -1,13 +1,15 @@ from django.conf.urls.defaults import * import views urlpatterns = patterns('', (r'^$', views.index), (r'^put/$', views.put), (r'^r...
andreisavu/django-jack
fa3e56bb8ec9cc95234a99753a80a40b021d4ea8
job actions: kick and delete. only a buried job can be kicked
diff --git a/jack/beanstalk/templates/beanstalk/inspect.html b/jack/beanstalk/templates/beanstalk/inspect.html index 4416aa3..09b9842 100644 --- a/jack/beanstalk/templates/beanstalk/inspect.html +++ b/jack/beanstalk/templates/beanstalk/inspect.html @@ -1,35 +1,48 @@ {% extends "beanstalk/base.html" %} {% block cont...
andreisavu/django-jack
7affb6624a6e6008bf4a88f12cce37e6b4bea086
if no job available on peek just stay on the same page
diff --git a/jack/beanstalk/views.py b/jack/beanstalk/views.py index 5bf51c3..05a668e 100644 --- a/jack/beanstalk/views.py +++ b/jack/beanstalk/views.py @@ -1,118 +1,118 @@ from django.shortcuts import render_to_response, redirect from django.contrib.auth.decorators import login_required from django.http import ...
andreisavu/django-jack
b81b275772e70cba5123ae2090ae74d7829c6ce2
defined all peek operations
diff --git a/jack/beanstalk/urls.py b/jack/beanstalk/urls.py index 63f49d8..0990330 100644 --- a/jack/beanstalk/urls.py +++ b/jack/beanstalk/urls.py @@ -1,11 +1,13 @@ from django.conf.urls.defaults import * import views urlpatterns = patterns('', (r'^$', views.index), (r'^put/$', views.put), (r'^r...
andreisavu/django-jack
6164dbaac4a9c65473ba87f8096f34e36413758b
improved error handling when trying to view job
diff --git a/jack/beanstalk/views.py b/jack/beanstalk/views.py index 7cfe4c8..b8784d6 100644 --- a/jack/beanstalk/views.py +++ b/jack/beanstalk/views.py @@ -1,102 +1,106 @@ from django.shortcuts import render_to_response, redirect from django.contrib.auth.decorators import login_required from django.http import ...
andreisavu/django-jack
328d98c0cfc43403340201d2ba862bf5c060b8bd
changed names
diff --git a/jack/beanstalk/templates/beanstalk/base.html b/jack/beanstalk/templates/beanstalk/base.html index 9b0490e..5543a29 100644 --- a/jack/beanstalk/templates/beanstalk/base.html +++ b/jack/beanstalk/templates/beanstalk/base.html @@ -1,102 +1,102 @@ <html> <head> <title>{% block title %}Jack and the Beans...
andreisavu/django-jack
3125ecdab7701220053b7264af25c251bfb7ae14
keep link unchanged: easier to refresh
diff --git a/jack/beanstalk/templates/beanstalk/inspect.html b/jack/beanstalk/templates/beanstalk/inspect.html index a2a7b5c..4416aa3 100644 --- a/jack/beanstalk/templates/beanstalk/inspect.html +++ b/jack/beanstalk/templates/beanstalk/inspect.html @@ -1,27 +1,35 @@ {% extends "beanstalk/base.html" %} {% block cont...
andreisavu/django-jack
cf3dd5c2781055e8d6a1f57b164aa94d6d97d157
inspect ready job
diff --git a/jack/beanstalk/urls.py b/jack/beanstalk/urls.py index c4d6995..63f49d8 100644 --- a/jack/beanstalk/urls.py +++ b/jack/beanstalk/urls.py @@ -1,10 +1,11 @@ from django.conf.urls.defaults import * import views urlpatterns = patterns('', (r'^$', views.index), (r'^put/$', views.put), + (r'^r...
andreisavu/django-jack
cff2c1afe429106f274bcc36abd9cf248fcccb3e
added error page: unable to connect to queue
diff --git a/jack/beanstalk/client.py b/jack/beanstalk/client.py index 8e266f7..bf084dc 100644 --- a/jack/beanstalk/client.py +++ b/jack/beanstalk/client.py @@ -1,15 +1,16 @@ from django.conf import settings from beanstalkc import Connection, CommandFailed +from beanstalkc import SocketError as ConnectionError ...
andreisavu/django-jack
70fc04cc283898d602673bf3b84df9a1aa86b6b0
basic job inspect functionality
diff --git a/jack/beanstalk/templates/beanstalk/inspect.html b/jack/beanstalk/templates/beanstalk/inspect.html new file mode 100644 index 0000000..a2a7b5c --- /dev/null +++ b/jack/beanstalk/templates/beanstalk/inspect.html @@ -0,0 +1,27 @@ +{% extends "beanstalk/base.html" %} + +{% block content %} + +<form action="/be...
andreisavu/django-jack
3f199b3660fb2202fde4bd031d76c52fdfde2b22
improved feedback on job add
diff --git a/jack/beanstalk/templates/beanstalk/base.html b/jack/beanstalk/templates/beanstalk/base.html index aac312e..9b0490e 100644 --- a/jack/beanstalk/templates/beanstalk/base.html +++ b/jack/beanstalk/templates/beanstalk/base.html @@ -1,97 +1,102 @@ <html> <head> <title>{% block title %}Jack and the Beanst...
andreisavu/django-jack
afc815819726e40503e3ce3ea3e210f3eb56e582
added request context on rendering
diff --git a/jack/beanstalk/views.py b/jack/beanstalk/views.py index 6bd1c64..857bad8 100644 --- a/jack/beanstalk/views.py +++ b/jack/beanstalk/views.py @@ -1,51 +1,53 @@ from django.shortcuts import render_to_response, redirect from django.contrib.auth.decorators import login_required from django.http import Ht...
andreisavu/django-jack
e65c08974c66f48d02de488c29922794e3e9042c
installed django flash
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3ea659d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deps/django-flash"] + path = deps/django-flash + url = git://github.com/danielfm/django-flash.git diff --git a/deps/django-flash b/deps/django-flash new file mode 160000 index ...
andreisavu/django-jack
c689fdc4fef316d2cae39a10b94a49e8ee2d0069
redirect back to form and added link for general stats
diff --git a/jack/beanstalk/templates/beanstalk/index.html b/jack/beanstalk/templates/beanstalk/index.html index c71ba16..eb45303 100644 --- a/jack/beanstalk/templates/beanstalk/index.html +++ b/jack/beanstalk/templates/beanstalk/index.html @@ -1,34 +1,36 @@ {% extends "beanstalk/base.html" %} {% block content %} ...
andreisavu/django-jack
837036a9e9a881d4710cf6f871006a941eb740f0
put a new job in the queue
diff --git a/jack/beanstalk/forms.py b/jack/beanstalk/forms.py new file mode 100644 index 0000000..9e8dcc8 --- /dev/null +++ b/jack/beanstalk/forms.py @@ -0,0 +1,10 @@ + +from django import forms + +class PutForm(forms.Form): + body = forms.CharField(widget=forms.Textarea()) + tube = forms.CharField(initial='defa...
andreisavu/django-jack
46a12bad4bd2f1b4a3f81ca0a1fec0a260c7aed7
if tube does not exists give 404 error
diff --git a/jack/beanstalk/client.py b/jack/beanstalk/client.py index f09b0d0..8e266f7 100644 --- a/jack/beanstalk/client.py +++ b/jack/beanstalk/client.py @@ -1,15 +1,15 @@ from django.conf import settings -from beanstalkc import Connection +from beanstalkc import Connection, CommandFailed class Client(object...
andreisavu/django-jack
e87e943437f62d6aacf7f6c9962c16ed8e0edc35
display basic statistics for server and tubes
diff --git a/jack/beanstalk/client.py b/jack/beanstalk/client.py new file mode 100644 index 0000000..f09b0d0 --- /dev/null +++ b/jack/beanstalk/client.py @@ -0,0 +1,15 @@ + +from django.conf import settings + +from beanstalkc import Connection + +class Client(object): + """ A simple proxy object over the default cli...
andreisavu/django-jack
c1c916ffd8a82b5c7a301c7e5081fc0f1c07615a
basic template in place
diff --git a/jack/beanstalk/__init__.py b/jack/beanstalk/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/jack/beanstalk/models.py b/jack/beanstalk/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/jack/beanstalk/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Cr...
andreisavu/django-jack
1a730beef0f0b6d0475e191d4e2d7d25778d4d25
added expected usecases
diff --git a/README b/README index ed66f64..c7708a4 100644 --- a/README +++ b/README @@ -1,22 +1,32 @@ Jack - Beanstalkd web administration interface ============================================== What is beanstalkd? ------------------- "... a fast, general-purpose work queue." See http://xph.us/software/...
andreisavu/django-jack
9efec9f21ac6c6f96cdd32ce9f6fd859e13d67ad
initial import: empty django project
diff --git a/README b/README new file mode 100644 index 0000000..ed66f64 --- /dev/null +++ b/README @@ -0,0 +1,22 @@ + +Jack - Beanstalkd web administration interface +============================================== + +What is beanstalkd? +------------------- + +"... a fast, general-purpose work queue." + +See http://xp...
schuyler1d/cbook
5c54a1165546696aba24b3a380c2724262728ace
refuse to encrypt off a blank empty key
diff --git a/client/js/cbook.js b/client/js/cbook.js index 467b0e1..8319c45 100644 --- a/client/js/cbook.js +++ b/client/js/cbook.js @@ -1,257 +1,262 @@ var crypted_regex_str = String.fromCharCode(9812)+'([.,_])([^<>?&"\']) ([^:<>?&"\']+):([^:<>?&"\']+):?', regex_args = ['codec','hash','iv','ciphtext'], html_regex =...
schuyler1d/cbook
5dc5eb5365e3f2e42acf09d569c8ba955a5b5829
avoid facebook doubling--due to regex reseting when run on a different string
diff --git a/client/index.html b/client/index.html index aa7db95..08d5350 100644 --- a/client/index.html +++ b/client/index.html @@ -1,262 +1,262 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
bf8414c0d4dca2cd0eeae4b6659f078ac43dd88c
stop the double-printing on Facebook, but no idea why it's fixed
diff --git a/client/index.html b/client/index.html index ad33a4a..aa7db95 100644 --- a/client/index.html +++ b/client/index.html @@ -1,259 +1,262 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
7f784290b578fae4aea7cd9deb3b6a6b187729ce
originally planned tests finished. rooted out a couple bugs. ready for some alpha-alpha-alpha testers
diff --git a/client/js/local_session.js b/client/js/local_session.js index 150070c..3845f21 100644 --- a/client/js/local_session.js +++ b/client/js/local_session.js @@ -1,236 +1,252 @@ /* { CBOOK_PEOPLE: {"s":['{{key1}}','{{key2}}']} MY_KEYS: {"s":['{{key1}}']} PERSON_{key1}: {key:{friends:{'alias':"{...
schuyler1d/cbook
8a510532b2d296e27d5b438b2e3fcc4d6861736d
bugfix: sharing keys need to clip off the letter
diff --git a/client/index.html b/client/index.html index dd76b2f..ad33a4a 100644 --- a/client/index.html +++ b/client/index.html @@ -1,258 +1,259 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
46a5969102d989c72eb2af7ea3581a122e9179d0
another test: failing on restoral from share
diff --git a/client/js/test.js b/client/js/test.js index 14b56a7..2e1f8c1 100644 --- a/client/js/test.js +++ b/client/js/test.js @@ -1,169 +1,185 @@ /* KEY: -=action ?=test *=store for later part of test 1 -*create key1 2 -*encrypt message 3 ?decrypt message 4 -*full backup 5 -*share 6 -delete ev...
schuyler1d/cbook
8edb25965d402a40f47a71a7997144875c788ab3
bugfix: restoral should add secret instead of "1"--thanks to more tests, too
diff --git a/client/index.html b/client/index.html index 972b2a2..dd76b2f 100644 --- a/client/index.html +++ b/client/index.html @@ -1,257 +1,258 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
7f3b5162d47d64035532094fa874aab9cc08b317
another test
diff --git a/client/index.html b/client/index.html index 75cc2fa..972b2a2 100644 --- a/client/index.html +++ b/client/index.html @@ -1,257 +1,257 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
ecb07a93af3fa6a6930bd6080863d761b3e8e039
got decryption test passing
diff --git a/client/js/cbook.js b/client/js/cbook.js index 7adb603..467b0e1 100644 --- a/client/js/cbook.js +++ b/client/js/cbook.js @@ -1,258 +1,257 @@ var crypted_regex_str = String.fromCharCode(9812)+'([.,_])([^<>?&"\']) ([^:<>?&"\']+):([^:<>?&"\']+):?', regex_args = ['codec','hash','iv','ciphtext'], html_regex =...
schuyler1d/cbook
7088295c4c9d2eb5aeef258aa90a9a4f42cf49ab
another test
diff --git a/client/js/test.js b/client/js/test.js index 21a34d8..b01f3b9 100644 --- a/client/js/test.js +++ b/client/js/test.js @@ -1,95 +1,110 @@ /* KEY: -=action ?=test *=store for later part of test 1 -*create key1 2 -*encrypt message 3 ?decrypt message 4 -*full backup 5 -*share 6 -delete eve...
schuyler1d/cbook
49c90a21af8f1ced28982d45079da0fbb6a7aaf1
start adding tests, even though it does not work yet
diff --git a/client/index.html b/client/index.html index b956e1d..75cc2fa 100644 --- a/client/index.html +++ b/client/index.html @@ -1,253 +1,257 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
0dbf9f02532b5db7e8db20c01f4eb21232382662
remove stray console.log
diff --git a/client/js/local_session.js b/client/js/local_session.js index 4a48651..f86e7e0 100644 --- a/client/js/local_session.js +++ b/client/js/local_session.js @@ -1,232 +1,231 @@ /* { CBOOK_PEOPLE: {"s":['{{key1}}','{{key2}}']} MY_KEYS: {"s":['{{key1}}']} PERSON_{key1}: {key:{friends:{'alias':"{...
schuyler1d/cbook
850032cd965bda8e09bbb5c5e5c193f0736cebe0
some form bugs fixed
diff --git a/client/index.html b/client/index.html index 472af63..b956e1d 100644 --- a/client/index.html +++ b/client/index.html @@ -1,253 +1,253 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
759e6b3f61f808d90a466e539480ea8e7dc68fe6
bugfix: alias needs to be declared before friend obj
diff --git a/client/js/local_session.js b/client/js/local_session.js index 9956641..9ac4096 100644 --- a/client/js/local_session.js +++ b/client/js/local_session.js @@ -1,221 +1,222 @@ /* { CBOOK_PEOPLE: {"s":['{{key1}}','{{key2}}']} MY_KEYS: {"s":['{{key1}}']} PERSON_{key1}: {key:{friends:{'alias':"{...
schuyler1d/cbook
6cf0e9b101621f15c593ff214339768352a9018b
change base.js because base64/base annoyingly stops autocompletion
diff --git a/client/index.html b/client/index.html index adf7549..472af63 100644 --- a/client/index.html +++ b/client/index.html @@ -1,253 +1,253 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
0dc43be3451c362d2cf30c03ce2eefba3cef631b
add obj to keyIdentifier, since we should really TODO: hmac this.
diff --git a/client/js/local_session.js b/client/js/local_session.js index 1c5c3a8..9956641 100644 --- a/client/js/local_session.js +++ b/client/js/local_session.js @@ -1,221 +1,221 @@ /* { CBOOK_PEOPLE: {"s":['{{key1}}','{{key2}}']} MY_KEYS: {"s":['{{key1}}']} PERSON_{key1}: {key:{friends:{'alias':"{...
schuyler1d/cbook
7a642f4958fdcbe033231c6d4b21d0d8a3fcfccf
delete button, so people can escape from their browser
diff --git a/client/index.html b/client/index.html index ec3d824..adf7549 100644 --- a/client/index.html +++ b/client/index.html @@ -1,248 +1,253 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
21de286db6656f4e044b5e73b14ca102fa3e9f4a
base64 regexp bug with character "-"\
diff --git a/client/js/base64.js b/client/js/base64.js index 832a287..4c7f6e1 100644 --- a/client/js/base64.js +++ b/client/js/base64.js @@ -1,156 +1,156 @@ /** * * Base64 encode / decode * Based off of http://www.webtoolkit.info/javascript-base64.html * **/ var Base64 = { // private property _keyS...
schuyler1d/cbook
da862568e4d4f7a1f0746b60bbb6435c1763cdf2
sharing keys form
diff --git a/client/index.html b/client/index.html index dd72c73..ec3d824 100644 --- a/client/index.html +++ b/client/index.html @@ -1,245 +1,248 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
48c427af31e48d384c3dd25fb36c508fa4676a0e
some backup/restore fixes
diff --git a/client/js/local_session.js b/client/js/local_session.js index 01c1b2b..9f6f63d 100644 --- a/client/js/local_session.js +++ b/client/js/local_session.js @@ -1,197 +1,201 @@ /* { CBOOK_PEOPLE: {"s":['{{key1}}','{{key2}}']} MY_KEYS: {"s":['{{key1}}']} PERSON_{key1}: {key:{friends:{'alias':"{...
schuyler1d/cbook
443915234cd86fd50fdf224b078876cdbeb2c37a
backup/restore
diff --git a/client/index.html b/client/index.html index 6196ec2..dd72c73 100644 --- a/client/index.html +++ b/client/index.html @@ -1,205 +1,245 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE html> <html> <head> <title>CBook</title> <style type="text/css"> body {background-color:#EDFEFF} ...
schuyler1d/cbook
445c30dac97b46c01a29efdb39a7662e964b86b1
small optimization on friend key lookups
diff --git a/client/js/local_session.js b/client/js/local_session.js index b3ee5fa..a8b1d41 100644 --- a/client/js/local_session.js +++ b/client/js/local_session.js @@ -1,157 +1,156 @@ /* { CBOOK_PEOPLE: {"s":['{{key1}}','{{key2}}']} MY_KEYS: {"s":['{{key1}}']} PERSON_{key1}: {key:{friends:{'alias':"{...
schuyler1d/cbook
a4687c79f36b0259bd7b6ae5b054b24f9c7baa23
needed to update decryption test so it passes the key along with it
diff --git a/client/js/base.js b/client/js/base.js index 6f7f1e3..cbf438e 100644 --- a/client/js/base.js +++ b/client/js/base.js @@ -1,257 +1,258 @@ var crypted_regex_str = String.fromCharCode(9812)+'([.,_])([^<>?&"\']) ([^:<>?&"\']+):([^:<>?&"\']+):?', regex_args = ['codec','hash','iv','ciphtext'], html_regex = '<(...