repo string | commit string | message string | diff string |
|---|---|---|---|
hiddentao/patterns2 | 0213e4bf53dadfaeba3baaa27008a1830760e79a | Fix a bug where the list of modules to be enabled gets structured incorrectly if including multiple sub-patterns with each sub-pattern providing its own list of modules to enable. | diff --git a/patterns.module b/patterns.module
index 4e96d2e..06e8e27 100644
--- a/patterns.module
+++ b/patterns.module
@@ -653,1024 +653,1036 @@ function patterns_list() {
patterns_load_components();
$patterns = patterns_get_patterns();
if (empty($patterns)) return t('No patterns available.');
// $h... |
hiddentao/patterns2 | 65ddb788822119d8ddd6b58b63f8b4c17de2d32a | When adding nodes you can now use the 'path' tag to specify a custom path alias to the node (pathauto is bypassed). | diff --git a/components/node.inc b/components/node.inc
index 2bc740b..5115976 100644
--- a/components/node.inc
+++ b/components/node.inc
@@ -1,412 +1,412 @@
<?php
require_once('_common.php');
function node_patterns($op, $id = null, &$data = null, $a = null) {
switch($op) {
// Return the valid tags that t... |
hiddentao/patterns2 | 72eb1bc2079835fca3d2ca3f9419b1777d0a6464 | - After loading the specified modules, we now clear all caches before running the actions, to ensure that certain actions (e.g. setting user permissions on CCK fields) work as expected. | diff --git a/README.txt b/README.txt
index 1303e72..e905bbb 100644
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,18 @@
Patterns2
=========
An improved version of the Drupal Patterns module.
-This incorporates a number of patches submitted to the original module version 6.x-1.x-dev (see http://drupal.org/project/i... |
hiddentao/patterns2 | 2b7edcf732242e0b2c9f0f4234a4160b87dd76e8 | Reverted filter.inc | diff --git a/components/filter.inc b/components/filter.inc
index 0346ec7..bd34a95 100644
--- a/components/filter.inc
+++ b/components/filter.inc
@@ -1,133 +1,145 @@
<?php
/**
* Component for updating filters.
- * @author Ramesh Nair
*/
-require_once('_common.php');
-
-
function filter_patterns($op, $id = null,... |
hiddentao/patterns2 | 51211cc1a99dd1c57a05d716d4ce63f86c6a7e15 | Added missing code line to node.inc | diff --git a/components/node.inc b/components/node.inc
index 39cd1f4..2bc740b 100644
--- a/components/node.inc
+++ b/components/node.inc
@@ -1,410 +1,412 @@
<?php
+require_once('_common.php');
+
function node_patterns($op, $id = null, &$data = null, $a = null) {
switch($op) {
// Return the valid tags that t... |
hiddentao/patterns2 | da03c8f509f8fa0a43286b2b2435fd4265963e80 | github generated gh-pages branch | diff --git a/index.html b/index.html
new file mode 100644
index 0000000..8b69286
--- /dev/null
+++ b/index.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>... |
sbma44/artomatic | 639b737e84f32915af9fec7bf09301d3aeed7cc7 | better logging capabilities (non-volatile location, defined in settings) | diff --git a/bellserver/bellserver.py b/bellserver/bellserver.py
index 3bce2df..ee222b9 100644
--- a/bellserver/bellserver.py
+++ b/bellserver/bellserver.py
@@ -1,176 +1,186 @@
# Echo server program
try:
import socket
except Exception, e:
import _socket as socket
import os
import serial
import time
imp... |
sbma44/artomatic | 3e3711593a6a89b5e977a0a2c762eeeaca530fa8 | moving missing libraries into more descriptive folder | diff --git a/openwrt/missing_libraries/SocketServer.py b/openwrt/missing_libraries/SocketServer.py
new file mode 100644
index 0000000..3a74c44
--- /dev/null
+++ b/openwrt/missing_libraries/SocketServer.py
@@ -0,0 +1,587 @@
+"""Generic socket server classes.
+
+This module tries to capture the various aspects of definin... |
sbma44/artomatic | 87591508897ad382ddaac6f691ee9fae06f1b69e | adding arduino code to project | diff --git a/arduino/artomatic_2009.pde b/arduino/artomatic_2009.pde
new file mode 100644
index 0000000..3d4acab
--- /dev/null
+++ b/arduino/artomatic_2009.pde
@@ -0,0 +1,99 @@
+#define SOLENOID_PIN 8
+#define LED_PIN 13
+#define SENSOR_PIN 0
+#define BAUD_RATE 9600
+#define BELL_CHAR '#'
+#define STARTUP_DELAY_IN_SECO... |
sbma44/artomatic | f4d88024f187583f03fc1cf35b862169041dba9a | corrected settings to reflect lower baud rate | diff --git a/scripts/settings.py b/scripts/settings.py
index 6017f8a..ebdb46b 100644
--- a/scripts/settings.py
+++ b/scripts/settings.py
@@ -1,5 +1,5 @@
HOST = ''
RECIPIENTS = ['192.168.11.1']
PORT = 50008
SERIAL_PORT = '/dev/ttyS0'
-BAUD_RATE = 115200
+BAUD_RATE = 9600
|
sbma44/artomatic | 926c3485a6ba83382da60619c446868f735bbbcf | proper try..except wrapping for network methods | diff --git a/scripts/bellserver.py b/scripts/bellserver.py
index 12656bf..3bce2df 100644
--- a/scripts/bellserver.py
+++ b/scripts/bellserver.py
@@ -1,171 +1,176 @@
# Echo server program
try:
import socket
except Exception, e:
import _socket as socket
import os
import serial
import time
import settings... |
sbma44/artomatic | b823f7187c6d6e597262bd507b5bcec4173dd306 | working version | diff --git a/fonera-python/SocketServer.py b/fonera-python/SocketServer.py
new file mode 100644
index 0000000..3a74c44
--- /dev/null
+++ b/fonera-python/SocketServer.py
@@ -0,0 +1,587 @@
+"""Generic socket server classes.
+
+This module tries to capture the various aspects of defining a server:
+
+For socket-based serv... |
sbma44/artomatic | da680f5a83858e960ac8641d4fcadca2fc39877d | working bellserver script | diff --git a/scripts/bellserver.py b/scripts/bellserver.py
index 5eb8b6a..502b4a1 100644
--- a/scripts/bellserver.py
+++ b/scripts/bellserver.py
@@ -1,229 +1,303 @@
# Echo server program
try:
import socket
except Exception, e:
import _socket as socket
import os
import serial
import time
import settings... |
sbma44/artomatic | 0ba3befcf09126a4ec056b02db830cf5b3f87b32 | starting to convert bellserver to use SocketServer | diff --git a/openwrt/config/dhcp b/openwrt/config/dhcp
new file mode 100644
index 0000000..8522897
--- /dev/null
+++ b/openwrt/config/dhcp
@@ -0,0 +1,26 @@
+config dnsmasq
+ option domainneeded 1
+ option boguspriv 1
+ option filterwin2k '0' #enable for dial on demand
+ option localise_queries 1
+ option local '/lan/'... |
sbma44/artomatic | 2630d50c83aefe321c31f5837d4be60c6ae622c1 | adding serial code | diff --git a/scripts/bellserver.py b/scripts/bellserver.py
index a53365b..07f8bee 100644
--- a/scripts/bellserver.py
+++ b/scripts/bellserver.py
@@ -1,107 +1,121 @@
# Echo server program
try:
import socket
except Exception, e:
import _socket as socket
+import serial
import time
import settings
class B... |
sbma44/artomatic | 6bd36cfb24bb16209783db5fe5e173100f4afbd9 | adding sleep cycle to keep from pegging CPU; also adding ACK for bell strikes | diff --git a/scripts/bellserver.py b/scripts/bellserver.py
index 454ee0c..a53365b 100644
--- a/scripts/bellserver.py
+++ b/scripts/bellserver.py
@@ -1,99 +1,107 @@
# Echo server program
try:
import socket
except Exception, e:
import _socket as socket
import time
import settings
class BellServer(object... |
sbma44/artomatic | b3c7d818eb2c0443e3a8c9109d17919d69dc3170 | adding serial and firmware stuff | diff --git a/fonera-python/dd-wrt/README b/fonera-python/dd-wrt/README
new file mode 100644
index 0000000..207a656
--- /dev/null
+++ b/fonera-python/dd-wrt/README
@@ -0,0 +1,10 @@
+This is an old beta release of DD-WRT (DD-WRT v24 Beta (08/03/07) std - build 7603).
+
+It may be downloaded from:
+http://www.dd-wrt.com/d... |
sbma44/artomatic | 61fc7d0d9a896276ba3d5186795d3000456af376 | actually adding _socket code this time. whoops! | diff --git a/scripts/bellserver.py b/scripts/bellserver.py
index 54b051b..454ee0c 100644
--- a/scripts/bellserver.py
+++ b/scripts/bellserver.py
@@ -1,95 +1,99 @@
# Echo server program
-import socket
+try:
+ import socket
+except Exception, e:
+ import _socket as socket
import time
+import settings
class Bel... |
sbma44/artomatic | 3dbcb812f8464a8d7c1892f45f70ffce5b78acdb | breaking settings out into a separate file. accounting for _socket module naming in fonera environment. | diff --git a/scripts/settings.py b/scripts/settings.py
new file mode 100644
index 0000000..43414b1
--- /dev/null
+++ b/scripts/settings.py
@@ -0,0 +1,3 @@
+HOST = ''
+RECIPIENTS = ['127.0.0.1']
+PORT = 50008
|
sbma44/artomatic | 04ba824fa67e2c8e684421d7a553d3b1a9730507 | adding python-fonera resources and first pass at bellserver script | diff --git a/fonera-python/UserDict.py b/fonera-python/UserDict.py
new file mode 100644
index 0000000..5e97817
--- /dev/null
+++ b/fonera-python/UserDict.py
@@ -0,0 +1,175 @@
+"""A more or less complete user-defined wrapper around dictionary objects."""
+
+class UserDict:
+ def __init__(self, dict=None, **kwargs):
+... |
jenglert/The-Peoples--Feed | e5e968a7db53c726669b561e06984b1d31443969 | Increasing number of feed items as max. | diff --git a/app/models/feed.rb b/app/models/feed.rb
index 26e2608..9caea90 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,146 +1,146 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed < ActiveRecord::Base... |
jenglert/The-Peoples--Feed | e6878de330071d0d60c6ae17778448c22c7a7f8f | Increasing the feed count | diff --git a/app/models/feed.rb b/app/models/feed.rb
index 3d9eaca..26e2608 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,146 +1,146 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed < ActiveRecord::Base... |
jenglert/The-Peoples--Feed | 4ea789371702437585f0f0981533734f09c2a434 | Fixing the feed admin page | diff --git a/app/models/feed.rb b/app/models/feed.rb
index 99be46d..3d9eaca 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,145 +1,146 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed < ActiveRecord::Base... |
jenglert/The-Peoples--Feed | a4345eafccd70c832e79c7e22d5e8e9c26818406 | Improving the feed admin page. | diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index a4413ba..d4c2d0d 100644
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -1,61 +1,74 @@
class FeedController < ApplicationController
before_filter :admin_authorized?, :only => [:remove_... |
jenglert/The-Peoples--Feed | bcc61c3e9c9f40be5f90612a09adace2bde725c6 | increasing the rails version | diff --git a/config/environment.rb b/config/environment.rb
index bc675ef..9e2f3f3 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,59 +1,59 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = ... |
jenglert/The-Peoples--Feed | cd8b0fbcd4070068e9177b7e8859e555642e09eb | Reducing the amount of feeds updated with update_some | diff --git a/app/models/feed.rb b/app/models/feed.rb
index a5b667f..56d738d 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,145 +1,145 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed < ActiveRecord::Base... |
jenglert/The-Peoples--Feed | bf380c0a8cdedbd642c84fdea45bbdc755bd5325 | Adding the update some feed command | diff --git a/app/models/feed.rb b/app/models/feed.rb
index 4d2242e..a5b667f 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,135 +1,145 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed < ActiveRecord::Base... |
jenglert/The-Peoples--Feed | 15e4b6ecd5437b5711e221474388cec04d81ae95 | code cleanup | diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 1341889..296306a 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,63 +1,60 @@
# This controller handles the login/logout function of the site.
class SessionsContro... |
jenglert/The-Peoples--Feed | 82a85b59b8e82dcbb8923d4bd524dd0658ed3982 | cleaning up script | diff --git a/script/clearCaches.sh b/script/clearCaches.sh
index c7a18ad..9a94760 100755
--- a/script/clearCaches.sh
+++ b/script/clearCaches.sh
@@ -1,8 +1,3 @@
-#!/bin/sh
+#!/bin/bash
rm ~/Documents/thepeoplesfeed/public/sitemap.xml
rm -rf ~/Documents/thepeoplesfeed/tmp/cache/*
-wget --spider http://localhost:9000/s... |
jenglert/The-Peoples--Feed | f5c8891f85bb1be72d8bba4e8c310725a6b1367a | Removing a potential NPE | diff --git a/app/views/feed/show.html.erb b/app/views/feed/show.html.erb
index 9bce24d..bfe7dfb 100644
--- a/app/views/feed/show.html.erb
+++ b/app/views/feed/show.html.erb
@@ -1,44 +1,44 @@
<% meta_description "RSS feeds provided by '#{@feed.title}'"%>
<div class="feedShow">
<table class="feedInfo">
<tr>
<t... |
jenglert/The-Peoples--Feed | 4ddce9e9b0678f97faae29bfa2ad459e03a00664 | Adding the clear caches file. | diff --git a/script/clearCaches.sh b/script/clearCaches.sh
new file mode 100755
index 0000000..c7a18ad
--- /dev/null
+++ b/script/clearCaches.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+rm ~/Documents/thepeoplesfeed/public/sitemap.xml
+rm -rf ~/Documents/thepeoplesfeed/tmp/cache/*
+wget --spider http://localhost:9000/sitemap.xml
+w... |
jenglert/The-Peoples--Feed | ac29876d2e81ec913a1d38d422901ac9d79924cb | Increasing the timeout for a broken feed | diff --git a/app/models/feed.rb b/app/models/feed.rb
index 9cb4007..4d2242e 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,135 +1,135 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed < ActiveRecord::Base... |
jenglert/The-Peoples--Feed | 535cfba09535e83a41b20c923c297d6fddc6b902 | Making category names unique | diff --git a/app/models/category.rb b/app/models/category.rb
index c4a6c1f..ccb9753 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1,12 +1,12 @@
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Category < ActiveRecord::Base
- has_many :feed_item... |
jenglert/The-Peoples--Feed | 8274942314d9aa63bffc921102a3fcae4a22bd77 | Enhancing incremental | diff --git a/db/migrate/20100929034845_make_guid_unique.rb b/db/migrate/20100929034845_make_guid_unique.rb
index 19ece98..83f7e04 100644
--- a/db/migrate/20100929034845_make_guid_unique.rb
+++ b/db/migrate/20100929034845_make_guid_unique.rb
@@ -1,19 +1,20 @@
class MakeGuidUnique < ActiveRecord::Migration
def self.u... |
jenglert/The-Peoples--Feed | df26ce0e4d538ff6e1370cba737b0398d2b441fd | Enhancing incremental | diff --git a/db/migrate/20100929034845_make_guid_unique.rb b/db/migrate/20100929034845_make_guid_unique.rb
index 588f37c..19ece98 100644
--- a/db/migrate/20100929034845_make_guid_unique.rb
+++ b/db/migrate/20100929034845_make_guid_unique.rb
@@ -1,16 +1,19 @@
class MakeGuidUnique < ActiveRecord::Migration
def self.u... |
jenglert/The-Peoples--Feed | f53b0aa0fe4653a398b7d888843b37f5824e4fb7 | adding incremental to make guid on feed items have a unique index | diff --git a/db/migrate/20100929034845_make_guid_unique.rb b/db/migrate/20100929034845_make_guid_unique.rb
new file mode 100644
index 0000000..588f37c
--- /dev/null
+++ b/db/migrate/20100929034845_make_guid_unique.rb
@@ -0,0 +1,16 @@
+class MakeGuidUnique < ActiveRecord::Migration
+ def self.up
+ FeedItem.all.each ... |
jenglert/The-Peoples--Feed | 5f14746b260893b959b97893d75925baf96b2c38 | Updating readme file. | diff --git a/README b/README
index 37ec8ea..b3104c8 100644
--- a/README
+++ b/README
@@ -1,243 +1,4 @@
-== Welcome to Rails
+The Peoples Feed
+================
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern... |
jenglert/The-Peoples--Feed | 0207c31bacb19d4ce7c7a0e5de2ebbc857766a9e | Adding comment | diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index a4af25f..47cd8dc 100644
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -1,141 +1,142 @@
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class FeedItem < ActiveRecord::Base
belongs_t... |
jenglert/The-Peoples--Feed | e3c6d04e81901fadc9884d9f3b7ab54e77302fae | Altering feed items to provide a larger range of feed providers in the list of feeds. | diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index e28d9e1..a4af25f 100644
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -1,128 +1,141 @@
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class FeedItem < ActiveRecord::Base
belongs_t... |
jenglert/The-Peoples--Feed | b878fda20779a7457064b06f00e7a58026453d90 | Preventing errors if the system cannot find a feed item, likely because it has been deleted. | diff --git a/app/controllers/feed_item_controller.rb b/app/controllers/feed_item_controller.rb
index bc74f3c..77f4e80 100644
--- a/app/controllers/feed_item_controller.rb
+++ b/app/controllers/feed_item_controller.rb
@@ -1,32 +1,38 @@
class FeedItemController < ApplicationController
def show
- @feed_item = F... |
jenglert/The-Peoples--Feed | 82cf7fc11252acb915301373242c9e1eba50c1e0 | Enhancing the admin pages. Adding a new admin layout. Ability to see the feed parse logs. | diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index 5d31331..a4413ba 100644
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -1,55 +1,61 @@
class FeedController < ApplicationController
before_filter :admin_authorized?, :only => [:remove_... |
jenglert/The-Peoples--Feed | c1bbe931caeb7a5bebff6b9a8eb0038d0c54ef4b | Fixing logger. | diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index 458ca57..e28d9e1 100644
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -1,128 +1,128 @@
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class FeedItem < ActiveRecord::Base
belongs_t... |
jenglert/The-Peoples--Feed | 8b7d20ec6ac1818e8c704bae74457035d7506a65 | Adding feed admin page. | diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index 2f72835..5d31331 100644
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -1,50 +1,55 @@
class FeedController < ApplicationController
before_filter :admin_authorized?, :only => [:remove_... |
jenglert/The-Peoples--Feed | 1a26821a6f214ece4e191605f430783da7a91af6 | Removing unused require | diff --git a/app/models/feed.rb b/app/models/feed.rb
index 4453752..95cb706 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,133 +1,133 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
-require 'ruby-prof'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed... |
jenglert/The-Peoples--Feed | fb585cb9f765b81484dceb00a8d33d2d1524b4cd | Adding disabled flag to feeds. | diff --git a/app/models/feed.rb b/app/models/feed.rb
index 53a7ab9..4453752 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,112 +1,133 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
+require 'ruby-prof'
+
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed... |
jenglert/The-Peoples--Feed | 90b5b620fd62b397e37dd94654868983e73fdab9 | Adding a job for updating the feed | diff --git a/config/schedule.rb b/config/schedule.rb
index 667fe60..7cbaf53 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -1,22 +1,27 @@
# Learn more: http://github.com/javan/whenever
# Refresh the feed parse stats
every 1.day, :at => "11:30pm" do
runner "FeedParseStat.refresh"
end
#######... |
jenglert/The-Peoples--Feed | 83e162eceeb1e41f8b71272eccb843097230f7fc | Updating the people's feed logo so that the word people is larger! | diff --git a/public/images/header_logo.png b/public/images/header_logo.png
index 0387a3c..ccaeb6a 100644
Binary files a/public/images/header_logo.png and b/public/images/header_logo.png differ
diff --git a/public/images/header_logo.psd b/public/images/header_logo.psd
index 89c6617..e87ef6f 100644
Binary files a/public/... |
jenglert/The-Peoples--Feed | a7bea4a81a8d86d1cc9af61bf47da352e0eea09b | Fixing ads | diff --git a/public/personal/halloween-09/index.html b/public/personal/halloween-09/index.html
index e57849f..4f43d4d 100644
--- a/public/personal/halloween-09/index.html
+++ b/public/personal/halloween-09/index.html
@@ -1,82 +1,118 @@
<html>
<head>
<title>Lee's Halloween Eve Adventure</title>
<style>
* { co... |
jenglert/The-Peoples--Feed | 0bf5f89bbd6b9829c17b7f33c9f5d804783d078e | Adding personal page w/ lee as faerie | diff --git a/public/personal/halloween-09/index.html b/public/personal/halloween-09/index.html
new file mode 100644
index 0000000..e57849f
--- /dev/null
+++ b/public/personal/halloween-09/index.html
@@ -0,0 +1,82 @@
+<html>
+<head>
+ <title>Lee's Halloween Eve Adventure</title>
+ <style>
+ * { color: white; }
+ IMG... |
jenglert/The-Peoples--Feed | d205e7e1e64d44f4658a49263e35950bd3673851 | Increasing the delay between updates. | diff --git a/lib/daemons/update.rb b/lib/daemons/update.rb
index 53c9869..c969b3e 100755
--- a/lib/daemons/update.rb
+++ b/lib/daemons/update.rb
@@ -1,22 +1,22 @@
#!/usr/bin/env ruby
# You might want to change this
ENV["RAILS_ENV"] ||= "production"
require File.dirname(__FILE__) + "/../../config/environment"
... |
jenglert/The-Peoples--Feed | b32fb6970437aec3a58b5abad41292cd5b27bcec | Reducing the value of an image by one point. | diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index e723ab5..7566ab2 100644
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -1,132 +1,132 @@
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class FeedItem < ActiveRecord::Base
belongs_t... |
jenglert/The-Peoples--Feed | a51e1783a887af5dc82c9c35200ce247996b281f | Fixing typo | diff --git a/app/models/feed.rb b/app/models/feed.rb
index e4d6b71..53a7ab9 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,112 +1,112 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed < ActiveRecord::Base
... |
jenglert/The-Peoples--Feed | 1f52cf28c8d63b8e98f3b82fef408002293a3260 | reducing the frequency of the update job allow feeds to remove feed parse logs | diff --git a/app/models/feed.rb b/app/models/feed.rb
index 218f3e0..e4d6b71 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -1,105 +1,112 @@
require 'rss/2.0'
require 'open-uri'
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class Feed < ActiveRecord::Base
... |
jenglert/The-Peoples--Feed | 1acba8ff77de1b0841bfd4403d0afe36aab85f7e | Adding the ability to delete feeds. | diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index 5bc3f91..e723ab5 100644
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -1,132 +1,132 @@
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class FeedItem < ActiveRecord::Base
belongs_t... |
jenglert/The-Peoples--Feed | 99d239ec85a35a2da1e03f646b5458cf7e392022 | Adding the ability to delete feeds. | diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 1281157..7b5c0ba 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,19 +1,21 @@
class CommentsController < ApplicationController
+ before_filter :admin_authorized?... |
jenglert/The-Peoples--Feed | 0b19b81474e3c2e25d27e1f1c1bbfe6d60241739 | Fixing the last updated timestamp so that it will work no feed items. | diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index a4bb1bb..9ddb9e5 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -1,121 +1,123 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-s... |
jenglert/The-Peoples--Feed | 59d364ef4d7b8ac4dc895413837db9322510c80b | simplifying the ascii code. | diff --git a/app/models/user.rb b/app/models/user.rb
index e8d8949..fd4f680 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,87 +1,87 @@
require 'digest/sha1'
class User < ActiveRecord::Base
# Virtual attribute for the unencrypted password
attr_accessor :password
validates_presence_of :lo... |
jenglert/The-Peoples--Feed | c7c41c97b3a6b89587117e9647eff8825f7dc560 | Fixing forgot password issue | diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 7ff37c6..1341889 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,65 +1,63 @@
-require 'active_support/secure_random'
-
# This controller handles the login/logout f... |
jenglert/The-Peoples--Feed | 26e9d36703600f53753cc8ad7d3a2841d90e7c84 | Fixing forgotpassword | diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 943d27e..7ff37c6 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,65 +1,65 @@
require 'active_support/secure_random'
-
+
# This controller handles the login/logout... |
jenglert/The-Peoples--Feed | faf3bf1b8c33742fe90f7264943fcee05ae6d5da | Fixing the forgot password screen. Making the participate links wider. | diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 5b0aa0f..943d27e 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,63 +1,65 @@
+require 'active_support/secure_random'
+
# This controller handles the login/logout fun... |
jenglert/The-Peoples--Feed | 33a453a2dc464d14a95e30c874f908ebb355242d | Enhancing the styles for the forgot password functionality on TPF | diff --git a/app/views/consumer_mailer/forgot_password.html.erb b/app/views/consumer_mailer/forgot_password.html.erb
index 0d4e6ea..4af3e8a 100644
--- a/app/views/consumer_mailer/forgot_password.html.erb
+++ b/app/views/consumer_mailer/forgot_password.html.erb
@@ -1,3 +1,5 @@
-Your password has been reset.
+<%= page_... |
jenglert/The-Peoples--Feed | fe41d53f17da8e6d04d8ccce2342e75d6982cd69 | Forgot password functionality. | diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 0266cdf..5b0aa0f 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,38 +1,63 @@
# This controller handles the login/logout function of the site.
class SessionsContro... |
jenglert/The-Peoples--Feed | 11771ac4cb116fe6eb950c2055945caada91b6ad | Updating a couple styles. | diff --git a/app/views/shared/_feed_item_wide.html.erb b/app/views/shared/_feed_item_wide.html.erb
index 612ebe9..5b3240f 100644
--- a/app/views/shared/_feed_item_wide.html.erb
+++ b/app/views/shared/_feed_item_wide.html.erb
@@ -1,26 +1,26 @@
<div class="feedItemWide whiteBackground">
<table>
<tr>
<td>
<... |
jenglert/The-Peoples--Feed | 0962252791e08b2a908ae4058bb03e6f058e30ab | Removing an extra colon from the email a friend url. | diff --git a/app/views/shared/_participate.html.erb b/app/views/shared/_participate.html.erb
index 8bd7bc7..95809ce 100644
--- a/app/views/shared/_participate.html.erb
+++ b/app/views/shared/_participate.html.erb
@@ -1,94 +1,94 @@
<%= render :partial => 'shared/show_comments', :locals => { :comments => item.comments }... |
jenglert/The-Peoples--Feed | a8f57a814a4d6327a502db590aa7a79286ba2f98 | Fixing a typo in the email link | diff --git a/app/controllers/email_a_friend_messages_controller.rb b/app/controllers/email_a_friend_messages_controller.rb
index a85c9e0..7f6d470 100644
--- a/app/controllers/email_a_friend_messages_controller.rb
+++ b/app/controllers/email_a_friend_messages_controller.rb
@@ -1,28 +1,28 @@
class EmailAFriendMessagesCo... |
jenglert/The-Peoples--Feed | 9e6968ab868c5fcac3e1c2f79cbd5931edbc9b22 | Adding related articles to the articles page. | diff --git a/app/models/feed_item.rb b/app/models/feed_item.rb
index 1dff202..878debb 100644
--- a/app/models/feed_item.rb
+++ b/app/models/feed_item.rb
@@ -1,125 +1,132 @@
require 'acts_as_commentable'
ActiveRecord::Base.send(:include, Juixe::Acts::Commentable)
class FeedItem < ActiveRecord::Base
belongs_t... |
jenglert/The-Peoples--Feed | 525815025526d2975ceea8934ff3f5846e355476 | Adding utml source to the email a friend email | diff --git a/app/views/consumer_mailer/email_a_friend.rhtml b/app/views/consumer_mailer/email_a_friend.rhtml
index d36a92f..fe0af65 100644
--- a/app/views/consumer_mailer/email_a_friend.rhtml
+++ b/app/views/consumer_mailer/email_a_friend.rhtml
@@ -1,5 +1,5 @@
<%= @email_a_friend_settings.sender_email_address %> wants... |
jenglert/The-Peoples--Feed | a3356466b93ec20934bcafd826ff8946de5a261c | Fixing png transparency | diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index 0d89c4f..a4bb1bb 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -1,120 +1,121 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-s... |
jenglert/The-Peoples--Feed | da3221c8b8cb7ab16f1246eeafffb0a1db472cb5 | Enhancing javascript | diff --git a/app/views/shared/_participate.html.erb b/app/views/shared/_participate.html.erb
index d74c586..8bd7bc7 100644
--- a/app/views/shared/_participate.html.erb
+++ b/app/views/shared/_participate.html.erb
@@ -1,94 +1,94 @@
<%= render :partial => 'shared/show_comments', :locals => { :comments => item.comments }... |
jenglert/The-Peoples--Feed | 6babe8074d574ae6e7b7652eb0f2e06085e1e40c | Using an alternate link tag style. | diff --git a/app/views/shared/_participate.html.erb b/app/views/shared/_participate.html.erb
index 5c88d60..d74c586 100644
--- a/app/views/shared/_participate.html.erb
+++ b/app/views/shared/_participate.html.erb
@@ -1,94 +1,94 @@
<%= render :partial => 'shared/show_comments', :locals => { :comments => item.comments }... |
jenglert/The-Peoples--Feed | e06cab45326b45486c1db7973b5503caf0abfaeb | Updating some things | diff --git a/app/views/shared/_create_comment.html.erb b/app/views/shared/_create_comment.html.erb
index 7c452c9..d10e072 100644
--- a/app/views/shared/_create_comment.html.erb
+++ b/app/views/shared/_create_comment.html.erb
@@ -1,64 +1,57 @@
<div class="addComment">
<h3>Add a Comment</h3>
<div class="body">
<%... |
jenglert/The-Peoples--Feed | 1a901017d2a63e0e9693ef1110d018d565e917ef | Making the participate link a bit fancier. | diff --git a/.gitignore b/.gitignore
index e3af559..5e30051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
log/*.log
config/database.yml
tmp/**/*
.DS_Store
db/*.sqlite3
/.idea
*.rb~
.gitignore~
+public/sitemap.xml
diff --git a/app/views/feed_item/show.html.erb b/app/views/feed_item/show.html.erb
index... |
jenglert/The-Peoples--Feed | e980a855fb1059e95c92d2b9fb0f3aeb1e94bc40 | Adding stupid image back. | diff --git a/public/images/background.jpg b/public/images/background.jpg
new file mode 100644
index 0000000..901f19a
Binary files /dev/null and b/public/images/background.jpg differ
|
jenglert/The-Peoples--Feed | f7b9c8b343729571085e5e5fdbef935b03d613c2 | Updating background | diff --git a/public/images/background.psd b/public/images/background.psd
index dfb3fce..7743edc 100644
Binary files a/public/images/background.psd and b/public/images/background.psd differ
|
jenglert/The-Peoples--Feed | f45bdd1dc14e608c05a44f0aa46fe48de41c2dd7 | Updating files. | diff --git a/app/views/feed_item/show.html.erb b/app/views/feed_item/show.html.erb
index bc1c283..3ba77a1 100644
--- a/app/views/feed_item/show.html.erb
+++ b/app/views/feed_item/show.html.erb
@@ -1,156 +1,109 @@
<% meta_description @feed_item.description.fix_html %>
<div class="feedItemShow">
<div class="sectionHe... |
jenglert/The-Peoples--Feed | a9d2cc127762ffa3c30a81824940fe2c74c190d6 | Lightening menu text. | diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 95c80a2..dd1274c 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -1,216 +1,216 @@
/* Global styles */
* { margin: 0px; padding: 0px; outline: none; font-family: Arial; }
BODY ... |
jenglert/The-Peoples--Feed | ed0a769822c87c60179ee65273cdd45a2676d42e | Increasing the width of the website overall. Lightening some colors to improve readability. | diff --git a/public/images/background.jpg b/public/images/background.jpg
index 09f2e4c..901f19a 100644
Binary files a/public/images/background.jpg and b/public/images/background.jpg differ
diff --git a/public/images/background.psd b/public/images/background.psd
index c1a2df7..dfb3fce 100644
Binary files a/public/images... |
jtietema/Fizzy | 6915cf76e4c00af2a5705fb8ac61a8241e8c063e | remove expired personal Akismet API key | diff --git a/configs/application.ini b/configs/application.ini
index 953ca76..36f7d3c 100644
--- a/configs/application.ini
+++ b/configs/application.ini
@@ -1,44 +1,44 @@
[production]
bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
resources.frontController.moduleDirectory = APPLICATION_PATH "/modules"
resources... |
jtietema/Fizzy | c9ae569d449bfac49a3ec7eb745fcb7b0018e21e | fixed translation bug | diff --git a/library/Fizzy/Controller.php b/library/Fizzy/Controller.php
index d5ad287..87f5091 100644
--- a/library/Fizzy/Controller.php
+++ b/library/Fizzy/Controller.php
@@ -1,142 +1,142 @@
<?php
/**
* Class Fizzy_Controller
* @package Fizzy
*
* LICENSE
*
* This source file is subject to the new BSD li... |
jtietema/Fizzy | 82f90c5e91ff98269eaf82376f9e7efc22e29682 | added default language selection to the login page | diff --git a/application/modules/admin/controllers/AuthController.php b/application/modules/admin/controllers/AuthController.php
index 91dd414..a7c2205 100644
--- a/application/modules/admin/controllers/AuthController.php
+++ b/application/modules/admin/controllers/AuthController.php
@@ -1,125 +1,128 @@
<?php
/**
*... |
jtietema/Fizzy | d36b98e2ff8e329d8438cc3b8bb4b29960285dd1 | added language selection option to the login page | diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 6317300..164ccc8 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,143 +1,151 @@
<?php
/**
* Class Bootstrap
* @category Fizzy
* @package Fizzy_Bootstrap
*
* LICENSE
*
* This source file is subject to the... |
jtietema/Fizzy | 665664771891ff050e1f8ac48a276a589bcbdfbf | translations of the custom WYSIWYG plugins | diff --git a/application/assets/js/fizzy.js b/application/assets/js/fizzy.js
index 97a45e2..27e8543 100644
--- a/application/assets/js/fizzy.js
+++ b/application/assets/js/fizzy.js
@@ -1,39 +1,42 @@
var Fizzy = function(){
var _editors = [];
+ var _language = 'en';
return {
"wysiwyg" : {
- ... |
jtietema/Fizzy | e6efd62e572c5ffa7e115777e6d77d2b399c6ac9 | Dutch language pack for TinyMCE | diff --git a/application/assets/js/tiny_mce/langs/nl.js b/application/assets/js/tiny_mce/langs/nl.js
new file mode 100644
index 0000000..9901525
--- /dev/null
+++ b/application/assets/js/tiny_mce/langs/nl.js
@@ -0,0 +1,170 @@
+tinyMCE.addI18n({nl:{
+common:{
+edit_confirm:"Weet u zeker dat u tekst in WYSIWYG mode wil... |
jtietema/Fizzy | 35bbe81499799b7c6fc2d09bb6965fc96880619e | most of the backend is translated | diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index f9a5874..6317300 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,130 +1,143 @@
<?php
/**
* Class Bootstrap
* @category Fizzy
* @package Fizzy_Bootstrap
*
* LICENSE
*
* This source file is subject to the... |
jtietema/Fizzy | e2aa1072b0a4c2d5418d3c1d1bf4a674cd245f9b | Module specific ErrorHandler | diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 0e9a29d..f9a5874 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,122 +1,130 @@
<?php
/**
* Class Bootstrap
* @category Fizzy
* @package Fizzy_Bootstrap
*
* LICENSE
*
* This source file is subject to the... |
jtietema/Fizzy | f370666737b2fa05c7786ee859b786310ede03b5 | rss and atom examples for blog frontend | diff --git a/application/modules/default/controllers/BlogController.php b/application/modules/default/controllers/BlogController.php
index 7218e9d..d5ae38b 100644
--- a/application/modules/default/controllers/BlogController.php
+++ b/application/modules/default/controllers/BlogController.php
@@ -1,125 +1,182 @@
<?php
... |
jtietema/Fizzy | e6ed3a2a9005eaf3b32a9c9d9ca9dcbb6eb48cb0 | Geocode unit tests and improved UnitTesting.txt | diff --git a/UnitTesting.txt b/UnitTesting.txt
index 1d1cf73..e7b0fbe 100644
--- a/UnitTesting.txt
+++ b/UnitTesting.txt
@@ -1,6 +1,19 @@
Running the testsuite
=====================
-run "phpunit ." from the tests directory. (Make sure you have phpunit installed)
+The testsuite requires that you have PHPUnit 3.4 or... |
jtietema/Fizzy | 4115a3db398f03329f8d37b432f003268cdbc82f | improved Youtube filter and validator | diff --git a/UnitTesting.txt b/UnitTesting.txt
new file mode 100644
index 0000000..1d1cf73
--- /dev/null
+++ b/UnitTesting.txt
@@ -0,0 +1,6 @@
+Running the testsuite
+=====================
+
+run "phpunit ." from the tests directory. (Make sure you have phpunit installed)
+
+Works with phpunit 3.4.x
\ No newline at end... |
jtietema/Fizzy | 9e1eb45ebe2410ca3238a1a3b7e04b075e9dc98b | small bugfix in comments spam filtering | diff --git a/application/models/Comments.php b/application/models/Comments.php
index ab5e47e..1747af2 100644
--- a/application/models/Comments.php
+++ b/application/models/Comments.php
@@ -1,77 +1,77 @@
<?php
/**
* Comments
*
* This class has been auto-generated by the Doctrine ORM Framework
*
* @packag... |
jtietema/Fizzy | 6866dd5e304bf710274c05453e5895f7227cf35b | license headers geocode classes | diff --git a/application/library/Fizzy/Geocode/Adapter/Google.php b/application/library/Fizzy/Geocode/Adapter/Google.php
index 5a26496..bf46b50 100644
--- a/application/library/Fizzy/Geocode/Adapter/Google.php
+++ b/application/library/Fizzy/Geocode/Adapter/Google.php
@@ -1,214 +1,232 @@
<?php
+/**
+ * Class Fizzy_Geo... |
jtietema/Fizzy | adbecfdba3686740b0469cde68f2b6a58dc30684 | baseUrl's where inserted twice when using nested url viewhelpers | diff --git a/application/modules/admin/views/scripts/blogs/blog.phtml b/application/modules/admin/views/scripts/blogs/blog.phtml
index 2304fb9..9cd7511 100644
--- a/application/modules/admin/views/scripts/blogs/blog.phtml
+++ b/application/modules/admin/views/scripts/blogs/blog.phtml
@@ -1,56 +1,56 @@
<div id="content... |
jtietema/Fizzy | 08ceac1a8155bd5a3685923446d6363493f792e1 | Wrong view helper call to assetUrl | diff --git a/application/modules/admin/views/scripts/pages/index.phtml b/application/modules/admin/views/scripts/pages/index.phtml
index c78575c..fc3ec20 100644
--- a/application/modules/admin/views/scripts/pages/index.phtml
+++ b/application/modules/admin/views/scripts/pages/index.phtml
@@ -1,48 +1,48 @@
<div id="con... |
jtietema/Fizzy | 3ceb822a3fce730b5fd2ec62fb30ff24e56f3c87 | Big commit with all static backend urls replaced | diff --git a/application/modules/admin/controllers/AuthController.php b/application/modules/admin/controllers/AuthController.php
index b357970..d9bb2f5 100644
--- a/application/modules/admin/controllers/AuthController.php
+++ b/application/modules/admin/controllers/AuthController.php
@@ -1,91 +1,92 @@
<?php
/**
* C... |
jtietema/Fizzy | 8394ed38ee9f685cb4e7d5b0b0d685a9f9551b3b | Added Url view helper | diff --git a/library/Fizzy/View/Helper/Url.php b/library/Fizzy/View/Helper/Url.php
new file mode 100644
index 0000000..5774290
--- /dev/null
+++ b/library/Fizzy/View/Helper/Url.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Class Fizzy_View_Helper_Url
+ * @package Fizzy
+ * @subpackage View
+ *
+ * LICENSE
+ *
+ * This source f... |
jtietema/Fizzy | 5fbba06297925af6de300fd867652a23bb44d89c | Basic version of blog frontend | diff --git a/application/models/generated/BasePost.php b/application/models/generated/BasePost.php
index 1a726b0..15e4383 100644
--- a/application/models/generated/BasePost.php
+++ b/application/models/generated/BasePost.php
@@ -1,73 +1,82 @@
<?php
/**
* BasePost
*
* This class has been auto-generated by the... |
jtietema/Fizzy | f25f2ba566f04d311e8c2ce53a38bec10f1dc613 | url's gebruiken nu allemaal link view helper in comments module | diff --git a/application/modules/admin/controllers/CommentsController.php b/application/modules/admin/controllers/CommentsController.php
index 60c84a8..8e98ccb 100644
--- a/application/modules/admin/controllers/CommentsController.php
+++ b/application/modules/admin/controllers/CommentsController.php
@@ -1,286 +1,289 @@... |
jtietema/Fizzy | 50b7222465b0444c189fffd82ba71ebe18027811 | styling comments | diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css
index 4244fbc..7f4cfa6 100644
--- a/application/assets/css/fizzy-2.0.css
+++ b/application/assets/css/fizzy-2.0.css
@@ -1,545 +1,550 @@
/**
* Fizzy 2.0 Stylesheet
*
* Scheme: http://colorschemedesigner.com/#3D11TpE--l2br
*... |
jtietema/Fizzy | 70c954444756c403243747ac5b59cf6df7fea58f | improvements in sub-navigation | diff --git a/application/assets/css/fizzy-2.0.css b/application/assets/css/fizzy-2.0.css
index a1364dd..4244fbc 100644
--- a/application/assets/css/fizzy-2.0.css
+++ b/application/assets/css/fizzy-2.0.css
@@ -1,539 +1,545 @@
/**
* Fizzy 2.0 Stylesheet
*
* Scheme: http://colorschemedesigner.com/#3D11TpE--l2br
*... |
jtietema/Fizzy | 67bb795f4c8f95de41f4b5d1c914d8c2349d1e83 | bug fix in saving pages | diff --git a/application/modules/admin/views/scripts/pages/form.phtml b/application/modules/admin/views/scripts/pages/form.phtml
index a25dce2..b1cf2cb 100644
--- a/application/modules/admin/views/scripts/pages/form.phtml
+++ b/application/modules/admin/views/scripts/pages/form.phtml
@@ -1,68 +1,69 @@
<form action="<?... |
jtietema/Fizzy | f8bd1a0a3471c18bec32f50507b1f401fe90bc94 | editing a user doesn't require re-entry of password | diff --git a/application/models/User.php b/application/models/User.php
index 2b9d1a4..d810fa5 100644
--- a/application/models/User.php
+++ b/application/models/User.php
@@ -1,28 +1,30 @@
<?php
/**
* User
*
* This class has been auto-generated by the Doctrine ORM Framework
*
* @package ##PACKAGE##
*... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.