Datasets:
numerata
/
diffs

Dataset card Data Studio Files
xet
 Community
1
repo
string
commit
string
message
string
diff
string
rngtng/nups
cc2e5b9a6f452addf40f88c6ad8f868d2a71efae
added pre_testing and pre_sending state
diff --git a/README.md b/README.md index 7f4a5fb..906bfcb 100644 --- a/README.md +++ b/README.md @@ -1,91 +1,92 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
6e47249c66914a5565808db60dfe814d16145c89
added newsletter integration test
diff --git a/Gemfile b/Gemfile index d42dfac..a4478f6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,80 +1,79 @@ source 'http://rubygems.org' gem 'rails', '~> 3.1.3' gem 'mysql2' gem 'jquery-rails' gem 'haml' #Authorization gem "devise", "~> 1.5.0" # Use resque for async jobs gem 'resque' gem 'resque-sc...
rngtng/nups
669c2eab774edb2c660cd2c47dfc054a0d5d57f0
added factory_firl
diff --git a/Gemfile b/Gemfile index 6c727af..d42dfac 100644 --- a/Gemfile +++ b/Gemfile @@ -1,70 +1,80 @@ source 'http://rubygems.org' gem 'rails', '~> 3.1.3' gem 'mysql2' gem 'jquery-rails' gem 'haml' #Authorization gem "devise", "~> 1.5.0" # Use resque for async jobs gem 'resque' gem 'resque-sc...
rngtng/nups
6133fd3c2173433239ba95d1ffe5b67e351ba03e
added stats in newsletter view, return NL as json
diff --git a/README.md b/README.md index 509861a..9d1091b 100644 --- a/README.md +++ b/README.md @@ -1,91 +1,91 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
77e714b09343dd6fd7f0e09f0f782b7755b05fcc
add travis for staging [skip ci]
diff --git a/.travis.yml b/.travis.yml index a5c3b03..9e7fe49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,15 @@ # http://about.travis-ci.org/docs/user/selenium-setup/ rvm: - 1.9.2 before_script: - "mv config/database.travis.yml config/database.yml" - "mysql -e 'create database nups_test;' >/dev/n...
rngtng/nups
c68d18bb8c9d10dab42a39c8a4bf9420bd1a9c95
set mysql timezone
diff --git a/app/helpers/charts_helper.rb b/app/helpers/charts_helper.rb index a3d8b31..225bfb3 100644 --- a/app/helpers/charts_helper.rb +++ b/app/helpers/charts_helper.rb @@ -1,64 +1,66 @@ module ChartsHelper NL_FIELDS = %w(finishs_count reads_count fails_count bounces_count sendings_per_second) def newslett...
rngtng/nups
ae3f56a5e4895e0a9db8f6c929bd17968796d4f0
fix empty from bounce
diff --git a/app/models/bounce.rb b/app/models/bounce.rb index 1b0434d..a013779 100644 --- a/app/models/bounce.rb +++ b/app/models/bounce.rb @@ -1,74 +1,74 @@ require 'bounce_email' class Bounce < ActiveRecord::Base QUEUE = :nups_bounces belongs_to :send_out belongs_to :recipient validates :raw, :...
rngtng/nups
fcd67bf3731666479fde9233f3a1a7f86fb15614
removed old chart code
diff --git a/app/helpers/charts_helper.rb b/app/helpers/charts_helper.rb index b304cb4..a3d8b31 100644 --- a/app/helpers/charts_helper.rb +++ b/app/helpers/charts_helper.rb @@ -1,100 +1,64 @@ module ChartsHelper NL_FIELDS = %w(finishs_count reads_count fails_count bounces_count sendings_per_second) def newslet...
rngtng/nups
50536d8752c21d210245c68653262fae32cce5fd
optimized charts data
diff --git a/Gemfile b/Gemfile index 9c8754d..6c727af 100644 --- a/Gemfile +++ b/Gemfile @@ -1,69 +1,70 @@ source 'http://rubygems.org' gem 'rails', '~> 3.1.3' gem 'mysql2' gem 'jquery-rails' gem 'haml' #Authorization gem "devise", "~> 1.5.0" # Use resque for async jobs gem 'resque' gem 'resque-sc...
rngtng/nups
232da0b9a920ab07fb041b30f14887525b5193a2
added highchart
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 71d8988..56cef22 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,18 +1,19 @@ // This is a manifest file that'll be compiled into including all the files listed below. /...
rngtng/nups
066e9a32b2fce481eb0e5be1654cc9d451bce651
added counts to newsletters, rename fail
diff --git a/app/models/live_send_out.rb b/app/models/live_send_out.rb index ed9971c..6d8ad34 100644 --- a/app/models/live_send_out.rb +++ b/app/models/live_send_out.rb @@ -1,51 +1,51 @@ class LiveSendOut < SendOut validates :recipient_id, :presence => true, :uniqueness => {:scope => [:newsletter_id, :type]}, :on...
rngtng/nups
eb4e77bc5a4c4c83155f0527f7bf77a4da9e95a6
moved bounces to send_outs
diff --git a/app/models/recipient.rb b/app/models/recipient.rb index 0ab1ea0..156a2f7 100644 --- a/app/models/recipient.rb +++ b/app/models/recipient.rb @@ -1,95 +1,109 @@ class Recipient < ActiveRecord::Base SEARCH_COLUMNS = %w(email first_name last_name) belongs_to :account attr_accessible :gender, :f...
rngtng/nups
0f4cd344177e683d93b17530a758968c3fe4bc89
don't fail when adding existing recipient
diff --git a/app/models/recipient.rb b/app/models/recipient.rb index 33c545d..0ab1ea0 100644 --- a/app/models/recipient.rb +++ b/app/models/recipient.rb @@ -1,94 +1,95 @@ class Recipient < ActiveRecord::Base SEARCH_COLUMNS = %w(email first_name last_name) belongs_to :account attr_accessible :gender, :fi...
rngtng/nups
c64a36b654f00b1d5123786925c7c60bf54fc6e9
recreate in case of existing deleted user
diff --git a/README.md b/README.md index cbb171c..509861a 100644 --- a/README.md +++ b/README.md @@ -1,83 +1,91 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
085ce17be74041cdd19f94a4fd054d76ce50e142
fix: don't fail for non existing tracking image, don't fail for weird bounces
diff --git a/app/controllers/public/newsletters_controller.rb b/app/controllers/public/newsletters_controller.rb index 2c80603..3bfc045 100644 --- a/app/controllers/public/newsletters_controller.rb +++ b/app/controllers/public/newsletters_controller.rb @@ -1,28 +1,36 @@ class Public::NewslettersController < Applicatio...
rngtng/nups
addf7915cf708bdb6c4eb83e4fe6505afbccbfec
scope newsletter view for admin to current selected user + tests
diff --git a/app/controllers/newsletters_controller.rb b/app/controllers/newsletters_controller.rb index 0ca5caa..1b5f429 100644 --- a/app/controllers/newsletters_controller.rb +++ b/app/controllers/newsletters_controller.rb @@ -1,111 +1,111 @@ class NewslettersController < ApplicationNupsController before_filter :...
rngtng/nups
9ef73d0ad96286c1b57b9577ed45caa18a86d7fe
move error message to bounced send_out, send test mail always to logged in user, add paninvestor logo
diff --git a/README.md b/README.md index f537a1c..cbb171c 100644 --- a/README.md +++ b/README.md @@ -1,76 +1,83 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
f969e80a9051aa36653d8cdb67b013132bb5dbc0
recipient api fix
diff --git a/app/controllers/public/recipients_controller.rb b/app/controllers/public/recipients_controller.rb index c755ef6..3d6b9cb 100644 --- a/app/controllers/public/recipients_controller.rb +++ b/app/controllers/public/recipients_controller.rb @@ -1,63 +1,66 @@ class Public::RecipientsController < ApplicationCont...
rngtng/nups
354fbda0cc9ced2c72113ebb9aa5665ae8cba5b0
allow newsletter unsubscribe by email
diff --git a/README.md b/README.md index 267f61a..f537a1c 100644 --- a/README.md +++ b/README.md @@ -1,75 +1,76 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
f79ec8f222e0fae387e353fb465a582563e664c8
added tracking to show page, added email to confirm body
diff --git a/app/controllers/public/newsletters_controller.rb b/app/controllers/public/newsletters_controller.rb index 1dfae25..2c80603 100644 --- a/app/controllers/public/newsletters_controller.rb +++ b/app/controllers/public/newsletters_controller.rb @@ -1,24 +1,28 @@ class Public::NewslettersController < Applicatio...
rngtng/nups
4e89a05b01e75d8ffe6d29b4c413602ad5a58a98
added public assets
diff --git a/README.md b/README.md index 72e3961..267f61a 100644 --- a/README.md +++ b/README.md @@ -1,74 +1,75 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
e8bbfa919c7147d524f2f98be6dc802a3b22e3c2
added tracking
diff --git a/app/views/layouts/_tracking.html.haml b/app/views/layouts/_tracking.html.haml new file mode 100644 index 0000000..483e84b --- /dev/null +++ b/app/views/layouts/_tracking.html.haml @@ -0,0 +1,11 @@ +- if Rails.env.production? + :javascript + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-3102...
rngtng/nups
bd899d1c83031430b3d7e00a6ed4e69cfa6c74cd
code cleanup
diff --git a/README.md b/README.md index 7f55ccf..72e3961 100644 --- a/README.md +++ b/README.md @@ -1,72 +1,74 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
d4f5df9d3292fe08950b38d1594697502db17f48
travis speed up
diff --git a/Rakefile b/Rakefile index 8123631..2ec38e0 100644 --- a/Rakefile +++ b/Rakefile @@ -1,17 +1,17 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. require File.expand_path('../config/applicatio...
rngtng/nups
55a3bcdce3936e7732b5575cc332e0311823bff9
fixes translations, clean up issue rendering, fallback to template clean up specs
diff --git a/Gemfile b/Gemfile index e2e5ba4..9c8754d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,66 +1,69 @@ source 'http://rubygems.org' gem 'rails', '~> 3.1.3' gem 'mysql2' gem 'jquery-rails' gem 'haml' #Authorization gem "devise", "~> 1.5.0" # Use resque for async jobs gem 'resque' gem 'resque-sc...
rngtng/nups
fe57ab948dfb2f075b16a6627930cca52b16a005
more compact recp stats, recipients overflow
diff --git a/README.md b/README.md index 5a02afd..6b2ef5a 100644 --- a/README.md +++ b/README.md @@ -1,71 +1,72 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
9a770d24e8c11ce93fbbb1134b6ee4229bf9740a
migrated all tests to spec
diff --git a/Rakefile b/Rakefile index f374495..8123631 100644 --- a/Rakefile +++ b/Rakefile @@ -1,18 +1,17 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. require File.expand_path('../config/applicatio...
rngtng/nups
34106f2c214d87c015fb0984995efe695b59f4ff
prevent double creation of account/recipient code, API: enable auto_confirmation, add travis widget
diff --git a/README.md b/README.md index 973327c..5a02afd 100644 --- a/README.md +++ b/README.md @@ -1,68 +1,71 @@ # Welcome to NUPS ## resources * Overview of best plugins: http://ruby-toolbox.com/ * [Devise](http://github.com/plataformatec/devise) -> `rails generate devise_install` * Test SMTP lockally...
rngtng/nups
1acb574f743a956f248ffc319d871d07a3a97ec2
re-annotated models [ci skip]
diff --git a/app/models/account.rb b/app/models/account.rb index a343485..886c04f 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -1,112 +1,113 @@ require 'net/imap' class Account < ActiveRecord::Base belongs_to :user has_many :assets, :dependent => :destroy has_many :newsletters...
rngtng/nups
651231125ef48be97cbe70f1e68aef328dcb17f7
added test for non existing tracking code
diff --git a/config/locales/defaults/de.yml b/config/locales/defaults/de.yml index 1b886d5..36b8f3a 100644 --- a/config/locales/defaults/de.yml +++ b/config/locales/defaults/de.yml @@ -1,152 +1,151 @@ -# German translations for Ruby on Rails +# German translations for Ruby on Rails # by Clemens Kofler (clemens@railwa...
rngtng/nups
ee6d7dab410c8426c70b63c8b25a56e1fd4a6462
allow custom tracking image, better default mail cfg
diff --git a/app/controllers/public/newsletters_controller.rb b/app/controllers/public/newsletters_controller.rb index 8516216..1dfae25 100644 --- a/app/controllers/public/newsletters_controller.rb +++ b/app/controllers/public/newsletters_controller.rb @@ -1,19 +1,24 @@ class Public::NewslettersController < Applicatio...
rngtng/nups
dc93d81d1671ba4e41af7f90188df4320664457e
added animus image, fixed mail_config, fallback to global one
diff --git a/app/controllers/newsletters_controller.rb b/app/controllers/newsletters_controller.rb index c894d98..87cda0f 100644 --- a/app/controllers/newsletters_controller.rb +++ b/app/controllers/newsletters_controller.rb @@ -1,111 +1,111 @@ class NewslettersController < ApplicationNupsController before_filter :...
rngtng/nups
97b7f39288cbc5f30dcb08acc70c00b431ff777a
fixed newsletter order, fixed newsletter update selector
diff --git a/app/assets/javascripts/newsletters.js b/app/assets/javascripts/newsletters.js index 70890c9..afe1030 100644 --- a/app/assets/javascripts/newsletters.js +++ b/app/assets/javascripts/newsletters.js @@ -1,89 +1,89 @@ var scheduled = false, request = function(newsletterPath) { var ids = $.map($('.newslett...
rngtng/nups
bf420edff1365c04c28d6be9e30bc42cc79d58bf
moved admin controllers to rspec
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index ed0c6a2..456da18 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -1,48 +1,53 @@ class Admin::AccountsController < Admin::AdminController be...
rngtng/nups
180bdcad3809a12ca1e7099fb15ee7b0b5eeeac4
set correct timezone
diff --git a/config/application.rb b/config/application.rb index 8c7d68e..3667a6f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,48 +1,48 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' if defined?(Bundler) # If you precompile assets before deploying to production, u...
rngtng/nups
12faa564b296fc8d0ef0c8fdf3ac54fc634a1bb1
added public recipients, view, routes + tests
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 833ed0c..0ec4b55 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,34 +1,34 @@ class ApplicationController < ActionController::Base protect_from_forgery...
rngtng/nups
a402cc93930371b8ce0afd6336c917d01a4e45b1
add permalink to account, clean up controllers
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index a02bebb..ed0c6a2 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -1,84 +1,48 @@ class Admin::AccountsController < Admin::AdminController - # ...
rngtng/nups
a9828df28db16f64060c2a08f88cc5d293de7220
fixed tests
diff --git a/spec/controllers/newsletters_controller_spec.rb b/spec/controllers/newsletters_controller_spec.rb index 60e39ba..7ea2611 100644 --- a/spec/controllers/newsletters_controller_spec.rb +++ b/spec/controllers/newsletters_controller_spec.rb @@ -1,180 +1,180 @@ require 'spec_helper' describe NewslettersContr...
rngtng/nups
383c3b40999b5e58dc5d5631c3d8cd1f6bbe88b2
load default test_emails from global config
diff --git a/app/models/account.rb b/app/models/account.rb index b6dea52..e010b08 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -1,100 +1,103 @@ require 'net/imap' class Account < ActiveRecord::Base belongs_to :user has_many :assets, :dependent => :destroy has_many :newsletters...
rngtng/nups
16bf4d52082596a97034b524467685f0aa69bd57
added lis unsubscribe header, always include tracking URL, fallback on empty values
diff --git a/app/mailers/newsletter_mailer.rb b/app/mailers/newsletter_mailer.rb index 8238637..1480d53 100644 --- a/app/mailers/newsletter_mailer.rb +++ b/app/mailers/newsletter_mailer.rb @@ -1,58 +1,59 @@ class NewsletterMailer < ActionMailer::Base - TRACK_IMG = %{<img src="<%= public_newsletter_url(recipient.id, s...
rngtng/nups
ab585227d7fb54f68e06a40025218a1fdce1d8bc
moves images to right folder
diff --git a/app/controllers/public/newsletters_controller.rb b/app/controllers/public/newsletters_controller.rb index 88281c6..8516216 100644 --- a/app/controllers/public/newsletters_controller.rb +++ b/app/controllers/public/newsletters_controller.rb @@ -1,19 +1,19 @@ class Public::NewslettersController < Applicatio...
emacsattic/googleaccount
34a20dd728e8af8f55fcce2481bc41f1f83103e2
initial import
diff --git a/googleaccount.el b/googleaccount.el new file mode 100644 index 0000000..096e708 --- /dev/null +++ b/googleaccount.el @@ -0,0 +1,311 @@ +;;; googleaccount.el --- Google Accounts login from Emacs + +;;; Author: Riccardo Murri <riccardo.murri@gmail.com> +;;; Version: 1.1 +;;; X-URL: http://www.emacswiki.org/c...
untyped/delicious
9fa903fc1d0aa2150e3cc5adb0d8f82011cb0abe
Added README.markdown
diff --git a/README.markdown b/README.markdown new file mode 100644 index 0000000..283907b --- /dev/null +++ b/README.markdown @@ -0,0 +1,12 @@ +Delicious +========= + +Developed by Untyped. + +Delicious client for [Racket][1]. + +Copyright 2006 to 2010 Untyped. + +See LICENCE and COPYING for licence information. + +[1...
untyped/delicious
c30981f82a155bceeb7c21eb5adaea95994182f4
Tweaked info.ss.
diff --git a/info.ss b/info.ss index 434f651..8222e09 100644 --- a/info.ss +++ b/info.ss @@ -1,17 +1,17 @@ #lang setup/infotab (define name "delicious") -(define blurb '("A client for the del.icio.us HTTP API. See " (a ([href "http://del.icio.us/help/api/"]) "http://del.icio.us/help/api/") " for more information....
untyped/delicious
86dcbc6bf2ebbb880e9b6fc848517a27ad5f3cae
Added .externals, autoplanet.ss, and build.ss
diff --git a/.externals b/.externals new file mode 100644 index 0000000..a79d9a2 --- /dev/null +++ b/.externals @@ -0,0 +1,7 @@ +[.] +scm = git + +[planetdev/unlib] +path = planetdev/unlib +repository = git://github.com/untyped/unlib.git +scm = git diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000...
untyped/delicious
cb54d554ec4a21a36353a12881bbf1e947ebf353
Refactored and repaired for PLT 4.x.
diff --git a/all-tests.ss b/all-tests.ss index 0dfc85f..59a76db 100644 --- a/all-tests.ss +++ b/all-tests.ss @@ -1,15 +1,12 @@ -(module all-tests mzscheme - - (require (file "api-test.ss") - (file "test-base.ss") - (file "throttle-test.ss")) - - (provide all-tests) - - (define all-tests - ...
untyped/delicious
f95b568d69dbd47ebe3da37ebce1a64f1d1e4207
Initialised repository.
diff --git a/delicious/COPYING b/delicious/COPYING new file mode 100644 index 0000000..ab1a18b --- /dev/null +++ b/delicious/COPYING @@ -0,0 +1,14 @@ +This file is part of Delicious Client 1.x, Copyright (C) 2008 Untyped Ltd. + +Delicious Client 1.x is free software: you can redistribute it and/or modify +it under the ...
dj2/ObjectiveC-UnitTest-Example
3d839ab951a5d4c17cd8f239b4ff12be3fc119f3
hookup mock framework
diff --git a/Frameworks/OCMock.framework/Headers b/Frameworks/OCMock.framework/Headers new file mode 120000 index 0000000..a177d2a --- /dev/null +++ b/Frameworks/OCMock.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/Frameworks/OCMock.framework/OCMock b/Frameworks/OCMo...
dj2/ObjectiveC-UnitTest-Example
5e75adc7d2b6accc21c81e28476995dd9f67fab9
remove some comments
diff --git a/GReader.h b/GReader.h index db3a83f..16f12d3 100644 --- a/GReader.h +++ b/GReader.h @@ -1,16 +1,6 @@ -// -// GReader.h -// UnitTesting -// -// Created by dan sinclair on 09-10-26. -// Copyright 2009 __MyCompanyName__. All rights reserved. -// - #import <Cocoa/Cocoa.h> - @interface GReader : NSObjec...
dj2/ObjectiveC-UnitTest-Example
b469ebb263d7433c5b047887b4f448e4e8df966d
starting to add classes/tests
diff --git a/GReader.h b/GReader.h new file mode 100644 index 0000000..db3a83f --- /dev/null +++ b/GReader.h @@ -0,0 +1,16 @@ +// +// GReader.h +// UnitTesting +// +// Created by dan sinclair on 09-10-26. +// Copyright 2009 __MyCompanyName__. All rights reserved. +// + +#import <Cocoa/Cocoa.h> + + +@interface GRead...
nathanbatson/flash-on-rails
ced908c86851e36f4d598aa647b62b5d147c9bac
added a cs3 example fla
diff --git a/examplecs3.fla b/examplecs3.fla new file mode 100644 index 0000000..9a32571 Binary files /dev/null and b/examplecs3.fla differ
genki/merb_full_url
341a78ff7623c05bae6c92712185d383de96fed9
Added 2 methods.
diff --git a/lib/merb_full_url.rb b/lib/merb_full_url.rb index 64ae54e..e496178 100644 --- a/lib/merb_full_url.rb +++ b/lib/merb_full_url.rb @@ -1,19 +1,20 @@ # make sure we're running inside Merb if defined?(Merb::Plugins) # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece ...
genki/merb_full_url
2fad0ef3ceece1334c8ce55dd0be4fb49e400b28
Added some files.
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..397b4a7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.log diff --git a/README b/README index 94ce1b5..d98def9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ merb_full_url ============= -A plugin for the Merb framework that provides ... \ N...
aleax/matrix-game
ef589bebea415ddd9552845d48b2634e4740fea9
fixing get data
diff --git a/mainwindow.cpp b/mainwindow.cpp index 8e3a934..0a0f6c4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,69 +1,67 @@ #include "mainwindow.h" #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); } ...
aleax/matrix-game
efb0f78a78b87d82e707b9719024a33302afca8c
osipetka cjenges
diff --git a/main.cpp b/main.cpp index 6e7efd9..9ae175b 100644 --- a/main.cpp +++ b/main.cpp @@ -1,10 +1,11 @@ #include <QtGui/QApplication> #include "mainwindow.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); MainWindow w; w.show(); + return a.exec(); } diff --git a/mainwin...
aleax/matrix-game
fa67c4efe266478d7adffba6db0e7ce60d85d61e
univer
diff --git a/reductiontolp.cpp b/reductiontolp.cpp index ad0e775..4fec496 100644 --- a/reductiontolp.cpp +++ b/reductiontolp.cpp @@ -1,63 +1,99 @@ #include "reductiontolp.h" ReductionToLP::ReductionToLP(double **matrix, int cols, int rows, bool gamerA) { this->matrix=matrix; this->gamerA=gamerA; thi...
aleax/matrix-game
65115b0818950932ca2866a10a5ed484ac196338
gui fix; convert fixing in progress
diff --git a/mainwindow.cpp b/mainwindow.cpp index f8df71c..e765f2b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,63 +1,67 @@ #include "mainwindow.h" #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); } ...
aleax/matrix-game
3198c5b80689edc6aba8a2a16c25a4fbadd349b3
simplex not works
diff --git a/mainwindow.cpp b/mainwindow.cpp index 023d999..f8df71c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,57 +1,63 @@ #include "mainwindow.h" #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); } ...
aleax/matrix-game
336b63a6e4ec1c5b487e7001b2191893d3ace28e
creating build dir
diff --git a/matrix-game.pro b/matrix-game.pro index a4822fb..671f762 100644 --- a/matrix-game.pro +++ b/matrix-game.pro @@ -1,13 +1,20 @@ # ------------------------------------------------- # Project created by QtCreator 2009-12-16T20:34:00 # ------------------------------------------------- TARGET = matrix-game +...
aleax/matrix-game
34e10b7349ccf8a2f840f31cf0fa577da1c3b066
add simplex solver begin reductiontolp implementation
diff --git a/matrix-game.pro b/matrix-game.pro index e3e1bfe..a4822fb 100644 --- a/matrix-game.pro +++ b/matrix-game.pro @@ -1,16 +1,13 @@ -#------------------------------------------------- -# +# ------------------------------------------------- # Project created by QtCreator 2009-12-16T20:34:00 -# -#----------------...
aleax/matrix-game
8d3a36b33a2cf30e52d283c96900401097070e0b
gitignore
diff --git a/.gitignore b/.gitignore index c11394f..3d450b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,18 @@ # ignore objects and archives, anywhere in the tree. *.[oa] # ignore tmp files *~ # ignore build dir build/* # moc moc_*.cpp ui_*.h ui_*.cpp #Make and binary Makefile* matrix-game build...
aleax/matrix-game
e0603b5438aefd0057958d24edd1a2f0ee749b70
fix table and destructor bags
diff --git a/mainwindow.cpp b/mainwindow.cpp index 97cbdba..023d999 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,58 +1,57 @@ #include "mainwindow.h" #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); } ...
aleax/matrix-game
0d264004ec2fa48cbc4ff38654b08262c994872b
Revert "add layout to gui"
diff --git a/mainwindow.cpp b/mainwindow.cpp index 023d999..97cbdba 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,57 +1,58 @@ #include "mainwindow.h" #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); } ...
aleax/matrix-game
a3e875540ff53a1f7f026125b301641f7e998c16
add layout to gui
diff --git a/mainwindow.cpp b/mainwindow.cpp index 97cbdba..023d999 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,58 +1,57 @@ #include "mainwindow.h" #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); } ...
aleax/matrix-game
a9fda6c0f821c224ee37e786fba2bfc1de976491
licence
diff --git a/GPL b/GPL new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/GPL @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distrib...
aleax/matrix-game
8198261bdd072ec6ad2e95cc44d6a46d66cb68fc
gui mostly ended
diff --git a/mainwindow.cpp b/mainwindow.cpp index ce2e8c0..97cbdba 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,34 +1,58 @@ #include "mainwindow.h" #include "ui_mainwindow.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); } ...
aleax/matrix-game
7ddc650b40ca7180b3234f01ba99ce8eee6a4b5c
`date`
diff --git a/mainwindow.ui b/mainwindow.ui index b21132c..c854a1a 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1,71 +1,168 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>MainWindow</class> <widget class="QMainWindow" name="MainWindow"> <property name="geometry"> <rect> <x>0<...
aleax/matrix-game
d8b5c51d53f21b4e2f0f669c245ad9dc3efb704f
empty project
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c11394f --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# ignore objects and archives, anywhere in the tree. +*.[oa] +# ignore tmp files +*~ +# ignore build dir +build/* +# moc +moc_*.cpp +ui_*.h +ui_*.cpp + +#Make and binary +Makefile* +matrix-g...
borntyping/nus
7e82d7b74173e0b75c1f84d276f00937d7889c3c
Added warning to the README describing unmaintianed status.
diff --git a/README.markdown b/README.markdown index 55b90e3..e65439c 100644 --- a/README.markdown +++ b/README.markdown @@ -1,15 +1,17 @@ # Nice Urls, Simple CMS +*This is an old, unmaintained project, mostly here for historical reasons - if you need a CMS, there are better alternatives out there.* + Provides a si...
borntyping/nus
b0abb56664ee68261123ea92ca49d14b8ede4ba9
Minor fixes
diff --git a/index.php b/index.php index 8d19ec7..4b48b72 100644 --- a/index.php +++ b/index.php @@ -1,128 +1,128 @@ <?php /* Nice Urls, Simple CMS (c) Samuel Clements 2010 http://github.com/ziaix/nus v2.0.1 */ -define('DEFAULT_PAGE','index'); +define('DEFAULT_PAGE','home'); define('SITES_CONFIG','s...
borntyping/nus
6b45546f28331b9f315f19ace50d9c003f18cdb2
Added markdown and 404 support.
diff --git a/index.php b/index.php index f26f836..8d19ec7 100644 --- a/index.php +++ b/index.php @@ -1,114 +1,128 @@ <?php /* Nice Urls, Simple CMS (c) Samuel Clements 2010 http://github.com/ziaix/nus v2.0.1 */ define('DEFAULT_PAGE','index'); define('SITES_CONFIG','sites/sites.ini'); define('SIT...
borntyping/nus
c665cf9236b3375a6c762cdd062889247b47e8b2
v2.0 - Rewritten, multiple site support
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e929255 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.htaccess +.geany diff --git a/config.ini b/config.ini deleted file mode 100644 index a5adc94..0000000 --- a/config.ini +++ /dev/null @@ -1,23 +0,0 @@ -; NUS_CMS Config file - -theme = "" ...
borntyping/nus
b6a1ebbb8b43323eb8e9b256e56d1ba1cfafa337
get_meta() function
diff --git a/index.php b/index.php index f9b4b65..370d21d 100644 --- a/index.php +++ b/index.php @@ -1,117 +1,126 @@ <?php /* Nice Urls, Simple CMS (c) Samuel Clements 2010 http://github.com/ziaix/nus - + v1.2.0 */ define("CONFIG_FILE_NAME","config.ini"); /* Init */ function clea...
borntyping/nus
edac061fc067911e0e59a976541b532056d0f1aa
Smaller updates
diff --git a/config.ini b/config.ini index 41c2f6d..a5adc94 100644 --- a/config.ini +++ b/config.ini @@ -1,23 +1,23 @@ ; NUS_CMS Config file theme = "" parentdir = "" [directorys] pages = "pages" theme = "theme" [pages] ; The page to use for a 404 error WITH extension ; Make sure the file is t...
borntyping/nus
297863dec1e0a5dcf3d2c8621de43b584d4446d0
Rewrote lots, removed /app/lib.php, moved config.ini up, removed /app
diff --git a/app/config.ini b/app/config.ini deleted file mode 100644 index 80adab6..0000000 --- a/app/config.ini +++ /dev/null @@ -1,20 +0,0 @@ -; NUS_CMS Config file - -[nus] -theme = "" -codeblocks = TRUE -pages = "pages" -parentdir = "" - -[pages] -notfound = "404" ; The page to use for a 404 error. -defa...
borntyping/nus
1f52ac1583ce864f15ca4b7b11684ce238aeca5a
Added proper rewrite rules, and removed functions releated to finding the
diff --git a/.htaccess b/.htaccess deleted file mode 100644 index 250131c..0000000 --- a/.htaccess +++ /dev/null @@ -1 +0,0 @@ -ErrorDocument 404 /index.php \ No newline at end of file diff --git a/README.markdown b/README.markdown index 206035d..8e24695 100644 --- a/README.markdown +++ b/README.markdown @@ -1,42 +1,45...
borntyping/nus
aa422d7ebad39f42f9d268e14f7b4f3f88933dfe
Added better support for
diff --git a/index.php b/index.php index 1700006..23fbba8 100755 --- a/index.php +++ b/index.php @@ -1,43 +1,44 @@ <?php /* Nice Urls, Simple CMS index.php - gets the page and theme */ // Settings define("THEMEDIR","themes"); define("APPDIR","app"); // Start app require_once(APPDIR.'/lib.ph...
borntyping/nus
82277169f4fd20f7f4fa8cbe6e3c89e7f349c8db
Rewrote lib.php and index.php, cleaned up. Removed Firebug support.
diff --git a/app/config.ini b/app/config.ini old mode 100644 new mode 100755 index 18da01d..80adab6 --- a/app/config.ini +++ b/app/config.ini @@ -1,30 +1,20 @@ -; NUS_CMS Config file - -[nus] -; Theme folder with trailing / -; Comment out for default theme -theme = "razor" -; Place <div class="nus-codeblock" -; around...
borntyping/nus
64be128acd702a4b23c4a13cfa39fc397692f71d
Major rewrite, added better themeing support using start_ob(), rewote to use 404 in the .htaccess. Probably some other stuff as well
diff --git a/theme/razor/ie.css b/theme/razor/ie.css new file mode 100644 index 0000000..1d9d49f --- /dev/null +++ b/theme/razor/ie.css @@ -0,0 +1,20 @@ +/* + * Site design for http://razor-studios.co.uk/ + * by Samuel Clements of http://borntyping.co.uk/ + * + * IE only styles. + */ + +#iehackbox { + margin:0px 10%...
borntyping/nus
0bb03f997bc9955f3490f56c3105330de129e702
Major rewrite, added better themeing support using start_ob(), rewote to use 404 in the .htaccess. Probably some other stuff as well
diff --git a/.htaccess b/.htaccess index 2036c8b..250131c 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1 @@ -Options +FollowSymLinks -RewriteEngine on -RewriteCond %{REQUEST_URI} !(^/index\.php|\..*$)$ -RewriteRule ^(.*) /index.php?page=$1 [L] \ No newline at end of file +ErrorDocument 404 /index.php \ No newline at...
borntyping/nus
e398cd74081cf8c2997f0f4e95d397fb7bb28a15
Added ability to read settings from app/config.ini, added failsafe for missing 404 page. Changed some function args to use ['setting']
diff --git a/app/config.ini b/app/config.ini new file mode 100644 index 0000000..7c60581 --- /dev/null +++ b/app/config.ini @@ -0,0 +1,15 @@ +; NUS_CMS Config file + +[nus] +codeblocks = TRUE +pages_directory = "pages/" + +[pages] +not_found = "404" +default = "home" + +[filetypes] +php = 0 +html = 1 +htm = 1 +txt = 2 ...
borntyping/nus
dfb3e07d4f66f171ef918c0c8c15ca90d4286ca7
Finished classes, cleanup
diff --git a/app/lib.php b/app/lib.php index 3f1e0b0..d690936 100644 --- a/app/lib.php +++ b/app/lib.php @@ -1,82 +1,86 @@ <?php function clean($str) { $str = filter_var($str, 513); $str = filter_var($str, 515); $str = str_replace(array("..",";"),"",$str); return $str; } class page { var $name; fu...
borntyping/nus
d4a9eb97c44d0da94f30fd958055564cabe82c65
Removed empty /docs/ dir, added to README
diff --git a/README b/README deleted file mode 100644 index 7a0f42f..0000000 --- a/README +++ /dev/null @@ -1,36 +0,0 @@ -= Nice Urls, Simple CMS - -Provides a simple Content managment system that provides pages with simple urls, such as - http://www.domain.com/homepage - http://www.domain.com/about - -Activate by putt...
borntyping/nus
c90e81ca769ae9b1c13eaeb9977c3ea7ff07b811
Converting to OOP, added FirePHP to /dev/
diff --git a/app/functions.php b/app/functions.php deleted file mode 100644 index fafc762..0000000 --- a/app/functions.php +++ /dev/null @@ -1,52 +0,0 @@ -<?php - -function clean($str) { - $str = filter_var($str, 513); - $str = filter_var($str, 515); - $str = str_replace(array("..",";"),"",$str); - return $str; -} - -f...
borntyping/nus
d52819d6cefe048a66e1b1c3e5f7d318101182a5
Cleanup
diff --git a/app/functions.php b/app/functions.php index c8794ac..fafc762 100644 --- a/app/functions.php +++ b/app/functions.php @@ -1,52 +1,52 @@ <?php function clean($str) { $str = filter_var($str, 513); $str = filter_var($str, 515); $str = str_replace(array("..",";"),"",$str); return $str; } -function...
borntyping/nus
fa16975096603a5878dfe29114dff22b24144110
Modified 404 page and renamed functions
diff --git a/app/functions.php b/app/functions.php index feac1e5..c8794ac 100644 --- a/app/functions.php +++ b/app/functions.php @@ -1,52 +1,52 @@ <?php function clean($str) { $str = filter_var($str, 513); $str = filter_var($str, 515); $str = str_replace(array("..",";"),"",$str); return $str; } -function...
borntyping/nus
82ef23029108c5a4889b5d5f1aa2a464cbca353e
Added page search for each allowed filetype, and echo variations for each filetype
diff --git a/index.php b/index.php index c634da3..58283bf 100644 --- a/index.php +++ b/index.php @@ -1,34 +1,61 @@ <?php // Site index //include("app/settings.php"); $default_page = "home"; +$pages_directory = "pages/"; +$nus = array( + "codeblocks" => TRUE +); $filetypes = array( // Include "php" => 0, /...
borntyping/nus
72eca3682e892df0ba06eeff43c3e9668f0dfe2e
Added app/functions.php and clean()
diff --git a/app/functions.php b/app/functions.php new file mode 100644 index 0000000..feac1e5 --- /dev/null +++ b/app/functions.php @@ -0,0 +1,52 @@ +<?php + +function clean($str) { + $str = filter_var($str, 513); + $str = filter_var($str, 515); + $str = str_replace(array("..",";"),"",$str); + return $str; +} + +funct...
borntyping/nus
6dde79fb6c77367d899fa3b209c2d634af1d01ba
Cleaned up README.markdown
diff --git a/README.markdown b/README.markdown index 2211dd1..a5d57ff 100644 --- a/README.markdown +++ b/README.markdown @@ -1,36 +1,39 @@ # Nice Urls, Simple CMS Provides a simple Content managment system that provides pages with simple urls, such as http://www.domain.com/homepage http://www.domain.com/about ...
borntyping/nus
5fde3071d641c6f7a468d3d634ea9266edca4516
Added README.markdown
diff --git a/README.markdown b/README.markdown new file mode 100644 index 0000000..2211dd1 --- /dev/null +++ b/README.markdown @@ -0,0 +1,36 @@ +# Nice Urls, Simple CMS + +Provides a simple Content managment system that provides pages with simple urls, such as + http://www.domain.com/homepage + http://www.domain.com/ab...
borntyping/nus
f49d400160f8c96829704354a4915129f6ec2f26
Rewrote README, added README.mdown
diff --git a/README.mdown b/README.mdown new file mode 100644 index 0000000..7a0f42f --- /dev/null +++ b/README.mdown @@ -0,0 +1,36 @@ += Nice Urls, Simple CMS + +Provides a simple Content managment system that provides pages with simple urls, such as + http://www.domain.com/homepage + http://www.domain.com/about + +Ac...
borntyping/nus
68973eadba9fe0d17c66c7a23c96226bfc5ab515
Rewrote README, added README.mdown
diff --git a/README b/README index 52475f5..7a0f42f 100644 --- a/README +++ b/README @@ -1,9 +1,36 @@ ---------------------- -Nice Urls, Simple CMS ---------------------- += Nice Urls, Simple CMS -Use the included .htaccess, or add +Provides a simple Content managment system that provides pages with simple urls, such...
borntyping/nus
6e024427ef67fe4f098575264194b947d06da426
Cleaned up, finished grab_gets()
diff --git a/.htaccess b/.htaccess index b7b998f..2036c8b 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ Options +FollowSymLinks RewriteEngine on -RewriteCond %{REQUEST_URI} !(^/index\.php|\.css|\.gif|\.jpg)$ +RewriteCond %{REQUEST_URI} !(^/index\.php|\..*$)$ RewriteRule ^(.*) /index.php?page=$1 [L] \ No new...
borntyping/nus
6f16f961e900707cc04023151e63d0a3e71968e7
Edits to .htaccess and grab_gets() function
diff --git a/.htaccess b/.htaccess index 4f67342..b7b998f 100644 --- a/.htaccess +++ b/.htaccess @@ -1 +1,4 @@ -ErrorDocument 404 /nus/index.php \ No newline at end of file +Options +FollowSymLinks +RewriteEngine on +RewriteCond %{REQUEST_URI} !(^/index\.php|\.css|\.gif|\.jpg)$ +RewriteRule ^(.*) /index.php?page=$1 [L]...
borntyping/nus
04d57ff20c90ac9c834506ff0d32b9d6ed8ca45a
New readme file, new folders and blank files
diff --git a/README b/README index d45ecbf..52475f5 100644 --- a/README +++ b/README @@ -1,3 +1,9 @@ -Nothing here yet. +--------------------- +Nice Urls, Simple CMS +--------------------- -Just tring to learn to use Git. \ No newline at end of file +Use the included .htaccess, or add + + ErrorDocument 404 /DIR/index...
borntyping/nus
c3af55bb0b0d5f39c7bc3a54c70080fd759f2291
added .htaccess file
diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..4f67342 --- /dev/null +++ b/.htaccess @@ -0,0 +1 @@ +ErrorDocument 404 /nus/index.php \ No newline at end of file diff --git a/index.php b/index.php index e832a41..9493b72 100644 --- a/index.php +++ b/index.php @@ -1,30 +1,33 @@ <?php // Site ind...
royw/flickrfetchr
caadac8ff57c49f6645a35d03ffb6812b24997c3
generated and added README
diff --git a/README b/README new file mode 100644 index 0000000..c694e17 --- /dev/null +++ b/README @@ -0,0 +1,57 @@ +Welcome to FlickrFetchr 0.2.0, a Flickr photo retrieval script. + +This script will fetch photos from Flickr.com. You can specify to select photos based on users, photosets, groups, interestingness, or...
royw/flickrfetchr
3a0c3477d53be03b8946e7c20b067170e88eb4c3
imported from rubyforge
diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..85a450f --- /dev/null +++ b/Rakefile @@ -0,0 +1,196 @@ +require 'rake' +require 'date' +require 'erb' +Gem::manage_gems +require 'rake/gempackagetask' +require 'rake/clean' +require 'rake/testtask' + +COPYRIGHT = "Copyright #{Time.now.year} by Roy Wri...
jeanbon/pycoblog
00e0a4ecf8bdb5e3f7c80faa6afca66f00a28078
Mise en place du bouzin, et ajout du style
diff --git a/blog.py b/blog.py index d77f13c..af44240 100755 --- a/blog.py +++ b/blog.py @@ -1,1059 +1,1065 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # I would like to apologize to the people who read this for the poor english # used in the comments. I really try to write it well, but I'm a french with # litt...
jeanbon/pycoblog
36d200d830827fdd1c6fa594d0092c475b67c74e
Ajout de blog_remote
diff --git a/blog_remote.py b/blog_remote.py new file mode 100755 index 0000000..f940fd8 --- /dev/null +++ b/blog_remote.py @@ -0,0 +1,225 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +# Structure : +# +# - Create a temporary file, with the title, the tags, and the content, +# - open the editor to edit this +# -...