Squashed commit of the following:

commit a2bd66a676b81397f9db0b3ee58712078e52869d
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sat Jan 5 20:05:49 2013 -0500

    style baby

    long way to go

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 80736f4c711898bbbe50a0d24107e91db3470e31
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sat Jan 5 12:52:06 2013 -0500

    code kit updated

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 55b89c134fe6dee0dfa0282d10790a0ff5b526ca
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Thu Jan 3 13:48:16 2013 -0500

    updated terms

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 74f4f5e71f5ca88d01133c346ca8b07dd1e9f2b5
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Mon Dec 31 08:11:24 2012 -0500

    Better handling of non-logged-in users

commit 538120ce6efbd78446782a7f0d4d29249d955f23
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 16:10:51 2012 -0500

    link from chat list to user page

    also some XSS safety measures on user page

commit 8dfed5230058516690d7307428535d8ae6e22b3b
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 15:45:39 2012 -0500

    User pages!

    still needs some help, but somewhat functional

commit 69d62f38fc7c936205bd170315f32c5cb0fccae4
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 15:31:26 2012 -0500

    oops - should have been with last commit

    removal of 'approved'

commit eed0161847d30c0bb4bca40550bda52a0f1d1d2b
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 14:23:29 2012 -0500

    Pull approval concept out of db and event model

commit 2b34c6e5e8943e42631d57e77bf5a8f9b9750085
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 13:41:01 2012 -0500

    prevent bubble up event when mod votes for/against active rules

commit 927a001f525a2afb10b90f854b3a15319526ee19
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 13:39:48 2012 -0500

    Change DB primary key of users table to 'user_id"

    This brings it into line with our normalized forms.

commit d24e5c34a32aa146fd5149374d12db3fbedd1bd8
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 29 11:55:20 2012 -0500

    new animated sorting of rules

    - User can see rules move, not just snap into new positions

    - nth-child coloring had to be replaced by .even/.odd class because the order of the li's is not changing with the sort

    - much documentation of play.js (although not all)

    - idea for marking active rules with a background image

commit e84e2d0256149d40274d5c08b47ff95197e5e718
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:22:00 2012 -0500

    Unused js

commit a6994f58e52727a094899f4c9c57870949f3ba45
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:20:36 2012 -0500

    Unused view deleted

commit a490a88473478481db463aaa6cb68cc58e4a590a
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:18:13 2012 -0500

    Code cleanup

    - removal of unused code
    - phpDoc documentation
    - spacing and formatting

commit ef8994cd9119b0e9a85d0992937d06dd6e047a1f
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 11:34:12 2012 -0500

    bug fix for voting while moderating

commit 79b32bbf31dcfb7cb93f4ae2b163a65411bbffc0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 11:20:44 2012 -0500

    protect against XSS in rules

commit 9ae0f9359b19824f65a885f0ab1ed8fad3e577a6
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 10:56:51 2012 -0500

    clean up of rule display/toggle

    fixes bug where new rules and just voted down rules would keep a full group of active rules from being displayed

commit 61c71b33d44291947d6339e8c20d878d7476e030
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 00:20:11 2012 -0500

    new rules are displayed

commit 33f466054c5c039e7ddc3280395bb793bbf70d6f
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Wed Dec 26 17:16:52 2012 -0500

    space to enter a new rule

    doesn't submit yet

commit 548646eb29b917154a16faf83b74ab0a8cc27ea0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Tue Dec 25 22:32:09 2012 -0500

    show/hide non-active rules

commit 104c9ea7870fc7801f8a7b8f485bef1c18cb6094
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 22 23:25:09 2012 -0500

    sens votes va socket

    gets back new vote counts

commit 78bd85f0e3dbfb1fca849b283f56922c9d387657
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 22 22:44:27 2012 -0500

    */event replaces */play

    based on play's functionality

    - vote anytime
    - current vote totals come from socket
    - top x rules are active

    still needs:
    - send votes via socket
    - button to see non-active rules
    - interface to add rules
    - mechanism to get new rules others have created

commit e7a05e1b0a96c88c8997010f97a27fd97fe9746d
Merge: b67065a aa38da0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Fri Dec 21 14:59:06 2012 -0500

    Merge branch 'dev' of github.com:Persnickety/MMODG

commit b67065a738446f6bbc45c2bd93a0df66e5f32ef6
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Fri Dec 21 14:36:08 2012 -0500

    Gets countdown working

    This is for the combined play/event interface

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
ck

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
Squashed commit of the following:

commit d805cc362460a59bb44a6e6a26d3862c72acef1c
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 21:41:59 2013 -0500

    rearranged and styled authentication forms

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 152559d33dff6ffca51ed145588b13ca1c9de2cc
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:41:16 2013 -0500

    drop duplicate js libs

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 932f2059fa6e5cbe1381109e89e274d6401ae98c
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:36:18 2013 -0500

    update ck

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit f7bf23107bd5a500b364394de6545f1980cea124
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:36:05 2013 -0500

    center ads, format login page

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 53346b739736bed8232427ca5004ea8a867bb421
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:35:29 2013 -0500

    twitter lib

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 235f6d60682a44ae45cbe47d2a1a1ddcfe7233a3
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:35:20 2013 -0500

    update mediaqueries

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit b7a54f5dba1b01ea90bd3a9662ca9b348eae671d
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:34:54 2013 -0500

    add twitter

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 1e62f5ed3a5ce81a3128caa44eda81e0f2be0f56
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 13:24:06 2013 -0500

    cleaned up the header and centered ads

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit a9ccdfa00d849175d0efde17b69a63fd75ef0d34
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Jan 6 12:28:16 2013 -0500

    Path names

    From now on,
    	$data['scripts'][]= 'foo.js'
    is the best way.

    It will load the source when in development, and the compressed vernon when in production.  NOTE: there is no "javascripts" in the path given.  This will be added by the php in footer.

commit 9ae637e84decf68aa1101e62ce222ab944938446
Merge: 5fb7530 a2bd66a
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Jan 6 11:56:24 2013 -0500

    Merge branch 'dev' of github.com:Persnickety/MMODG

commit 5fb75301bc057c6f94bc6f3e77f86e040938eca7
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Jan 6 11:55:11 2013 -0500

    work toward doing add rule captchas via socket

    still needs feedback from server to clear the dialog or display error message.

commit a2bd66a676b81397f9db0b3ee58712078e52869d
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sat Jan 5 20:05:49 2013 -0500

    style baby

    long way to go

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 80736f4c711898bbbe50a0d24107e91db3470e31
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sat Jan 5 12:52:06 2013 -0500

    code kit updated

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 55b89c134fe6dee0dfa0282d10790a0ff5b526ca
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Thu Jan 3 13:48:16 2013 -0500

    updated terms

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit ca08fda821c9b3a1e8dc5828034dda446e74668d
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Wed Jan 2 08:31:02 2013 -0500

    admin page needs user data

    - user name in header for admin
    - lack of search results handled better
    - css import wasn't using good URL

commit 74f4f5e71f5ca88d01133c346ca8b07dd1e9f2b5
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Mon Dec 31 08:11:24 2012 -0500

    Better handling of non-logged-in users

commit 538120ce6efbd78446782a7f0d4d29249d955f23
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 16:10:51 2012 -0500

    link from chat list to user page

    also some XSS safety measures on user page

commit 8dfed5230058516690d7307428535d8ae6e22b3b
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 15:45:39 2012 -0500

    User pages!

    still needs some help, but somewhat functional

commit 69d62f38fc7c936205bd170315f32c5cb0fccae4
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 15:31:26 2012 -0500

    oops - should have been with last commit

    removal of 'approved'

commit eed0161847d30c0bb4bca40550bda52a0f1d1d2b
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 14:23:29 2012 -0500

    Pull approval concept out of db and event model

commit 2b34c6e5e8943e42631d57e77bf5a8f9b9750085
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 13:41:01 2012 -0500

    prevent bubble up event when mod votes for/against active rules

commit 927a001f525a2afb10b90f854b3a15319526ee19
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 13:39:48 2012 -0500

    Change DB primary key of users table to 'user_id"

    This brings it into line with our normalized forms.

commit d24e5c34a32aa146fd5149374d12db3fbedd1bd8
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 29 11:55:20 2012 -0500

    new animated sorting of rules

    - User can see rules move, not just snap into new positions

    - nth-child coloring had to be replaced by .even/.odd class because the order of the li's is not changing with the sort

    - much documentation of play.js (although not all)

    - idea for marking active rules with a background image

commit e84e2d0256149d40274d5c08b47ff95197e5e718
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:22:00 2012 -0500

    Unused js

commit a6994f58e52727a094899f4c9c57870949f3ba45
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:20:36 2012 -0500

    Unused view deleted

commit a490a88473478481db463aaa6cb68cc58e4a590a
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:18:13 2012 -0500

    Code cleanup

    - removal of unused code
    - phpDoc documentation
    - spacing and formatting

commit ef8994cd9119b0e9a85d0992937d06dd6e047a1f
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 11:34:12 2012 -0500

    bug fix for voting while moderating

commit 79b32bbf31dcfb7cb93f4ae2b163a65411bbffc0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 11:20:44 2012 -0500

    protect against XSS in rules

commit 9ae0f9359b19824f65a885f0ab1ed8fad3e577a6
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 10:56:51 2012 -0500

    clean up of rule display/toggle

    fixes bug where new rules and just voted down rules would keep a full group of active rules from being displayed

commit 61c71b33d44291947d6339e8c20d878d7476e030
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 00:20:11 2012 -0500

    new rules are displayed

commit 33f466054c5c039e7ddc3280395bb793bbf70d6f
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Wed Dec 26 17:16:52 2012 -0500

    space to enter a new rule

    doesn't submit yet

commit 548646eb29b917154a16faf83b74ab0a8cc27ea0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Tue Dec 25 22:32:09 2012 -0500

    show/hide non-active rules

commit 104c9ea7870fc7801f8a7b8f485bef1c18cb6094
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 22 23:25:09 2012 -0500

    sens votes va socket

    gets back new vote counts

commit 78bd85f0e3dbfb1fca849b283f56922c9d387657
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 22 22:44:27 2012 -0500

    */event replaces */play

    based on play's functionality

    - vote anytime
    - current vote totals come from socket
    - top x rules are active

    still needs:
    - send votes via socket
    - button to see non-active rules
    - interface to add rules
    - mechanism to get new rules others have created

commit e7a05e1b0a96c88c8997010f97a27fd97fe9746d
Merge: b67065a aa38da0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Fri Dec 21 14:59:06 2012 -0500

    Merge branch 'dev' of github.com:Persnickety/MMODG

commit b67065a738446f6bbc45c2bd93a0df66e5f32ef6
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Fri Dec 21 14:36:08 2012 -0500

    Gets countdown working

    This is for the combined play/event interface

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
create app.js

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
Squashed commit of the following:

commit f562cb3e03f47a84e41b9645313bf48d5a2e7d21
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Mon Jan 7 17:04:01 2013 -0500

    more homepage styles

    erika is going to be filling this in with illustrations

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 42d3dd64c62e3e6878c3f8895eb91d27ceda93b3
Merge: e3b49c6 7e7d87a
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Mon Jan 7 15:20:32 2013 -0500

    Merge branch 'dev' of github.com:Persnickety/MMODG into dev

    Conflicts:
    	application/views/events/play_view.php

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit e3b49c6ba4d7a85f754332825f279e66b0bcfc43
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Mon Jan 7 15:17:49 2013 -0500

    lots of design and layout tweaks.

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 7e7d87a182faafc81378ac19794854332f506cce
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Mon Jan 7 14:43:59 2013 -0500

    Flagging of rules is back

    This uses AJAX, not sockets.  The downvote it creates happens through the socket, however.

commit 531242fa1340777ad0569aede8125c3b10ae3f67
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Mon Jan 7 12:04:13 2013 -0500

    final captcha code for adding rules

    - only shows captchas for users who have not done minimum
    - allows for users to go over the minimum within an event-page-load and no longer see captchas.

commit be1392a44099189727ba7059a9fadfb9d9857892
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Mon Jan 7 10:53:05 2013 -0500

    fix for removing src/libs

commit f925ad35cb09468ac3f4d706b2ef155956b2ddda
Merge: 68636c4 d805cc3
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Mon Jan 7 10:28:20 2013 -0500

    Merge branch 'dev' of github.com:Persnickety/MMODG

commit 68636c435994dbdf4bcba7b063616840bc711527
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Mon Jan 7 10:28:11 2013 -0500

    captchas checking correctly through socket

    What remains:
     - only show captchas to people who have not completed a certain number
    - increment the number for those that complete them

commit 66f4d0f40998736a72ee0283934df68fa820970a
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 22:00:17 2013 -0500

    margin added to the user menu

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit d805cc362460a59bb44a6e6a26d3862c72acef1c
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 21:41:59 2013 -0500

    rearranged and styled authentication forms

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 152559d33dff6ffca51ed145588b13ca1c9de2cc
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:41:16 2013 -0500

    drop duplicate js libs

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 932f2059fa6e5cbe1381109e89e274d6401ae98c
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:36:18 2013 -0500

    update ck

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit f7bf23107bd5a500b364394de6545f1980cea124
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:36:05 2013 -0500

    center ads, format login page

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 53346b739736bed8232427ca5004ea8a867bb421
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:35:29 2013 -0500

    twitter lib

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 235f6d60682a44ae45cbe47d2a1a1ddcfe7233a3
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:35:20 2013 -0500

    update mediaqueries

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit b7a54f5dba1b01ea90bd3a9662ca9b348eae671d
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 20:34:54 2013 -0500

    add twitter

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 1e62f5ed3a5ce81a3128caa44eda81e0f2be0f56
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sun Jan 6 13:24:06 2013 -0500

    cleaned up the header and centered ads

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit a9ccdfa00d849175d0efde17b69a63fd75ef0d34
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Jan 6 12:28:16 2013 -0500

    Path names

    From now on,
    	$data['scripts'][]= 'foo.js'
    is the best way.

    It will load the source when in development, and the compressed vernon when in production.  NOTE: there is no "javascripts" in the path given.  This will be added by the php in footer.

commit 9ae637e84decf68aa1101e62ce222ab944938446
Merge: 5fb7530 a2bd66a
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Jan 6 11:56:24 2013 -0500

    Merge branch 'dev' of github.com:Persnickety/MMODG

commit 5fb75301bc057c6f94bc6f3e77f86e040938eca7
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Jan 6 11:55:11 2013 -0500

    work toward doing add rule captchas via socket

    still needs feedback from server to clear the dialog or display error message.

commit a2bd66a676b81397f9db0b3ee58712078e52869d
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sat Jan 5 20:05:49 2013 -0500

    style baby

    long way to go

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 80736f4c711898bbbe50a0d24107e91db3470e31
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Sat Jan 5 12:52:06 2013 -0500

    code kit updated

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit 55b89c134fe6dee0dfa0282d10790a0ff5b526ca
Author: Dan Kruse <kruse.dan@gmail.com>
Date:   Thu Jan 3 13:48:16 2013 -0500

    updated terms

    Signed-off-by: Dan Kruse <kruse.dan@gmail.com>

commit ca08fda821c9b3a1e8dc5828034dda446e74668d
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Wed Jan 2 08:31:02 2013 -0500

    admin page needs user data

    - user name in header for admin
    - lack of search results handled better
    - css import wasn't using good URL

commit 74f4f5e71f5ca88d01133c346ca8b07dd1e9f2b5
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Mon Dec 31 08:11:24 2012 -0500

    Better handling of non-logged-in users

commit 538120ce6efbd78446782a7f0d4d29249d955f23
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 16:10:51 2012 -0500

    link from chat list to user page

    also some XSS safety measures on user page

commit 8dfed5230058516690d7307428535d8ae6e22b3b
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 15:45:39 2012 -0500

    User pages!

    still needs some help, but somewhat functional

commit 69d62f38fc7c936205bd170315f32c5cb0fccae4
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 15:31:26 2012 -0500

    oops - should have been with last commit

    removal of 'approved'

commit eed0161847d30c0bb4bca40550bda52a0f1d1d2b
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 14:23:29 2012 -0500

    Pull approval concept out of db and event model

commit 2b34c6e5e8943e42631d57e77bf5a8f9b9750085
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 13:41:01 2012 -0500

    prevent bubble up event when mod votes for/against active rules

commit 927a001f525a2afb10b90f854b3a15319526ee19
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sun Dec 30 13:39:48 2012 -0500

    Change DB primary key of users table to 'user_id"

    This brings it into line with our normalized forms.

commit d24e5c34a32aa146fd5149374d12db3fbedd1bd8
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 29 11:55:20 2012 -0500

    new animated sorting of rules

    - User can see rules move, not just snap into new positions

    - nth-child coloring had to be replaced by .even/.odd class because the order of the li's is not changing with the sort

    - much documentation of play.js (although not all)

    - idea for marking active rules with a background image

commit e84e2d0256149d40274d5c08b47ff95197e5e718
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:22:00 2012 -0500

    Unused js

commit a6994f58e52727a094899f4c9c57870949f3ba45
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:20:36 2012 -0500

    Unused view deleted

commit a490a88473478481db463aaa6cb68cc58e4a590a
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 19:18:13 2012 -0500

    Code cleanup

    - removal of unused code
    - phpDoc documentation
    - spacing and formatting

commit ef8994cd9119b0e9a85d0992937d06dd6e047a1f
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 11:34:12 2012 -0500

    bug fix for voting while moderating

commit 79b32bbf31dcfb7cb93f4ae2b163a65411bbffc0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 11:20:44 2012 -0500

    protect against XSS in rules

commit 9ae0f9359b19824f65a885f0ab1ed8fad3e577a6
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 10:56:51 2012 -0500

    clean up of rule display/toggle

    fixes bug where new rules and just voted down rules would keep a full group of active rules from being displayed

commit 61c71b33d44291947d6339e8c20d878d7476e030
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Thu Dec 27 00:20:11 2012 -0500

    new rules are displayed

commit 33f466054c5c039e7ddc3280395bb793bbf70d6f
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Wed Dec 26 17:16:52 2012 -0500

    space to enter a new rule

    doesn't submit yet

commit 548646eb29b917154a16faf83b74ab0a8cc27ea0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Tue Dec 25 22:32:09 2012 -0500

    show/hide non-active rules

commit 104c9ea7870fc7801f8a7b8f485bef1c18cb6094
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 22 23:25:09 2012 -0500

    sens votes va socket

    gets back new vote counts

commit 78bd85f0e3dbfb1fca849b283f56922c9d387657
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Sat Dec 22 22:44:27 2012 -0500

    */event replaces */play

    based on play's functionality

    - vote anytime
    - current vote totals come from socket
    - top x rules are active

    still needs:
    - send votes via socket
    - button to see non-active rules
    - interface to add rules
    - mechanism to get new rules others have created

commit e7a05e1b0a96c88c8997010f97a27fd97fe9746d
Merge: b67065a aa38da0
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Fri Dec 21 14:59:06 2012 -0500

    Merge branch 'dev' of github.com:Persnickety/MMODG

commit b67065a738446f6bbc45c2bd93a0df66e5f32ef6
Author: Charlie Chambers <charlie.chambers@ifractal.com>
Date:   Fri Dec 21 14:36:08 2012 -0500

    Gets countdown working

    This is for the combined play/event interface

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
run ck

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
Merge remote branch 'origin/dev'

Conflicts:
	application/config/routes.php
	application/controllers/auth.php
	application/controllers/pages.php
	application/views/events/home_view.php
	application/views/events/play_view.php
	application/views/templates/main_header.php
	codekit-config.json
	javascripts/app.js
	javascripts/play.js
	javascripts/src/app.js
	javascripts/src/play.js
	play.js
	stylesheets/app.css
	stylesheets/mq.css
	stylesheets/src/1140.less
	stylesheets/src/320.less
	stylesheets/src/480.less
	stylesheets/src/767.less
	stylesheets/src/960.less
	stylesheets/src/app.less

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
Merge branch 'refs/heads/dev'

Conflicts:
	application/views/admin/admin_view.php
	javascripts/app.js
	javascripts/src/app.js

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
make scripts for prod

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
add new header

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
style homepage

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
Merge branch 'dev' of github.com:Persnickety/MMODG

Conflicts:
	stylesheets/app.css

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
add buttons, pad pages

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
style play page

this is still more just moving things around rather than pushing a redesign

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
ck

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>