repo string | commit string | message string | diff string |
|---|---|---|---|
cstim/carcomm | 7d0bde65d29f31d9984d9ee9088a27c1fc5f3bb9 | Minor notes. | diff --git a/cardroid/.gitignore b/cardroid/.gitignore
index 07eee84..479c192 100644
--- a/cardroid/.gitignore
+++ b/cardroid/.gitignore
@@ -1,3 +1,4 @@
bin
build.xml
-local.properties
\ No newline at end of file
+local.properties
+gen
diff --git a/cardroid/cmdline.txt b/cardroid/cmdline.txt
index 933936d..f56d3f5 10... |
cstim/carcomm | 1c3f2e127bfb6e4ad64afb02769754d4f3274f2c | Revert "Copy the osmdroid code to here..." - doesn't work due to the PNG pictures, somehow. | diff --git a/cardroid/.gitignore b/cardroid/.gitignore
index 479c192..07eee84 100644
--- a/cardroid/.gitignore
+++ b/cardroid/.gitignore
@@ -1,4 +1,3 @@
bin
build.xml
-local.properties
-gen
+local.properties
\ No newline at end of file
diff --git a/cardroid/AndroidManifest.xml b/cardroid/AndroidManifest.xml
index b53... |
cstim/carcomm | 4f2c9d1b6be717b4c1c62cb7d9a06c162fc04e04 | Minor cosmetic improvements | diff --git a/cardroid/cmdline.txt b/cardroid/cmdline.txt
index 23b858f..933936d 100644
--- a/cardroid/cmdline.txt
+++ b/cardroid/cmdline.txt
@@ -1,38 +1,41 @@
## To have SUN java in path:
#export PATH=/usr/lib/jvm/java-6-sun-1.6.0.15/jre/bin:$PATH
# Creating the project:
ANDROIDROOT=$HOME/android-sdk-linux_86
cd... |
cstim/carcomm | f4ceffd2da58e473abda4d3f4c291a12f1886454 | Copy the osmdroid code to here and get it to compile. | diff --git a/cardroid/.gitignore b/cardroid/.gitignore
index 07eee84..479c192 100644
--- a/cardroid/.gitignore
+++ b/cardroid/.gitignore
@@ -1,3 +1,4 @@
bin
build.xml
-local.properties
\ No newline at end of file
+local.properties
+gen
diff --git a/cardroid/AndroidManifest.xml b/cardroid/AndroidManifest.xml
index 314... |
cstim/carcomm | 9a41e81fe0b2f8ae916ab18f3072d7f6be9d87c0 | Initial android app. | diff --git a/cardroid/.gitignore b/cardroid/.gitignore
new file mode 100644
index 0000000..07eee84
--- /dev/null
+++ b/cardroid/.gitignore
@@ -0,0 +1,3 @@
+bin
+build.xml
+local.properties
\ No newline at end of file
diff --git a/cardroid/AndroidManifest.xml b/cardroid/AndroidManifest.xml
new file mode 100644
index 000... |
cstim/carcomm | 8528f857c7a70960e9e806d00263391a2c846491 | Sanity check to avoid outdated GPS points. | diff --git a/webapp/public/map.html b/webapp/public/map.html
index f66112c..2d62680 100644
--- a/webapp/public/map.html
+++ b/webapp/public/map.html
@@ -1,438 +1,430 @@
<html>
<head>
<meta name="viewport" content="width = device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;">
<title>Car Commu... |
cstim/carcomm | 989b14156e7f050b6fb4f6f668e646c2aa03d010 | Decrease GPS error verbosity. Make the full td fields clickable. | diff --git a/webapp/public/map.html b/webapp/public/map.html
index 314d185..f66112c 100644
--- a/webapp/public/map.html
+++ b/webapp/public/map.html
@@ -1,432 +1,438 @@
<html>
<head>
<meta name="viewport" content="width = device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;">
<title>Car Commu... |
cstim/carcomm | 102e8b414a2b9faf61656490502995704b9e489c | Code cleanup according to jslint.com | diff --git a/webapp/public/csfuncs.js b/webapp/public/csfuncs.js
index 1d2ca16..28cc902 100644
--- a/webapp/public/csfuncs.js
+++ b/webapp/public/csfuncs.js
@@ -1,147 +1,149 @@
function csCreateMap() {
var map = new OpenLayers.Map ("map", {
controls:
[
new OpenLayers.Contr... |
cstim/carcomm | f715dbdd6cddd5383f2693416d0b04d6df739359 | Do the double-buffering switch already in the loadend callback. | diff --git a/webapp/public/map.html b/webapp/public/map.html
index dc22c2a..d60a863 100644
--- a/webapp/public/map.html
+++ b/webapp/public/map.html
@@ -1,425 +1,423 @@
<html>
<head>
<meta name="viewport" content="width = device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;">
<title>Car Commu... |
paulgirard/pygexf | 410f06219e1c193df965e0ce28ebe8a651b3af56 | more python3 fixes | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index c11d6b8..eef0a84 100755
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,850 +1,850 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# documentation : http://pack... |
paulgirard/pygexf | 1608b528573e778729c83830483794b9ceea7694 | python3 fix | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index dbcd676..c11d6b8 100755
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,847 +1,847 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# documentation : http://pack... |
paulgirard/pygexf | 0ae0862ff6b2600ccb85a391c8bdc2e3e3f40891 | more pep8/python3 fixes | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index 6eab911..dbcd676 100755
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,1049 +1,1047 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# documentation : http://pa... |
paulgirard/pygexf | 77cc1523162c52aef37ea0c81f5d2e30be59ff04 | more python3 fixes | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index d02d95f..6eab911 100755
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,1049 +1,1049 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# documentation : http://pa... |
paulgirard/pygexf | 3595ad68753dc59ed8c763aa5c388ace90b50725 | make it working with python3 | diff --git a/gexf/__init__.py b/gexf/__init__.py
index 99603ef..14e4841 100644
--- a/gexf/__init__.py
+++ b/gexf/__init__.py
@@ -1,5 +1,5 @@
-from _gexf import Gexf
-from _gexf import Node
-from _gexf import Edge
-from _gexf import Graph
-from _gexf import GexfImport
\ No newline at end of file
+from ._gexf import Gexf... |
paulgirard/pygexf | ac0f51afdc4e304fdd949c7c63ad5d1f96cba326 | licences | diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..315e7dd
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,21 @@
+Copyright médialab SciencesPo (2013)
+<medialab@sciences-po.fr>
+
+This program is free software distributed under the terms of two licenses, the
+CeCILL-C license that fits European law, and the G... |
paulgirard/pygexf | 3ea7da17f1b93501c076fcdbce6a50bf47eefcf7 | Get edge attributes, not node attributes | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index d071212..75ada26 100644
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -178,888 +178,888 @@ class Graph :
# check conformity with type is missing
# if id in self._nodesAttributes.keys() :
# if self._nodesAttributes[id]["mode"]=="static" and ( n... |
paulgirard/pygexf | 641b43a77019ee241dce5aae7c603d1241ba6a42 | Bugfixes for spells | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
old mode 100644
new mode 100755
index d071212..5526624
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,1065 +1,1067 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# ... |
paulgirard/pygexf | 12afdc521973f359b23a0c742d69a92a07250a40 | fix #4 | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index 358473b..d071212 100644
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,1065 +1,1065 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# documentation : http://pa... |
paulgirard/pygexf | 71f6433a17552778ebc93e0c3fbc592027698dff | Fix for issue #6 https://github.com/paulgirard/pygexf/issues/6 Don't write stats to stdout or make it optional | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index 3105d5b..358473b 100644
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,580 +1,581 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# documentation : http://pack... |
paulgirard/pygexf | 39fa1d4238169c151966b2359f602c0a3decd82d | pygexf now supports 1.2 + lot of refactoring (see comments) + added a new test script | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index a61b4e4..3105d5b 100644
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,627 +1,1064 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# documentation : http://pac... |
paulgirard/pygexf | 7e19db9b7c1607f1ade0a6498aa21ef37d180866 | remove str() on labels in getXml methods | diff --git a/gexf/_gexf.py b/gexf/_gexf.py
index a0e643c..a61b4e4 100644
--- a/gexf/_gexf.py
+++ b/gexf/_gexf.py
@@ -1,627 +1,627 @@
# -*- coding: utf-8 -*-
#
# Gexf library in python
# see gephi.org and gexf.net
#
# repository : http://github.com/paulgirard/pygexf
# documentation : http://pack... |
paulgirard/pygexf | 4635392cb5cc846c3c8929d68cc002c6233559a6 | add hello world test | diff --git a/VERSION b/VERSION
index 0c62199..ee1372d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.1
+0.2.2
diff --git a/doc/conf.py b/doc/conf.py
index 05fcfde..5df1a5d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,216 +1,216 @@
# -*- coding: utf-8 -*-
#
# Pygexf documentation build configuration file, cr... |
paulgirard/pygexf | 490a828d699fcf31ad1deac8d0d88abe19b8a61b | correct encoding declaration in _gesf.py and add gexfimport to __init__.py | diff --git a/gexf/__init__.py b/gexf/__init__.py
index 5145622..99603ef 100644
--- a/gexf/__init__.py
+++ b/gexf/__init__.py
@@ -1,4 +1,5 @@
from _gexf import Gexf
from _gexf import Node
from _gexf import Edge
-from _gexf import Graph
\ No newline at end of file
+from _gexf import Graph
+from _gexf import GexfImport... |
paulgirard/pygexf | fa06652545df7acca7807e6b7fd257ec7ac90842 | correct bug in __init__ | diff --git a/gexf/__init__.py b/gexf/__init__.py
index 1de6adb..5145622 100644
--- a/gexf/__init__.py
+++ b/gexf/__init__.py
@@ -1,4 +1,4 @@
-from gexf import Gexf
-from gexf import Node
-from gexf import Edge
-from gexf import Graph
\ No newline at end of file
+from _gexf import Gexf
+from _gexf import Node
+from _gex... |
paulgirard/pygexf | 394b019732637aea034723c4597d050f1ec47e5d | packaging to pypi | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dc2ad2e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+html
+*.pyc
+dist
+build
diff --git a/__init__.py b/LICENSE
similarity index 100%
rename from __init__.py
rename to LICENSE
diff --git a/MANIFEST b/MANIFEST
new file mode 100644
index 0000000... |
paulgirard/pygexf | 480e38a9bb7a6c11a928960655db67d28517f313 | correct bug in addEdgeAttribute in graph (return id missing) | diff --git a/gexf.py b/gexf.py
index 92d024b..050635e 100644
--- a/gexf.py
+++ b/gexf.py
@@ -1,360 +1,361 @@
# -*- coding: utf-8 -*-
from lxml import etree
from datetime import *
# missing features :
# load, validate, modify existing gexf file
# slices / phylogeny / ...
# evolution ideas :
# ... |
paulgirard/pygexf | 81b69ec2322011129dd419df8c78e0da0a8922d7 | comment viz color on edges (not supported n GEXF) | diff --git a/gexf.py b/gexf.py
index d6980d4..92d024b 100644
--- a/gexf.py
+++ b/gexf.py
@@ -1,356 +1,360 @@
# -*- coding: utf-8 -*-
from lxml import etree
from datetime import *
# missing features :
# load, validate, modify existing gexf file
# slices / phylogeny / ...
# evolution ideas :
# ... |
paulgirard/pygexf | 004ed80923a57b1b2f06db00e26b8fab5dce8b97 | correct bugs viz color on edges | diff --git a/gexf.py b/gexf.py
index 9c56917..d6980d4 100644
--- a/gexf.py
+++ b/gexf.py
@@ -1,355 +1,356 @@
# -*- coding: utf-8 -*-
from lxml import etree
from datetime import *
# missing features :
# load, validate, modify existing gexf file
# slices / phylogeny / ...
# evolution ideas :
# ... |
paulgirard/pygexf | 81497f7b1ec6a6a2a671ff0a848c243bb64082a4 | add viz color to edges | diff --git a/gexf.py b/gexf.py
index af93d4a..9c56917 100644
--- a/gexf.py
+++ b/gexf.py
@@ -1,342 +1,355 @@
# -*- coding: utf-8 -*-
from lxml import etree
from datetime import *
# missing features :
# load, validate, modify existing gexf file
# slices / phylogeny / ...
# evolution ideas :
# ... |
paulgirard/pygexf | d521a3790584de8511248f2a12c47f681063b6a1 | add __init__.py package descriptor | diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..e69de29
|
andermic/CS531 | c64966adb4ee5a9e41cf27b7890128a48bf0d639 | Finished prog4 write-up | diff --git a/prog4/.notes.txt.swp b/prog4/.notes.txt.swp
deleted file mode 100644
index 910bf31..0000000
Binary files a/prog4/.notes.txt.swp and /dev/null differ
diff --git a/prog4/.prog4.py.swp b/prog4/.prog4.py.swp
index 6829f54..6ab6a3b 100644
Binary files a/prog4/.prog4.py.swp and b/prog4/.prog4.py.swp differ
diff ... |
andermic/CS531 | 50aa9930d162ffb04c36be9f2d8feb2575183f1f | hw5, hw6, working on prog4 | diff --git a/hw5/hw5.aux b/hw5/hw5.aux
new file mode 100644
index 0000000..f23e546
--- /dev/null
+++ b/hw5/hw5.aux
@@ -0,0 +1 @@
+\relax
diff --git a/hw5/hw5.log b/hw5/hw5.log
new file mode 100644
index 0000000..35b0223
--- /dev/null
+++ b/hw5/hw5.log
@@ -0,0 +1,166 @@
+This is pdfTeXk, Version 3.141592-1.40.3 (Web2C ... |
andermic/CS531 | 37d5e7bbe62f1d3188fb13b28dbd61f1a390d68d | Almost done w/ prog3 | diff --git a/prog3/.prog3.py.swp b/prog3/.prog3.py.swp
index 8597481..506e21b 100644
Binary files a/prog3/.prog3.py.swp and b/prog3/.prog3.py.swp differ
diff --git a/prog3/prog3.py b/prog3/prog3.py
index 4806312..b465507 100644
--- a/prog3/prog3.py
+++ b/prog3/prog3.py
@@ -1,292 +1,314 @@
-from os import system #For cl... |
andermic/CS531 | 62963d6e175e877abfac96a39d4fb0f3d712f64c | working on prog3 | diff --git a/prog3/.prog3.py.swp b/prog3/.prog3.py.swp
index c770d25..8597481 100644
Binary files a/prog3/.prog3.py.swp and b/prog3/.prog3.py.swp differ
diff --git a/prog3/prog3.py b/prog3/prog3.py
index 06dfd0d..4806312 100644
--- a/prog3/prog3.py
+++ b/prog3/prog3.py
@@ -1,45 +1,292 @@
-import os
+from os import syst... |
andermic/CS531 | e9866bacd483ad73c959c711d4a678d32b71376a | working on prog3 | diff --git a/hw4/.hw4.tex.swp b/prog3/.prog3.py.swp
similarity index 64%
rename from hw4/.hw4.tex.swp
rename to prog3/.prog3.py.swp
index 4c887db..c770d25 100644
Binary files a/hw4/.hw4.tex.swp and b/prog3/.prog3.py.swp differ
diff --git a/prog3/prog3.py b/prog3/prog3.py
new file mode 100644
index 0000000..06dfd0d
--- ... |
andermic/CS531 | 3f0664362b4ef103d4dea6f6efb66125fdf73291 | Homework 4 | diff --git a/hw4/.hw4.tex.swp b/hw4/.hw4.tex.swp
new file mode 100644
index 0000000..4c887db
Binary files /dev/null and b/hw4/.hw4.tex.swp differ
diff --git a/hw4/hw4.aux b/hw4/hw4.aux
new file mode 100644
index 0000000..f23e546
--- /dev/null
+++ b/hw4/hw4.aux
@@ -0,0 +1 @@
+\relax
diff --git a/hw4/hw4.log b/hw4/hw4.l... |
andermic/CS531 | 642a09a78acd21b7b71a3d48add410ed621fc2bd | Added a folder for hw1. Added hw3. Working on prog2 | diff --git a/hw1.doc b/hw1/hw1.doc
similarity index 100%
rename from hw1.doc
rename to hw1/hw1.doc
diff --git a/hw3/hw3.aux b/hw3/hw3.aux
new file mode 100644
index 0000000..f23e546
--- /dev/null
+++ b/hw3/hw3.aux
@@ -0,0 +1 @@
+\relax
diff --git a/hw3/hw3.log b/hw3/hw3.log
new file mode 100644
index 0000000..886b52e
... |
andermic/CS531 | 42e0387df76f3402b9b37bb3b3524d6413fc433a | Added the description for project 1 | diff --git a/prog1/prog1_description.html b/prog1/prog1_description.html
new file mode 100644
index 0000000..f3ecf01
--- /dev/null
+++ b/prog1/prog1_description.html
@@ -0,0 +1,90 @@
+<title> CS531 Programming Assignment 1 </title>
+<center>
+<H1> CS531 Programming Assignment 1 </H1>
+<H2> Vacuum-Cleaning Agents ... |
cdb/socialactions-mashup-rssa-crawler-and-api | b30257dc13e8f9d0077f146634ed0b4c18c22599 | A bit more on donations, not sure where this is at to be honest...... | diff --git a/app/views/donations/new.html.haml b/app/views/donations/new.html.haml
index 7a731da..7041ddb 100644
--- a/app/views/donations/new.html.haml
+++ b/app/views/donations/new.html.haml
@@ -1,194 +1,194 @@
#search_results
= render :partial => 'actions/action', :locals => {:action => @action}
.dona... |
cdb/socialactions-mashup-rssa-crawler-and-api | c65dfea320d7ec9f1d0ccf80e7cad68fb50328ce | Basic donations structure in place, and starting to get the view form working | diff --git a/app/controllers/donations_controller.rb b/app/controllers/donations_controller.rb
new file mode 100644
index 0000000..4647744
--- /dev/null
+++ b/app/controllers/donations_controller.rb
@@ -0,0 +1,45 @@
+class DonationsController < ApplicationController
+
+ # ssl_required :new, :create
+ #... |
cdb/socialactions-mashup-rssa-crawler-and-api | eb631e16b9a8b7416c560e31749215df2d4f8fcc | Adding a file i missed a couple commits ago | diff --git a/app/views/actions/index.rss.builder b/app/views/actions/index.rss.builder
new file mode 100644
index 0000000..1d4a6d7
--- /dev/null
+++ b/app/views/actions/index.rss.builder
@@ -0,0 +1,29 @@
+xml.instruct! :xml, :version => "1.0"
+xml.rss :version => "2.0" do
+ xml.channel do
+ xml.title "Social Actio... |
cdb/socialactions-mashup-rssa-crawler-and-api | a5ae91aa19be17c2c1c731864f61c0b1e9e8420d | Adjustment to a feed URL | diff --git a/spec/fixtures/feeds.yml b/spec/fixtures/feeds.yml
index 75f7eca..6777e04 100644
--- a/spec/fixtures/feeds.yml
+++ b/spec/fixtures/feeds.yml
@@ -1,196 +1,196 @@
global_giving:
name: GlobalGiving
url: http://feeds.feedburner.com/GlobalGivingProjects
tag_finder:
location_finder:
last_accesse... |
cdb/socialactions-mashup-rssa-crawler-and-api | 73dc53baa0233f6c49611c529aee2fc2fde5478f | First cut at getting RSS feeds of a search result. I should really be testing this (I know!!), but I am ad hoc testing right now | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index 18a5b9f..f649f17 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,31 +1,33 @@
class ActionsController < ApplicationController
def index
@search = Search.new(s... |
cdb/socialactions-mashup-rssa-crawler-and-api | 7181a4d1ed5c154b671ec4c5f57d29936173081d | Adjusting the search parameters to be cleaner. | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index c937095..18a5b9f 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,31 +1,31 @@
class ActionsController < ApplicationController
def index
- @search = Search.new(p... |
cdb/socialactions-mashup-rssa-crawler-and-api | 1282454c95eed13f388c7eb8ef01c24b77f5f98a | Adding in 2 new feeds and sites, MicroGiving, and PincGiving | diff --git a/spec/fixtures/feeds.yml b/spec/fixtures/feeds.yml
index e2d11f4..3d86e5a 100644
--- a/spec/fixtures/feeds.yml
+++ b/spec/fixtures/feeds.yml
@@ -1,178 +1,196 @@
global_giving:
name: GlobalGiving
url: http://feeds.feedburner.com/GlobalGivingProjects
tag_finder:
location_finder:
last_accesse... |
cdb/socialactions-mashup-rssa-crawler-and-api | 2a619a1d036a6c14480998fc9fbd43d0a858f7ef | Rescuing failing feeds on parse so it doesn't take down the whole parser | diff --git a/app/models/feed.rb b/app/models/feed.rb
index dd8f6e8..7d96864 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,26 +1,33 @@
require 'rubygems'
require 'simple-rss'
require 'open-uri'
class Feed < ActiveRecord::Base
belongs_to :site
has_many :actions
def parse
feed.it... |
cdb/socialactions-mashup-rssa-crawler-and-api | 3482c279f56c9e9db77924f1e4ce5d21dfaa55bc | Adjusting display on search form of the sites | diff --git a/app/views/actions/_search_form.html.haml b/app/views/actions/_search_form.html.haml
index e8e58dd..19afb9d 100644
--- a/app/views/actions/_search_form.html.haml
+++ b/app/views/actions/_search_form.html.haml
@@ -1,33 +1,33 @@
#search_box
%h2 Find an Action
- form_for @search, :url => actions_path,... |
cdb/socialactions-mashup-rssa-crawler-and-api | 39c64757edb27705e845a78d171e7d73194314d2 | Adding The Point feed | diff --git a/spec/fixtures/feeds.yml b/spec/fixtures/feeds.yml
index d6bcb8d..e2d11f4 100644
--- a/spec/fixtures/feeds.yml
+++ b/spec/fixtures/feeds.yml
@@ -1,179 +1,178 @@
global_giving:
name: GlobalGiving
url: http://feeds.feedburner.com/GlobalGivingProjects
tag_finder:
location_finder:
last_accesse... |
cdb/socialactions-mashup-rssa-crawler-and-api | da99a233e2378fea5e972135bdea7584856feb0b | Adding donorsChoose feed with location parsing | diff --git a/spec/fixtures/feeds.yml b/spec/fixtures/feeds.yml
index 77d924d..d6bcb8d 100644
--- a/spec/fixtures/feeds.yml
+++ b/spec/fixtures/feeds.yml
@@ -1,170 +1,179 @@
global_giving:
name: GlobalGiving
url: http://feeds.feedburner.com/GlobalGivingProjects
tag_finder:
location_finder:
last_accesse... |
cdb/socialactions-mashup-rssa-crawler-and-api | 864a11fb014c557f2262bd429c2b0535d531577b | Adding in new Helpalot feed, and fixing a few small issues | diff --git a/app/models/action.rb b/app/models/action.rb
index c696ed8..27d121e 100644
--- a/app/models/action.rb
+++ b/app/models/action.rb
@@ -1,76 +1,88 @@
class Action < ActiveRecord::Base
include GeoKit::Geocoders
belongs_to :feed
belongs_to :site
acts_as_taggable
acts_as_mappable :lat_colu... |
cdb/socialactions-mashup-rssa-crawler-and-api | 3e747cc6f74fd848c46003580dcb522e32b2dddf | Catching created_at date from the RDF style feed | diff --git a/app/models/action.rb b/app/models/action.rb
index 8d656db..c696ed8 100644
--- a/app/models/action.rb
+++ b/app/models/action.rb
@@ -1,75 +1,76 @@
class Action < ActiveRecord::Base
include GeoKit::Geocoders
belongs_to :feed
belongs_to :site
acts_as_taggable
acts_as_mappable :lat_colu... |
cdb/socialactions-mashup-rssa-crawler-and-api | 76279a3e5a50485d0c8686013e1435f7639a60a7 | Putting in a bit of "coming soon" on the action view | diff --git a/app/views/actions/_action.html.haml b/app/views/actions/_action.html.haml
index aa57591..a402ab9 100644
--- a/app/views/actions/_action.html.haml
+++ b/app/views/actions/_action.html.haml
@@ -1,24 +1,29 @@
%div[action]
= link_to action.title, action_path(action), :class => 'action-title', :rel => 'face... |
cdb/socialactions-mashup-rssa-crawler-and-api | 6dd1b52d596fbee3c7cef360b4e70de5f02be317 | Fixing a bug with going directly to /map | diff --git a/app/controllers/map_controller.rb b/app/controllers/map_controller.rb
index b9e4457..94a85a4 100644
--- a/app/controllers/map_controller.rb
+++ b/app/controllers/map_controller.rb
@@ -1,56 +1,58 @@
class MapController < ApplicationController
include ActionView::Helpers::JavaScriptHelper
def i... |
cdb/socialactions-mashup-rssa-crawler-and-api | 8101e141bc78b1eaab065a80d9aece13d01261c5 | Putting up a notice message on the maps page that there aren't that many location actions in there yet | diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml
index 77d049f..b56909f 100644
--- a/app/views/map/index.html.haml
+++ b/app/views/map/index.html.haml
@@ -1,8 +1,14 @@
- content_for :map_headers do
= map_header(@gmap)
= map_body(@gmap)
= render :partial => 'actions/search_form'
+#n... |
cdb/socialactions-mashup-rssa-crawler-and-api | 8497e4b90e5ac632dbdd0c2a941e7d1fe959b21d | Header text change | diff --git a/app/views/layouts/_main_header.html.erb b/app/views/layouts/_main_header.html.erb
index 8a20428..d299379 100644
--- a/app/views/layouts/_main_header.html.erb
+++ b/app/views/layouts/_main_header.html.erb
@@ -1,25 +1,25 @@
<div id="header">
<h2>A Mashup of 29+ Social Action Platforms</h2>
<div style="f... |
cdb/socialactions-mashup-rssa-crawler-and-api | ba947b0406b78e47d09a26c400c2980df046ca48 | A bit of cleanup, and adding in description on search results | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0386ad5..f962d0f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,39 +1,45 @@
# Methods added to this helper will be available to all templates in the application.
module ApplicationHel... |
cdb/socialactions-mashup-rssa-crawler-and-api | b5ec23cfe8679d20cfc53f8590c6d2d73f9de01d | Adding search on title as well as description | diff --git a/app/models/search.rb b/app/models/search.rb
index a5adc76..73beca7 100644
--- a/app/models/search.rb
+++ b/app/models/search.rb
@@ -1,113 +1,113 @@
class Search < ActiveRecord::BaseWithoutTable
column :keywords, :string
column :action_type, :string
column :created, :integer
attr_accessor :site... |
cdb/socialactions-mashup-rssa-crawler-and-api | 29aaf67cc37b53cfc89209e6d20779e7aa14705e | Oops, forgot this file. Getting used to git | diff --git a/app/views/layouts/_main_header.html.erb b/app/views/layouts/_main_header.html.erb
new file mode 100644
index 0000000..8a20428
--- /dev/null
+++ b/app/views/layouts/_main_header.html.erb
@@ -0,0 +1,25 @@
+<div id="header">
+<h2>A Mashup of 29+ Social Action Platforms</h2>
+
+<div style="float:right;width:36... |
cdb/socialactions-mashup-rssa-crawler-and-api | 541b12d45e48308e0bf5c858537f742cc492810a | New header, and small header on pages other than the home page | diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 269b609..1d90bee 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -1,14 +1,14 @@
<div id="footer">
- <p><a href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img src="/images/cr... |
cdb/socialactions-mashup-rssa-crawler-and-api | 2d983c9f54f48849bd1cae12adb63ea03c5be7f7 | Bringing in random search result | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index 5df06f0..c937095 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,21 +1,31 @@
class ActionsController < ApplicationController
def index
@search = Search.new(p... |
cdb/socialactions-mashup-rssa-crawler-and-api | 0c7511d4a1b3f80bf1e90d355f840c365aec2500 | Adding action_type into the mix | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 35c4f93..0386ad5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,39 +1,39 @@
# Methods added to this helper will be available to all templates in the application.
module ApplicationHel... |
cdb/socialactions-mashup-rssa-crawler-and-api | ef18e938903d09cc650671a530f3c860c4137aec | Adding in header and footers | diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
new file mode 100644
index 0000000..269b609
--- /dev/null
+++ b/app/views/layouts/_footer.html.erb
@@ -0,0 +1,14 @@
+<div id="footer">
+ <p><a href="http://creativecommons.org/licenses/by-nc-sa/2.5/"><img src="/images/creativecommons.... |
cdb/socialactions-mashup-rssa-crawler-and-api | d8a5f06a83b85e90c9e4b325c14c31c2bd47e0b9 | Showing the tag cloud a bit nicer, only tags with more than 1 action associated, and alphabetical | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index 3412c37..5df06f0 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,22 +1,21 @@
class ActionsController < ApplicationController
def index
@search = Search.new(p... |
cdb/socialactions-mashup-rssa-crawler-and-api | 9e0c15c27c676acaa886014adfa1546c3e241d0c | Bringing mapping into proper search | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index f33891a..3412c37 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,24 +1,22 @@
class ActionsController < ApplicationController
def index
- redirect_to '/map' and... |
cdb/socialactions-mashup-rssa-crawler-and-api | adcc5e454d4df0a23a3f402113cb67c4bd59e013 | Adding some denormalization and then making the site checkboxes work on the search | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index bc61cb3..f33891a 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,24 +1,24 @@
class ActionsController < ApplicationController
def index
redirect_to '/map' and... |
cdb/socialactions-mashup-rssa-crawler-and-api | e4ae200b9ffe5fed94d9e1982c009875529d0552 | Small adjustment to site name | diff --git a/spec/fixtures/sites.yml b/spec/fixtures/sites.yml
index 245dac3..c0198e6 100644
--- a/spec/fixtures/sites.yml
+++ b/spec/fixtures/sites.yml
@@ -1,62 +1,62 @@
global_giving:
name: GlobalGiving
url: http://www.globalgiving.com
pledge_bank:
name: PledgeBank
url: http://www.pledgebank.com
ch... |
cdb/socialactions-mashup-rssa-crawler-and-api | 3fbc14b40ce47e6fb92b9d559f5ed39ff869514d | Small adjustment to sites.yml | diff --git a/spec/fixtures/sites.yml b/spec/fixtures/sites.yml
index 1cc510c..245dac3 100644
--- a/spec/fixtures/sites.yml
+++ b/spec/fixtures/sites.yml
@@ -1,62 +1,62 @@
global_giving:
name: GlobalGiving
url: http://www.globalgiving.com
pledge_bank:
name: PledgeBank
url: http://www.pledgebank.com
ch... |
cdb/socialactions-mashup-rssa-crawler-and-api | 667a45416780e191245f30e4fd0b576540e11d7c | Fixing a few errors tests would have caught | diff --git a/app/controllers/map_controller.rb b/app/controllers/map_controller.rb
index d1582d3..3764e58 100644
--- a/app/controllers/map_controller.rb
+++ b/app/controllers/map_controller.rb
@@ -1,84 +1,85 @@
class MapController < ApplicationController
before_filter :setup_map
include ActionView::Helpers... |
cdb/socialactions-mashup-rssa-crawler-and-api | 1f12f9fbc08b19b97409957885f4f050e8a06f60 | Adding a facebox popup thingy for viewing actions. Looks nice. | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index 1cd284f..bc61cb3 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,24 +1,24 @@
class ActionsController < ApplicationController
def index
redirect_to '/map' and... |
cdb/socialactions-mashup-rssa-crawler-and-api | 2259357fb5928909035f426cb49f4d1092c10f20 | Getting somewhere on the search, still kinda sucky, but getting closere | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index b58a3c1..1cd284f 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,21 +1,24 @@
class ActionsController < ApplicationController
def index
redirect_to '/map' and... |
cdb/socialactions-mashup-rssa-crawler-and-api | 778aaeae339f1808478a5cc051ffb7d6edb7716c | Oops, fixing. I should be building tests ;-) | diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 5837d75..8f7d118 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -1,21 +1,21 @@
module TagsHelper
def tag_cloud(tags, classes)
return if tags.empty?
max_count = tags.sort_by(&:count).last.count.to_... |
cdb/socialactions-mashup-rssa-crawler-and-api | eac060392cc47ae07774a573dfe5321e9d1f735e | Styled up the google map a bit | diff --git a/app/controllers/map_controller.rb b/app/controllers/map_controller.rb
index 6a51ff1..d1582d3 100644
--- a/app/controllers/map_controller.rb
+++ b/app/controllers/map_controller.rb
@@ -1,65 +1,84 @@
class MapController < ApplicationController
before_filter :setup_map
include ActionView::Helpers... |
cdb/socialactions-mashup-rssa-crawler-and-api | 595a493811cdd50fbe45ffcb8c0df438c4fb21f6 | Tag cloud and tag pages now work | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index 0eb8283..b58a3c1 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,19 +1,21 @@
class ActionsController < ApplicationController
def index
+ redirect_to '/map' and... |
cdb/socialactions-mashup-rssa-crawler-and-api | b9128894952ced07729f9f91ac0d526812ca1bcf | Pagination roughly in place, and removed make_resourceful | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
index 0da610e..0eb8283 100644
--- a/app/controllers/actions_controller.rb
+++ b/app/controllers/actions_controller.rb
@@ -1,16 +1,19 @@
class ActionsController < ApplicationController
- make_resourceful do
- actions :index, ... |
cdb/socialactions-mashup-rssa-crawler-and-api | bc5d2dcf2509865c7ddfcc4d2a83a20e96e012d3 | Adding will_paginate | diff --git a/vendor/plugins/will_paginate/.gitignore b/vendor/plugins/will_paginate/.gitignore
new file mode 100644
index 0000000..6ac3a1f
--- /dev/null
+++ b/vendor/plugins/will_paginate/.gitignore
@@ -0,0 +1,2 @@
+/pkg
+/doc
diff --git a/vendor/plugins/will_paginate/LICENSE b/vendor/plugins/will_paginate/LICENSE
new ... |
cdb/socialactions-mashup-rssa-crawler-and-api | aa43fec0db7b24e1076f1290b05e46712cd14a91 | Basic styling in place now part 2 | diff --git a/app/views/actions/_search_form.html.haml b/app/views/actions/_search_form.html.haml
new file mode 100644
index 0000000..b25221d
--- /dev/null
+++ b/app/views/actions/_search_form.html.haml
@@ -0,0 +1,33 @@
+#search_box
+ %h2 Find an Action
+
+ %form
+
+ %table{ :border=>"0", :cellpadding=>"0", :cellsp... |
cdb/socialactions-mashup-rssa-crawler-and-api | 5793f4810132ca149f589212b93c877f65d0e2d5 | Basic styling in place now | diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f11852c..75aa4ad 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,10 +1,32 @@
# Methods added to this helper will be available to all templates in the application.
module ApplicationHel... |
cdb/socialactions-mashup-rssa-crawler-and-api | b8056712bb96970cd344ccd79c65d92a5ffce049 | ignoring .DS_Store | diff --git a/.gitignore b/.gitignore
index f3a2cf2..d6545ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
log/*.log
+.DS_Store
|
cdb/socialactions-mashup-rssa-crawler-and-api | 74f706ab09496caafbba1d1a1428b289eeecd34a | Bringing in basic google mapping | diff --git a/app/controllers/map_controller.rb b/app/controllers/map_controller.rb
new file mode 100644
index 0000000..6a51ff1
--- /dev/null
+++ b/app/controllers/map_controller.rb
@@ -0,0 +1,65 @@
+class MapController < ApplicationController
+
+ before_filter :setup_map
+
+ include ActionView::Helpers::JavaScriptH... |
cdb/socialactions-mashup-rssa-crawler-and-api | f0448d61326c28e7b6fd796ac8f924fe32e992dd | Adding in some location finding, and geocoding | diff --git a/app/models/action.rb b/app/models/action.rb
index 8d05115..fdd0dce 100644
--- a/app/models/action.rb
+++ b/app/models/action.rb
@@ -1,41 +1,67 @@
class Action < ActiveRecord::Base
+
+ include GeoKit::Geocoders
+
+
belongs_to :feed
delegate :site, :to => :feed
acts_as_taggable
acts_as_ma... |
cdb/socialactions-mashup-rssa-crawler-and-api | 1f6f3653721dcc07d9f6f9bee58d92c46704e8b6 | Adding zazengo feeds, and also some look and feel small changes | diff --git a/app/views/actions/index.html.haml b/app/views/actions/index.html.haml
index bb68c76..3aefa70 100644
--- a/app/views/actions/index.html.haml
+++ b/app/views/actions/index.html.haml
@@ -1,5 +1,4 @@
%h1 Listing actions
= render :partial => 'action', :collection => current_objects
-= link_to 'New action'... |
cdb/socialactions-mashup-rssa-crawler-and-api | e84d60f129f951a224e685490f47f38d0bb0752f | Put up a very rough interface to the actions using make_resourceful | diff --git a/app/controllers/actions_controller.rb b/app/controllers/actions_controller.rb
new file mode 100644
index 0000000..0da610e
--- /dev/null
+++ b/app/controllers/actions_controller.rb
@@ -0,0 +1,16 @@
+class ActionsController < ApplicationController
+ make_resourceful do
+ actions :index, :show
+ respon... |
cdb/socialactions-mashup-rssa-crawler-and-api | 145e7b89574398327e4b43485df9935ec160953d | Adding HAML | diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb
new file mode 100644
index 0000000..378b795
--- /dev/null
+++ b/vendor/plugins/haml/init.rb
@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'haml'
+Haml.init_rails(binding)
|
cdb/socialactions-mashup-rssa-crawler-and-api | bae83f525b17bff891a4f82b8d40d3db7ec20427 | Adding make_resourceful | diff --git a/vendor/plugins/make_resourceful/DEFAULTS b/vendor/plugins/make_resourceful/DEFAULTS
new file mode 100644
index 0000000..b77b38f
--- /dev/null
+++ b/vendor/plugins/make_resourceful/DEFAULTS
@@ -0,0 +1,148 @@
+There's a rough equivalence between a basic @make_resourceful@ call
+and a hand-made controller.
+T... |
cdb/socialactions-mashup-rssa-crawler-and-api | 16e1aec44d385089c676401f83291cf6d9a0c2b4 | Getting this working slowly | diff --git a/log/.gitignore b/log/.gitignore
new file mode 100644
index 0000000..e69de29
|
cdb/socialactions-mashup-rssa-crawler-and-api | b1d09f4b818f6134adffa02fc264ee32d94cde38 | Hopefully ignoring log file | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f3a2cf2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+log/*.log
|
cdb/socialactions-mashup-rssa-crawler-and-api | 7b3de9d484f2ba0f9ae700da2fb3c09be480450e | Added tagging search on actions. | diff --git a/app/models/action.rb b/app/models/action.rb
new file mode 100644
index 0000000..a0a60f1
--- /dev/null
+++ b/app/models/action.rb
@@ -0,0 +1,29 @@
+class Action < ActiveRecord::Base
+ belongs_to :feed
+
+ acts_as_taggable
+
+ def update_from_feed_item(item)
+ self.title = item.title
+ self.url ... |
cdb/socialactions-mashup-rssa-crawler-and-api | 776f940d2184b74fa323f4982992f97c0a0651f9 | Putting real feeds in as fixtures | diff --git a/spec/fixtures/feeds.yml b/spec/fixtures/feeds.yml
index b71f0ca..46befd0 100644
--- a/spec/fixtures/feeds.yml
+++ b/spec/fixtures/feeds.yml
@@ -1,11 +1,84 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+global_giving:
+ name: GlobalGiving
+ url: http://feeds.feedburner.com/G... |
cdb/socialactions-mashup-rssa-crawler-and-api | bc69357f7c7b8cb4b366839a51d4e802ff27ba41 | Files from generating Feed model | diff --git a/app/models/feed.rb b/app/models/feed.rb
new file mode 100644
index 0000000..f3ef100
--- /dev/null
+++ b/app/models/feed.rb
@@ -0,0 +1,2 @@
+class Feed < ActiveRecord::Base
+end
diff --git a/db/migrate/001_create_feeds.rb b/db/migrate/001_create_feeds.rb
new file mode 100644
index 0000000..b695185
--- /dev/... |
cdb/socialactions-mashup-rssa-crawler-and-api | 889dc89558a521ed5e501bc65f6f932f92aedd98 | Ran script/generate rspec to get these | diff --git a/script/spec b/script/spec
new file mode 100755
index 0000000..d815565
--- /dev/null
+++ b/script/spec
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
+require 'spec'
+exit ::Spec::Runner::CommandLine.run(::Spec::Runner::Opt... |
cdb/socialactions-mashup-rssa-crawler-and-api | aa812ced98b7003e4c21341360f52c46de9d9fd2 | Adding rspec_on_rails plugin | diff --git a/vendor/plugins/rspec_on_rails/MIT-LICENSE b/vendor/plugins/rspec_on_rails/MIT-LICENSE
new file mode 100644
index 0000000..239d8e7
--- /dev/null
+++ b/vendor/plugins/rspec_on_rails/MIT-LICENSE
@@ -0,0 +1,31 @@
+====================================================================
+== RSpec
+Copyright (c) 200... |
hiddentao/patterns2 | 179e157c6f7cd1bba0783042a65ffea18f4ebd8d | Added validation for blocks. We now ensure that the block that is to be updated exists. | diff --git a/components/block.inc b/components/block.inc
index 1cd1736..f4f241c 100644
--- a/components/block.inc
+++ b/components/block.inc
@@ -1,163 +1,178 @@
<?php
require_once('_common.php');
function block_patterns($op, $id = null, &$data = null) {
switch($op) {
// Return the valid tags that this ... |
hiddentao/patterns2 | 9732bb4eb66ae2ed0c2f82f2443d377481d2d0fa | Added a 'translate' attribute for the Menu Trails pattern. If you have deployed multiple sites in different languages but with each having the same basic menu structure (albeit translated menu items) you don't want to have to repeat Menu Trail patterns for each language. | diff --git a/components/menutrails.inc b/components/menutrails.inc
index 640eedc..e91416f 100644
--- a/components/menutrails.inc
+++ b/components/menutrails.inc
@@ -1,155 +1,172 @@
<?php
/**
* Component for updating menutrails configuration.
* @author Ramesh Nair (hiddentao)
*/
function menutrails_patterns... |
hiddentao/patterns2 | 69e0a1de7933c7dccb33ec7b861b911f84e82fa4 | The patterns custom error handler should ignore errors which have been deliberately suppressed (e.g. from within variable_set()). | diff --git a/patterns.module b/patterns.module
index 415876a..93d0c15 100644
--- a/patterns.module
+++ b/patterns.module
@@ -2398,975 +2398,980 @@ function patterns_sync_form_values($args) {
// Set the default value unless it is a type of value that would originally
// not be set in $_POST during form s... |
hiddentao/patterns2 | 716599bc0485381f9faeeff002217254433b62c4 | Fixed minor bug in patterns_get_patterns() method. | diff --git a/patterns.module b/patterns.module
index 55907fe..415876a 100644
--- a/patterns.module
+++ b/patterns.module
@@ -438,1025 +438,1025 @@ function patterns_import_server_submit($form, &$form_state) {
// save file
$path = file_create_path(variable_get('patterns_save_xml', 'patterns'));
$path .= '... |
hiddentao/patterns2 | f5a92c45403ab6b8409cb914ed8b4c0eece832d4 | Added a Nat-NG pattern component (http://drupal.org/project/nat_ng). | diff --git a/components/nat_ng.inc b/components/nat_ng.inc
new file mode 100644
index 0000000..a139e23
--- /dev/null
+++ b/components/nat_ng.inc
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Component for updating Nat-NG configuration.
+ *
+ * Tested with Nat-NG 6.x-1.3
+ *
+ * @author Ramesh Nair (hiddentao)
+ */
+
+
+function ... |
hiddentao/patterns2 | 407c190e3f924c9c37ff5dd13e73b0a2c918c881 | Added the ability to execute a pattern programmatically without using the batch API. This allow for patterns to be run from within hook_update() implementations, which themselves use the batch API. | diff --git a/patterns.module b/patterns.module
index 1025a3f..55907fe 100644
--- a/patterns.module
+++ b/patterns.module
@@ -880,1098 +880,1147 @@ function patterns_edit_submit($form, &$form_state) {
*/
function patterns_modules_page($pid) {
$pattern = patterns_get_pattern($pid);
drupal_set_title($pattern->t... |
hiddentao/patterns2 | c06af4bf64652b8c592f542a64c9fab93fc0f09c | Added two new tags (to be placed inside <info>) for controlling how a pattern appears in the list on the patterns admin page... | diff --git a/patterns.module b/patterns.module
index 76e7da4..1025a3f 100644
--- a/patterns.module
+++ b/patterns.module
@@ -157,1043 +157,1055 @@ function patterns_menu() {
$items['admin/build/patterns/import/url'] = array(
'title' => 'Import from URL',
'page callback' => 'drupal_get_form',
'page arg... |
hiddentao/patterns2 | 2eb034f97a312804c5b02c5627c3fd02aff1d49f | 1) Added a 'menu_trail' tag which allows you to configure the Menu Trails module (node type <-> menu mappings) using a pattern. | diff --git a/components/menutrails.inc b/components/menutrails.inc
new file mode 100644
index 0000000..640eedc
--- /dev/null
+++ b/components/menutrails.inc
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Component for updating menutrails configuration.
+ * @author Ramesh Nair (hiddentao)
+ */
+
+
+function menutrails_patterns($op, ... |
hiddentao/patterns2 | 94fb87f6455bf597d4a0db8ecc82e548e9981372 | Made the Patterns form synhronization code a little bit more robust. | diff --git a/patterns.module b/patterns.module
index 06e8e27..f892a89 100644
--- a/patterns.module
+++ b/patterns.module
@@ -1882,1025 +1882,1025 @@ function patterns_get_pattern_details($pattern, $recursive = FALSE, &$pids = arr
case 'update':
// Only run on pattern update
if ($p->... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.