repo
string
commit
string
message
string
diff
string
benjamw/pharaoh
a13f456d20ee45f188387f0b2625ea24d6c33083
reordered priorities
diff --git a/todo.txt b/todo.txt index 25cc6d3..f27e27c 100644 --- a/todo.txt +++ b/todo.txt @@ -1,39 +1,39 @@ +- build game reader for saved games + - update scripts - use yepnope and cdn +- add showdown to messages (JS port of Markdown, in zz_scripts_js) + +- fully convert times to UTC in MySQL and back to use...
benjamw/pharaoh
b9df9b6148469ca68a5af606b9cca30e0e4eb764
Removed unneeded method call to fix invite error
diff --git a/invite.php b/invite.php index 960b66d..a109395 100644 --- a/invite.php +++ b/invite.php @@ -1,274 +1,271 @@ <?php require_once 'includes/inc.global.php'; // this has nothing to do with creating a game // but I'm running it here to prevent long load // times on other pages where it would be run mor...
benjamw/pharaoh
5a82a87ea09f66be755471be347b7a26c84c72fc
minor adjustments to mysql query return
diff --git a/classes/mysql.class.php b/classes/mysql.class.php index 261b978..2616570 100644 --- a/classes/mysql.class.php +++ b/classes/mysql.class.php @@ -1,910 +1,916 @@ <?php /* +--------------------------------------------------------------------------- | | mysql.class.php (php 5.x) | | by Benjam Welker...
benjamw/pharaoh
ca5122bb24e32ab889751467f33f1c2a1eb600bc
minor speed improvement by removing is_readable call
diff --git a/includes/func.global.php b/includes/func.global.php index f1ca927..447ad93 100644 --- a/includes/func.global.php +++ b/includes/func.global.php @@ -1,296 +1,296 @@ <?php /** function call [dump] [debug] * This function is for debugging only * Outputs given var to screen * or, if no var given, ...
benjamw/pharaoh
ff7b8fd5f32f5c38beafccf92afa104e13f93658
fixed issue with message reply and forward subject lines
diff --git a/classes/message.class.php b/classes/message.class.php index db41ce8..d8bfca0 100644 --- a/classes/message.class.php +++ b/classes/message.class.php @@ -1,910 +1,910 @@ <?php /* +--------------------------------------------------------------------------- | | message.class.php (php 5.x) | | by Ben...
benjamw/pharaoh
f5784aaf58afbc435ba99fdaf7f3baa09f21ef04
nudge only marked as complete if email was sent
diff --git a/classes/game.class.php b/classes/game.class.php index 10e015f..58530ff 100644 --- a/classes/game.class.php +++ b/classes/game.class.php @@ -1090,1028 +1090,1032 @@ class Game /** public function is_player * Tests if the given ID is a player in the game * * @param int player id * @return bo...
benjamw/pharaoh
1d6a7b7b0a715f854a46f4098b464b1771d7b246
made ajax refresh calls wait for previous ajax call to finish
diff --git a/scripts/game.js b/scripts/game.js index 85749c8..dba861d 100644 --- a/scripts/game.js +++ b/scripts/game.js @@ -264,544 +264,549 @@ function show_new_board(cont) { $('div#idx_'+game_history[move_index][3]['hits'][i]).append(create_piece(piece, true)); } } if ((move_count - 1) == move_index) { ...
benjamw/pharaoh
8de9658004b71b90da25bf762bbc188f975fbb79
removed __destruct and moved _save where it was needed
diff --git a/ajax_helper.php b/ajax_helper.php index c115f84..dc5cc91 100644 --- a/ajax_helper.php +++ b/ajax_helper.php @@ -1,294 +1,295 @@ <?php $GLOBALS['NODEBUG'] = true; $GLOBALS['AJAX'] = true; // don't require log in when testing for used usernames and emails if (isset($_POST['validity_test']) || (iss...
benjamw/pharaoh
e54e940c52a4c9174047cc2b9854fd1a41998d18
made error messages more useful
diff --git a/ajax_helper.php b/ajax_helper.php index e5030c8..c115f84 100644 --- a/ajax_helper.php +++ b/ajax_helper.php @@ -1,290 +1,294 @@ <?php $GLOBALS['NODEBUG'] = true; $GLOBALS['AJAX'] = true; // don't require log in when testing for used usernames and emails if (isset($_POST['validity_test']) || (iss...
benjamw/pharaoh
7783555670d5a5da1cc8e7031a5cf23f7bd0d610
hide nudge button if nudge not possible
diff --git a/classes/game.class.php b/classes/game.class.php index b9d0f37..16d3b31 100644 --- a/classes/game.class.php +++ b/classes/game.class.php @@ -1114,1024 +1114,1028 @@ class Game } /** public function is_turn * Returns the requested player's turn * * @param bool current player is requested pl...
benjamw/pharaoh
53d67b327a8322935eb2534c069c400733326211
ajax and javascript for simple invite actions
diff --git a/ajax_helper.php b/ajax_helper.php index 15e8bc7..e5030c8 100644 --- a/ajax_helper.php +++ b/ajax_helper.php @@ -1,281 +1,290 @@ <?php $GLOBALS['NODEBUG'] = true; $GLOBALS['AJAX'] = true; // don't require log in when testing for used usernames and emails if (isset($_POST['validity_test']) || (iss...
benjamw/pharaoh
b5df2d7f3ffac333620fbf044ea262abca387419
Fixed issue with admin deleting setups
diff --git a/setups.php b/setups.php index a3bca6e..13a07ab 100644 --- a/setups.php +++ b/setups.php @@ -1,290 +1,291 @@ <?php require_once 'includes/inc.global.php'; $act = (isset($_REQUEST['act']) ? $_REQUEST['act'] : ''); switch ($act) { case 'create' : case 'edit' : case 'clone' : if (isset($_POS...
benjamw/pharaoh
4923c4d83cfbf0282aaba3a2f52357c6cd13c1fb
allow for conversion of randomly selected setups
diff --git a/classes/game.class.php b/classes/game.class.php index aff1c1e..a2a3737 100644 --- a/classes/game.class.php +++ b/classes/game.class.php @@ -1,985 +1,979 @@ <?php /* +--------------------------------------------------------------------------- | | game.class.php (php 5.x) | | by Benjam Welker | ...
benjamw/pharaoh
5f527f309a656260157f9ed26051e779248b0c57
added instruction for invites
diff --git a/index.php b/index.php index 8e5776b..8956271 100644 --- a/index.php +++ b/index.php @@ -1,116 +1,117 @@ <?php require_once 'includes/inc.global.php'; // remove any previous game sessions unset($_SESSION['game_id']); // grab the message and game counts $message_count = (int) Message::check_new($...
benjamw/pharaoh
072abb50ffe3b9bad7eeb075144e96bb4bb5f717
added default value for email
diff --git a/classes/email.class.php b/classes/email.class.php index 1336591..ef62767 100644 --- a/classes/email.class.php +++ b/classes/email.class.php @@ -1,269 +1,269 @@ <?php /* +--------------------------------------------------------------------------- | | email.class.php (php 5.x) | | by Benjam Welker...
benjamw/pharaoh
9a4e3e69d5cb9a8d7f336e4fbc7f8f69170e53dd
made class autoloader a bit more bulletproof
diff --git a/includes/func.global.php b/includes/func.global.php index 1650f2a..f1ca927 100644 --- a/includes/func.global.php +++ b/includes/func.global.php @@ -1,293 +1,296 @@ <?php /** function call [dump] [debug] * This function is for debugging only * Outputs given var to screen * or, if no var given, ...
benjamw/pharaoh
99a1bab3a8c8112e4daa0de33404caf632e10846
fixed issue with pharaohs and sphynxes on setups
diff --git a/scripts/setups.js b/scripts/setups.js index 4fc8f1d..9bf95ce 100644 --- a/scripts/setups.js +++ b/scripts/setups.js @@ -1,279 +1,292 @@ var reload = true; var selected = false; var board_changed = false; if ('undefined' == typeof board) { var board = false; } $(document).ready( function($) { ...
benjamw/pharaoh
cee51c18ebb507350a27dbad46e7a44c84b3a156
make sure to cast vars in max function
diff --git a/classes/game.class.php b/classes/game.class.php index 03ceff2..aff1c1e 100644 --- a/classes/game.class.php +++ b/classes/game.class.php @@ -1,959 +1,959 @@ <?php /* +--------------------------------------------------------------------------- | | game.class.php (php 5.x) | | by Benjam Welker | ...
benjamw/pharaoh
f8b597470123baeed159877293ac8ff26b372d57
made better ife (if-else) functions
diff --git a/classes/game.class.php b/classes/game.class.php index 680f96b..03ceff2 100644 --- a/classes/game.class.php +++ b/classes/game.class.php @@ -1,955 +1,950 @@ <?php /* +--------------------------------------------------------------------------- | | game.class.php (php 5.x) | | by Benjam Welker | ...
benjamw/pharaoh
a8149d3b37320bb332210184faf2449429ae8408
switch to less intensive require
diff --git a/classes/email.class.php b/classes/email.class.php index 7ff0627..1336591 100644 --- a/classes/email.class.php +++ b/classes/email.class.php @@ -1,269 +1,269 @@ <?php /* +--------------------------------------------------------------------------- | | email.class.php (php 5.x) | | by Benjam Welker...
benjamw/pharaoh
6627604c50bc8f580ad81f4ba917d494cd8dbbab
Fixed missing game ID issues
diff --git a/ajax_helper.php b/ajax_helper.php index b1cb4de..15e8bc7 100644 --- a/ajax_helper.php +++ b/ajax_helper.php @@ -1,274 +1,281 @@ <?php $GLOBALS['NODEBUG'] = true; $GLOBALS['AJAX'] = true; // don't require log in when testing for used usernames and emails if (isset($_POST['validity_test']) || (iss...
benjamw/pharaoh
ce19d7dcef781c6086023baba3ce31c594ec5fff
changed no registrations wording
diff --git a/register.php b/register.php index 0b5ee04..c9d1660 100644 --- a/register.php +++ b/register.php @@ -1,118 +1,118 @@ <?php define('LOGIN', false); require_once 'includes/inc.global.php'; // if we have a player_id in session, log them in, and check for admin if ( ! empty($_SESSION['player_id'])) { ...
benjamw/pharaoh
8a47ba06e379725032ed26d00b9885a2d748bd2d
moved form buttons under game board
diff --git a/game.php b/game.php index 253fd0d..514e2b8 100644 --- a/game.php +++ b/game.php @@ -1,272 +1,272 @@ <?php require_once 'includes/inc.global.php'; // grab the game id if (isset($_GET['id'])) { $_SESSION['game_id'] = (int) $_GET['id']; } elseif ( ! isset($_SESSION['game_id'])) { if ( ! defined(...
benjamw/pharaoh
3100c6eb81db0b73327ac34088ec9fe45cfec28f
fixed issue with disappearing newly registered players
diff --git a/classes/gameplayer.class.php b/classes/gameplayer.class.php index b6d4bb3..8e043e5 100644 --- a/classes/gameplayer.class.php +++ b/classes/gameplayer.class.php @@ -1,697 +1,701 @@ <?php /* +--------------------------------------------------------------------------- | | gameplayer.class.php (php 5.x)...
benjamw/pharaoh
245a867855ca5d653fa3b59fca6d278c7959726b
sorted games in reverse order
diff --git a/classes/game.class.php b/classes/game.class.php index 87fbaef..680f96b 100644 --- a/classes/game.class.php +++ b/classes/game.class.php @@ -1862,1025 +1862,1025 @@ class Game } else { $result = '0-1'; } } elseif ('Draw' == $Game->state) { $result = '1/2-1/2'; } $body .= $...
benjamw/pharaoh
7c8e3f2308bec32e4ff263b5cb33beb9bafbacdc
fixed stat error
diff --git a/classes/game.class.php b/classes/game.class.php index 532f3e8..87fbaef 100644 --- a/classes/game.class.php +++ b/classes/game.class.php @@ -1721,1026 +1721,1030 @@ class Game } if ('Draw' == $this->state) { return array('Draw Game', 'lost'); } if ( ! empty($this->_pharaoh->winner) && is...
benjamw/pharaoh
37268258ae362f18cd6813ad25671a7bf28450a5
fixed some css issues
diff --git a/css/c_blue_black.css b/css/c_blue_black.css index 04fc474..4537482 100644 --- a/css/c_blue_black.css +++ b/css/c_blue_black.css @@ -1 +1 @@ -html,body{background-color:#27282b;color:#fff}a{color:#fff}a.help{border:1px solid #777777}a.help:hover{border:1px solid #999999}abbr,acronym{border-bottom:1px dashed...
benjamw/pharaoh
ccb0ca2dd06fdb293fd8981b84e67dcf0392966a
added ability for colors and two color schemes
diff --git a/css/c_blue_black.css b/css/c_blue_black.css new file mode 100644 index 0000000..04fc474 --- /dev/null +++ b/css/c_blue_black.css @@ -0,0 +1 @@ +html,body{background-color:#27282b;color:#fff}a{color:#fff}a.help{border:1px solid #777777}a.help:hover{border:1px solid #999999}abbr,acronym{border-bottom:1px das...
benjamw/pharaoh
4e7a42259f53e2b6a2366f752faab9be88cca231
removed error when no extra_info found
diff --git a/classes/game.class.php b/classes/game.class.php index 064455f..cc37a95 100644 --- a/classes/game.class.php +++ b/classes/game.class.php @@ -2102,930 +2102,933 @@ class Game , modify_date FROM ".self::GAME_TABLE." WHERE game_id = '{$this->id}' AND state <> 'Waiting' "; $game = $this-...
benjamw/pharaoh
79ae009e9783720585316fb88b09cff334aa3f98
added titles to piece selection in setup creator
diff --git a/scripts/board.js b/scripts/board.js index 77be158..8286b0c 100644 --- a/scripts/board.js +++ b/scripts/board.js @@ -1,482 +1,488 @@ // creates and manipulates the game board /* jQuery('<a/>', { - id: 'foo', - href: 'http://google.com', - title: 'Become a Googler', - rel: 'external', - t...
benjamw/pharaoh
e4177ef308c7788f67cca31ae438bb197c782fe0
made is_checked function allow for empty values
diff --git a/includes/func.html.php b/includes/func.html.php index 6704707..8aa52b9 100644 --- a/includes/func.html.php +++ b/includes/func.html.php @@ -1,172 +1,176 @@ <?php /** * HTML FUNCTIONS * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** function is_checked [isChecked] * Checks the val...
benjamw/pharaoh
02f0fd03fa235000703e2e9cc14d32620c53af06
fixed setup not recognizing both pharaohs properly
diff --git a/classes/setup.class.php b/classes/setup.class.php index d7745d9..c12c67e 100644 --- a/classes/setup.class.php +++ b/classes/setup.class.php @@ -22,950 +22,950 @@ class Setup { /** * PROPERTIES * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** const property SETUP_TABLE * Holds the...
petrsigut/unico
e9afdcfad441a0428258c18e4003cb101e79693e
changed default route
diff --git a/app/models/.content.rb.swp b/app/models/.content.rb.swp deleted file mode 100644 index 15fb864..0000000 Binary files a/app/models/.content.rb.swp and /dev/null differ diff --git a/app/models/.googlepocasi.rb.swp b/app/models/.googlepocasi.rb.swp deleted file mode 100644 index 3c67c1a..0000000 Binary files ...
petrsigut/unico
849ad54ba9ff063f21e8a703765eddb39826fb4e
pryc libxml
diff --git a/app/models/.content.rb.swp b/app/models/.content.rb.swp index 92f6c49..15fb864 100644 Binary files a/app/models/.content.rb.swp and b/app/models/.content.rb.swp differ diff --git a/app/models/content.rb b/app/models/content.rb index b5c5fdf..c4033d6 100644 --- a/app/models/content.rb +++ b/app/models/conte...
petrsigut/unico
5a81bf6928fb581e9c8a58a669a064ce2122146d
predelavka na nokiri
diff --git a/app/models/.content.rb.swp b/app/models/.content.rb.swp new file mode 100644 index 0000000..92f6c49 Binary files /dev/null and b/app/models/.content.rb.swp differ diff --git a/vendor/gems/libxslt-ruby-0.9.2/.README.swp b/app/models/.googlepocasi.rb.swp similarity index 61% rename from vendor/gems/libxslt-r...
petrsigut/unico
5d7958361b5296ba147a00d7314e29379806d9f0
freeze again
diff --git a/config/.environment.rb.swp b/config/.environment.rb.swp deleted file mode 100644 index 9566dab..0000000 Binary files a/config/.environment.rb.swp and /dev/null differ diff --git a/config/environment.rb b/config/environment.rb index a916b82..54b14b2 100644 --- a/config/environment.rb +++ b/config/environmen...
petrsigut/unico
a61625839f45838cf57f9b497d29690878b06790
trying to freeze libxslt
diff --git a/app/controllers/contents_controller.rb b/app/controllers/contents_controller.rb index af62f18..026b284 100644 --- a/app/controllers/contents_controller.rb +++ b/app/controllers/contents_controller.rb @@ -1,109 +1,91 @@ class ContentsController < ApplicationController layout :type_of_layout protect...
petrsigut/unico
c25478027e8274cb4617e0466aa04c4e585d9574
checking if query is empty before including push things in views
diff --git a/app/controllers/.contents_controller.rb.swp b/app/controllers/.contents_controller.rb.swp deleted file mode 100644 index de9a3f3..0000000 Binary files a/app/controllers/.contents_controller.rb.swp and /dev/null differ diff --git a/app/controllers/contents_controller.rb b/app/controllers/contents_controller...
petrsigut/unico
6a3c330c79a11b8d37a12d56bef14382cd901954
fix xslt/xml paths again
diff --git a/app/controllers/.contents_controller.rb.swp b/app/controllers/.contents_controller.rb.swp new file mode 100644 index 0000000..de9a3f3 Binary files /dev/null and b/app/controllers/.contents_controller.rb.swp differ diff --git a/app/controllers/contents_controller.rb b/app/controllers/contents_controller.rb ...
petrsigut/unico
340c43e08a65c74745ff49b44341f63f6d14030d
fixing freebsd xslt
diff --git a/app/controllers/contents_controller.rb b/app/controllers/contents_controller.rb index 3e90f19..07e6d18 100644 --- a/app/controllers/contents_controller.rb +++ b/app/controllers/contents_controller.rb @@ -1,97 +1,106 @@ class ContentsController < ApplicationController layout :type_of_layout protect...
petrsigut/unico
294e1ce392cc22309eecf0313feac9aa6b51775f
better look-feel; starting implementing categories
diff --git a/app/controllers/.contents_controller.rb.swp b/app/controllers/.contents_controller.rb.swp index b069210..f632696 100644 Binary files a/app/controllers/.contents_controller.rb.swp and b/app/controllers/.contents_controller.rb.swp differ diff --git a/app/controllers/contents_controller.rb b/app/controllers/c...
petrsigut/unico
ad75eb95e2abb10a22f00bdf9f1463d36ea030f1
fixed layouts
diff --git a/app/controllers/.contents_controller.rb.swp b/app/controllers/.contents_controller.rb.swp index 9b1336a..b069210 100644 Binary files a/app/controllers/.contents_controller.rb.swp and b/app/controllers/.contents_controller.rb.swp differ diff --git a/app/models/.content.rb.swp b/app/models/.content.rb.swp in...
petrsigut/unico
78eeef07d614014a7b345b630d144fd1e4d50380
deleted old files. fixed slideshow
diff --git a/Capfile b/Capfile new file mode 100644 index 0000000..e04728e --- /dev/null +++ b/Capfile @@ -0,0 +1,4 @@ +load 'deploy' if respond_to?(:namespace) # cap2 differentiator +Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) } + +load 'config/deploy' # remove this line to skip loading any of th...
petrsigut/unico
2107709f2c04e3951a3c17aa3fd62954ecab78e5
vyreseno query, predelano vic objektove
diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -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...
petrsigut/unico
1d8843633c64f7670d13b0099f080877564acd1e
push aktualizace
diff --git a/app/controllers/contents_controller.rb b/app/controllers/contents_controller.rb index 51d791c..f48f67b 100644 --- a/app/controllers/contents_controller.rb +++ b/app/controllers/contents_controller.rb @@ -1,63 +1,79 @@ class ContentsController < ApplicationController layout :type_of_layout + protect_...
petrsigut/unico
e0c8791e9a2836ce99c1eef1a658eaa51356b9b8
better index, xml transform, plain text
diff --git a/app/controllers/contents_controller.rb b/app/controllers/contents_controller.rb index 8c76556..51d791c 100644 --- a/app/controllers/contents_controller.rb +++ b/app/controllers/contents_controller.rb @@ -1,47 +1,63 @@ class ContentsController < ApplicationController layout :type_of_layout def inde...
petrsigut/unico
e4ba5c1a005db7d26cb70526f89941b08cb5b3b5
prace na Photoofthedaycom pokracuji...
diff --git a/app/controllers/.contents_controller.rb.swp b/app/controllers/.contents_controller.rb.swp deleted file mode 100644 index 180af03..0000000 Binary files a/app/controllers/.contents_controller.rb.swp and /dev/null differ diff --git a/app/models/.content.rb.swp b/app/models/.content.rb.swp deleted file mode 10...
petrsigut/unico
566b577005a148c531ec01dc68fb2dd8066d1d34
pridavani Photoofthedaycom a reseni layoutu
diff --git a/app/controllers/.contents_controller.rb.swp b/app/controllers/.contents_controller.rb.swp index 2150516..180af03 100644 Binary files a/app/controllers/.contents_controller.rb.swp and b/app/controllers/.contents_controller.rb.swp differ diff --git a/app/controllers/contents_controller.rb b/app/controllers/c...
petrsigut/unico
e755edbb43411c7a796f150e7506a4a71e6e30b8
predelane vsechny kontrolery na modely
diff --git a/app/controllers/.cnb_controller.rb.swp b/app/controllers/.cnb_controller.rb.swp index 6709ca2..02c1734 100644 Binary files a/app/controllers/.cnb_controller.rb.swp and b/app/controllers/.cnb_controller.rb.swp differ diff --git a/app/controllers/.contents_controller.rb.swp b/app/controllers/.contents_contro...
petrsigut/unico
4c88553d98ff5a2a1cef8ede4b076e0c9654b01c
kompletene predelana struktura, controler content a parsovani budou v modelech ktere dedi content
diff --git a/app/controllers/.contents_controller.rb.swp b/app/controllers/.contents_controller.rb.swp new file mode 100644 index 0000000..5b910e2 Binary files /dev/null and b/app/controllers/.contents_controller.rb.swp differ diff --git a/app/controllers/.movies_controller.rb.swp b/app/controllers/.movies_controller.r...
petrsigut/unico
5dac06b2eb783a68ec1132e7570907cfe4ed3806
pred celkovym rozhodnutim jak budou kontrolery a tak
diff --git a/config/.routes.rb.swp b/app/controllers/.cnb_controller.rb.swp similarity index 78% rename from config/.routes.rb.swp rename to app/controllers/.cnb_controller.rb.swp index ce72575..6709ca2 100644 Binary files a/config/.routes.rb.swp and b/app/controllers/.cnb_controller.rb.swp differ diff --git a/app/cont...
petrsigut/unico
85a4c7275ff80e23835de4a6f9d58da670202137
pred novou koncepci raw html a XML
diff --git a/app/controllers/cnb_controller.rb b/app/controllers/cnb_controller.rb new file mode 100644 index 0000000..d293644 --- /dev/null +++ b/app/controllers/cnb_controller.rb @@ -0,0 +1,36 @@ +class CnbController < ApplicationController + require 'hpricot' + # na otvirani urlek + require 'open-uri' + + def in...
jtrupiano/techcrawleast
5f01b98bae6d9496e6a9542e1a2955bae3ad815b
Cache bust the stylesheet
diff --git a/presenters.html b/presenters.html index acfa88c..8a0a43d 100644 --- a/presenters.html +++ b/presenters.html @@ -1,132 +1,132 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <m...
jtrupiano/techcrawleast
198f571801d851f06fc7439b8da04d0b4caa13c4
List presenting companies
diff --git a/css/styles.css b/css/styles.css index 345246c..6a93d01 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,550 +1,568 @@ /* CSS RESET */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins...
jtrupiano/techcrawleast
c4f656e17c587b48269697e49498188f175bde49
Add timers
diff --git a/information-for-presenters.html b/information-for-presenters.html index 3bf7cf5..0dbf3a2 100644 --- a/information-for-presenters.html +++ b/information-for-presenters.html @@ -1,90 +1,91 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional....
jtrupiano/techcrawleast
aad82160413a168e0b8326f9aded635f2865da07
Add Paul to organizers
diff --git a/img/img_paul.png b/img/img_paul.png new file mode 100644 index 0000000..a375ea3 Binary files /dev/null and b/img/img_paul.png differ diff --git a/organizers.html b/organizers.html index 97a3a1e..9737112 100644 --- a/organizers.html +++ b/organizers.html @@ -1,95 +1,95 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD...
jtrupiano/techcrawleast
9148d0c9e054a37438ec39674589a63cc4b1cf88
Heather's photo
diff --git a/img/img_heather.jpg b/img/img_heather.jpg new file mode 100644 index 0000000..e650002 Binary files /dev/null and b/img/img_heather.jpg differ
jtrupiano/techcrawleast
5b73ec1ac9904429c9b9de78696f816ee3595c4d
Add organizers page
diff --git a/index.html b/index.html index 3ac8b55..82cc066 100644 --- a/index.html +++ b/index.html @@ -1,157 +1,157 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Cont...
jtrupiano/techcrawleast
5dafd153695eb66db0eab810c3bd4e66e5610c53
Add Redstart and Vircity as sponsors
diff --git a/img/img_sponsor_redstart.gif b/img/img_sponsor_redstart.gif new file mode 100644 index 0000000..23ff9fc Binary files /dev/null and b/img/img_sponsor_redstart.gif differ diff --git a/img/img_sponsor_vircity.jpg b/img/img_sponsor_vircity.jpg new file mode 100644 index 0000000..fadcb0a Binary files /dev/null ...
jtrupiano/techcrawleast
f5452f5b884efcf1e703e42e05b49dffdb20503a
Premier Sponsor
diff --git a/index.html b/index.html index 8b53940..fb6560e 100644 --- a/index.html +++ b/index.html @@ -1,157 +1,157 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Cont...
jtrupiano/techcrawleast
3450ffa3c53399a59f45cc70419926833b82e107
Add Economic Alliance as sponsor
diff --git a/img/img_sponsor_eagb.jpg b/img/img_sponsor_eagb.jpg new file mode 100644 index 0000000..77278df Binary files /dev/null and b/img/img_sponsor_eagb.jpg differ diff --git a/index.html b/index.html index 76d47ad..8b53940 100644 --- a/index.html +++ b/index.html @@ -1,153 +1,157 @@ <!DOCTYPE html PUBLIC "-//W3...
jtrupiano/techcrawleast
1bbc36f72635b519bdfbcc27dfe6ec087a1bd653
Link to Presenter Intake Form.
diff --git a/information-for-presenters.html b/information-for-presenters.html index c5f6912..d91d78b 100644 --- a/information-for-presenters.html +++ b/information-for-presenters.html @@ -1,89 +1,89 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional....
jtrupiano/techcrawleast
2711c0cfa92483603bfffd1f91e6662813a59898
Add Brian and Fulya to organizers
diff --git a/img/img_brian.jpg b/img/img_brian.jpg new file mode 100644 index 0000000..61cc77e Binary files /dev/null and b/img/img_brian.jpg differ diff --git a/img/img_fulya.jpg b/img/img_fulya.jpg new file mode 100644 index 0000000..8f35cca Binary files /dev/null and b/img/img_fulya.jpg differ diff --git a/organizer...
jtrupiano/techcrawleast
5cd00c5d6a0eacb461289ca806cb95f27f724b56
target="_blank"
diff --git a/information-for-presenters.html b/information-for-presenters.html index 5af3940..c5f6912 100644 --- a/information-for-presenters.html +++ b/information-for-presenters.html @@ -1,89 +1,89 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional....
jtrupiano/techcrawleast
ec3d499493626c1d9fb8383fe46929eb40dd346b
Organizers page, placeholders for everyone but John
diff --git a/css/styles.css b/css/styles.css index dda9e3e..345246c 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,532 +1,550 @@ /* CSS RESET */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins...
jtrupiano/techcrawleast
15cf249383d2a96d34667eada423d34036366425
Change hopstop link
diff --git a/index.html b/index.html index feb371a..76d47ad 100644 --- a/index.html +++ b/index.html @@ -1,153 +1,153 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Cont...
jtrupiano/techcrawleast
fe746be05b7eecc6c56f1aeaaccd95d1c15b0630
1300, not 1200
diff --git a/index.html b/index.html index 193549e..feb371a 100644 --- a/index.html +++ b/index.html @@ -1,153 +1,153 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Cont...
jtrupiano/techcrawleast
78da14522d2cf0e58f283eb9cab4c06c5c01bc35
Drop the pin on the map at 1300 Thames St.
diff --git a/index.html b/index.html index f524982..193549e 100644 --- a/index.html +++ b/index.html @@ -1,153 +1,153 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Cont...
jtrupiano/techcrawleast
e0d338a4d0038dcc781aa5bef85a1b2d064314e2
Presenter information page
diff --git a/css/styles.css b/css/styles.css index dfbbc41..dda9e3e 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,479 +1,532 @@ /* CSS RESET */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins...
jtrupiano/techcrawleast
8e1ce5e86eee47dc3fef7dee8709c6c55a10c9a8
Add clarification note about the $100 fee
diff --git a/register.html b/register.html index a4aec09..13dca74 100644 --- a/register.html +++ b/register.html @@ -1,128 +1,128 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http...
jtrupiano/techcrawleast
60ffde3d4c4a3114e231c6c20e178eda08748428
Add Vmeals as sponsor, add "Get Transit Directions" via HopStop
diff --git a/img/img_sponsor_vmeals.jpg b/img/img_sponsor_vmeals.jpg new file mode 100644 index 0000000..0af4cdd Binary files /dev/null and b/img/img_sponsor_vmeals.jpg differ diff --git a/index.html b/index.html index 05ac876..f524982 100644 --- a/index.html +++ b/index.html @@ -1,148 +1,153 @@ <!DOCTYPE html PUBLIC ...
jtrupiano/techcrawleast
d8058ef33ddfeafa0c3c9f8160000847e932fb7b
Make the video more optional
diff --git a/register.html b/register.html index d98f32f..a4aec09 100644 --- a/register.html +++ b/register.html @@ -1,131 +1,128 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http...
jtrupiano/techcrawleast
8b2fcab47d867e5100301bbba18ed427c44a9f20
Change validation alert message
diff --git a/register.html b/register.html index b850199..d98f32f 100644 --- a/register.html +++ b/register.html @@ -1,131 +1,131 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http...
jtrupiano/techcrawleast
e35a2399200998731c37d5706f555f24f9febd98
Don't require a pitch link
diff --git a/register.html b/register.html index 0f7afad..b850199 100644 --- a/register.html +++ b/register.html @@ -1,131 +1,131 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http...
jtrupiano/techcrawleast
22a8896c3eb7831dc9a61d1506a8f3b662e7d28e
Tweak video upload
diff --git a/register.html b/register.html index 6f1a032..0f7afad 100644 --- a/register.html +++ b/register.html @@ -1,130 +1,131 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http...
jtrupiano/techcrawleast
f27197e33845ab5185ff94005662901a4dcc7a76
Make video optional, allow written pitch.
diff --git a/register.html b/register.html index 3086271..6f1a032 100644 --- a/register.html +++ b/register.html @@ -1,124 +1,130 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http...
jtrupiano/techcrawleast
25bc83a5b404f02556af3f4e5cd426ffdd67c87f
Fix language
diff --git a/index.html b/index.html index b90e72f..05ac876 100644 --- a/index.html +++ b/index.html @@ -1,148 +1,148 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Cont...
jtrupiano/techcrawleast
3641a3147d606cebf874f12ba477bf26e705279b
Link to last year's videos
diff --git a/index.html b/index.html index ea07557..b90e72f 100644 --- a/index.html +++ b/index.html @@ -1,148 +1,148 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Cont...
jtrupiano/techcrawleast
08db3866db12793ea8fe4df18786207bf5391a3f
Add note about deadline to presenter application form
diff --git a/register.html b/register.html index ae25155..3086271 100644 --- a/register.html +++ b/register.html @@ -1,122 +1,124 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http...
jtrupiano/techcrawleast
97c6b00eed1d348ed07d303b73ce1fd4434b53b2
Added favicon
diff --git a/img/favicon.ico b/img/favicon.ico new file mode 100644 index 0000000..20f23d3 Binary files /dev/null and b/img/favicon.ico differ diff --git a/index.html b/index.html index ac7d6ec..ea07557 100644 --- a/index.html +++ b/index.html @@ -1,147 +1,148 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transition...
jtrupiano/techcrawleast
b36581df1aa65ef5ee3f2fb9e476ce4aff24b1f8
styled thank you message on register page
diff --git a/css/styles.css b/css/styles.css index ac6e813..dfbbc41 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,473 +1,479 @@ /* CSS RESET */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins...
jtrupiano/techcrawleast
186427c4515b833f3272249a396a4d2ca2cce651
Hook up the Google Form, requires polish from Charles
diff --git a/register.html b/register.html index 671be8b..47b6b20 100644 --- a/register.html +++ b/register.html @@ -1,100 +1,121 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http...
jtrupiano/techcrawleast
9a5134cba969c40c5099b580e5f78894af66b439
Fixed visual bugs, disabled form input elements until form is functional
diff --git a/css/styles.css b/css/styles.css index b6b6425..ac6e813 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,468 +1,473 @@ /* CSS RESET */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins...
jtrupiano/techcrawleast
12e25733b4362e28430deea84aeaef336639d2be
First build
diff --git a/css/960.css b/css/960.css new file mode 100755 index 0000000..e210899 --- /dev/null +++ b/css/960.css @@ -0,0 +1,387 @@ +.container_12, .container_16 { + margin-left:auto; + margin-right:auto; + width:960px +} +.grid_1, .grid_2, .grid_3, .grid_4, .grid_5, .grid_6, .grid_7, .grid_8, .grid_9, .grid_10, .grid...
synewaves/starlight
c7573bb1041b6e1a7b8a4fd2c5ba6b9a77afd22e
Adding namespaces for controllers in router, better handling of endpoint parameters
diff --git a/src/Starlight/Component/Dispatcher/HttpDispatcher.php b/src/Starlight/Component/Dispatcher/HttpDispatcher.php index 6f8013c..411da10 100755 --- a/src/Starlight/Component/Dispatcher/HttpDispatcher.php +++ b/src/Starlight/Component/Dispatcher/HttpDispatcher.php @@ -1,71 +1,102 @@ <?php /* * This file i...
synewaves/starlight
e981358991219efd8661cc67a12b070eff88eb2e
Updating license
diff --git a/LICENSE b/LICENSE index 42f5cf6..7a66df9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,19 @@ -Copyright (c) 2010 Matthew Vince +Copyright (c) 2010-2011 Matthew Vince Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "S...
synewaves/starlight
0c7aae55708d43f99701fa4d7e16d974f518808f
Begin routing/dispatching
diff --git a/src/Starlight/Component/Http/Request.php b/src/Starlight/Component/Http/Request.php index dd6dcab..4e72b6c 100755 --- a/src/Starlight/Component/Http/Request.php +++ b/src/Starlight/Component/Http/Request.php @@ -1,317 +1,332 @@ <?php /* * This file is part of the Starlight framework. * * (c) Ma...
synewaves/starlight
892ad4eb8b5bda30f46d4145700a74e89d00f56a
Add cookie tests
diff --git a/src/Starlight/Component/Http/Cookie.php b/src/Starlight/Component/Http/Cookie.php index ce0a09b..bf14416 100755 --- a/src/Starlight/Component/Http/Cookie.php +++ b/src/Starlight/Component/Http/Cookie.php @@ -1,264 +1,270 @@ <?php /* * This file is part of the Starlight framework. * * (c) Matthe...
synewaves/starlight
797c61420ad90574002fe803d0d3630c8ce52ebc
Reorganization and refactoring of buckets. Abstract out sessions and cookies
diff --git a/src/Starlight/Component/Http/Cookie.php b/src/Starlight/Component/Http/Cookie.php new file mode 100755 index 0000000..ce0a09b --- /dev/null +++ b/src/Starlight/Component/Http/Cookie.php @@ -0,0 +1,264 @@ +<?php +/* + * This file is part of the Starlight framework. + * + * (c) Matthew Vince <matthew.vin...
synewaves/starlight
8fda0481d941fb128f68e00e8c0d183f40be8e37
Standardize null checks
diff --git a/src/Starlight/Component/Http/HeaderBucket.php b/src/Starlight/Component/Http/HeaderBucket.php index 3a6da01..34240a7 100755 --- a/src/Starlight/Component/Http/HeaderBucket.php +++ b/src/Starlight/Component/Http/HeaderBucket.php @@ -1,318 +1,313 @@ <?php /* * This file is part of the Starlight framework...
synewaves/starlight
9cac8167b9d56ce7bb7b552577af45ded154c42d
Added event dispatcher and tests
diff --git a/src/Starlight/Component/EventDispatcher/Event.php b/src/Starlight/Component/EventDispatcher/Event.php index a6f9170..7826478 100755 --- a/src/Starlight/Component/EventDispatcher/Event.php +++ b/src/Starlight/Component/EventDispatcher/Event.php @@ -1,134 +1,138 @@ <?php /* * This file is part of the S...
synewaves/starlight
344458965b701b38535d5851b2adccde29e8d9c2
Cleaned up bootloader logic and interface naming conventions
diff --git a/.gitignore b/.gitignore index a75b755..f8440b2 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .eprj phpunit.xml autoload.php -coverage \ No newline at end of file +coverage +test.php \ No newline at end of file diff --git a/src/Starlight/Component/EventDispatcher/Event.php b/src/Starlight/Comp...
synewaves/starlight
4ff22c548f6d2b37a48c7cef8f1c0a223d6ef991
Begin work on inline redirection / route callbacks
diff --git a/src/Starlight/Component/Routing/Router.php b/src/Starlight/Component/Routing/Router.php index 226e86b..72f3e4f 100644 --- a/src/Starlight/Component/Routing/Router.php +++ b/src/Starlight/Component/Routing/Router.php @@ -1,367 +1,385 @@ <?php /* * This file is part of the Starlight framework. * * (c...
synewaves/starlight
71d73205fd8e32aa2b7259dcc9566f82d18da8e5
Finish routing API basics
diff --git a/src/Starlight/Component/Routing/Compilable.php b/src/Starlight/Component/Routing/Compilable.php index 1835bda..cee7e6a 100644 --- a/src/Starlight/Component/Routing/Compilable.php +++ b/src/Starlight/Component/Routing/Compilable.php @@ -1,20 +1,23 @@ <?php /* * This file is part of the Starlight framewo...
synewaves/starlight
676170166562ec234c62eeaa6b7519ea500f47de
Base route definitions
diff --git a/src/Starlight/Component/Routing/Route.php b/src/Starlight/Component/Routing/Route.php index e16cfdf..d2d626a 100755 --- a/src/Starlight/Component/Routing/Route.php +++ b/src/Starlight/Component/Routing/Route.php @@ -1,144 +1,141 @@ <?php /* * This file is part of the Starlight framework. * * (c) Ma...
synewaves/starlight
261a764f9af60098ab77fd29de7d3fffea2f56de
Fixed ending semicolons on classes
diff --git a/src/Starlight/Component/Dispatcher/Context/Context.php b/src/Starlight/Component/Dispatcher/Context/Context.php index 27195a6..6aed097 100644 --- a/src/Starlight/Component/Dispatcher/Context/Context.php +++ b/src/Starlight/Component/Dispatcher/Context/Context.php @@ -1,16 +1,16 @@ <?php /* * This file ...
synewaves/starlight
e90a3b29eb537b70170aea1534277525e011e2ce
Much improved RouteParser based on Rack::Mount::Strexp
diff --git a/src/Starlight/Component/Routing/RouteParser.php b/src/Starlight/Component/Routing/RouteParser.php index 5d3ac95..e31ae66 100755 --- a/src/Starlight/Component/Routing/RouteParser.php +++ b/src/Starlight/Component/Routing/RouteParser.php @@ -1,216 +1,145 @@ <?php /* * This file is part of the Starlight f...
synewaves/starlight
0af1b114ec79ce3f1b3fa1225fa2e351345f4da3
Work on path parser for Routing
diff --git a/src/Starlight/Component/Routing/Route.php b/src/Starlight/Component/Routing/Route.php old mode 100644 new mode 100755 index 2acd9db..8b6428b --- a/src/Starlight/Component/Routing/Route.php +++ b/src/Starlight/Component/Routing/Route.php @@ -1,144 +1,144 @@ <?php /* * This file is part of the Starlight ...
synewaves/starlight
7ff574716bb8db7534b3b2effac8269b3323fd5c
Getting router into a usable state
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a5c04bf..a09b5c1 100755 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <phpunit backupGlobals="false" - backupStaticAttributes="true" + backupStaticAttributes="false" colors="true...
synewaves/starlight
dc9de035cf403ff72484a26dfc38968e2eddaa9e
Added tests for existing library code
diff --git a/phpunit.xml.dist b/phpunit.xml.dist old mode 100644 new mode 100755 index 676a62a..a5c04bf --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <phpunit backupGlobals="false" backupStaticAttributes="true" colors="true" conv...