Dev Roadmap

The directory of every larp character & system ever. Well, nearly. We're not quite launch ready, yet. This is our todo list, powered by Trello

Six Feet: Tech

  • Upgrade Bootstrap
  • Upgrade Codeigniter
  • Email notifications configure
  • Swap Create tiles for buttons in the white block
  • Sixty Feet

  • Attendances [C|R|U|D] Calendars
  • Profile with Group-level information
  • System Moderators
  • Group Moderators
  • Event Calendars
  • Character Photo
  • Group Insignia
  • In-Universe fiction and backstory
  • NPC
  • Photo Credits
  • Six Hundred

  • OC Groups
  • Player Profile
  • Moderator Only Cabals
  • Character-To-Character messaging
  • Player Photo
  • System Images
  • System Categories
  • Six Thousand

  • Book Events
  • Larp Locations
  • International Systems
  • Event Categories
  • Private Group Forums
  • Public Forums
  • System Forums?
  • Hosted downloads
  • Picture Galleries
  • Event Tagging
  • Six Feet: Fic

  • Post a fic
  • Tag fic with events/characters/systems
  • collect fic into anthologies
  • Most recent dev work

      *   commit 806e559 (HEAD, origin/master, origin/HEAD, master)
      |\  Merge: 6c78cc3 9d9633c
      | | Author: Nicholas Avenell 
      | | Date:   Wed Sep 20 15:12:12 2017 +0200
      | | 
      | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | |   
      | * commit 9d9633c
      | | Author: Nicholas Avenell 
      | | Date:   Sun Apr 30 11:16:51 2017 +0200
      | | 
      | |     Ignore certbot files
      | |   
      * | commit 6c78cc3
      | | Author: Nicholas Avenell 
      | | Date:   Wed May 17 01:42:40 2017 +0200
      | | 
      | |     Use colour lorempixel while greyscale is borked
      | |     
      | | * commit 0f6c082 (origin/feature/2015-06_fiction, origin/develop)
      | | | Author: Nicholas Avenell 
      | | | Date:   Fri Apr 7 18:49:12 2017 +0100
      | | | 
      | | |     Ignore SSL cruft
      | | |      
      | | *   commit f153753
      | | |\  Merge: e7ca96a 4dda452
      | | |/  Author: Nicholas Avenell 
      | |/|   Date:   Fri Apr 7 18:48:14 2017 +0100
      | | |   
      | | |       Merge branch 'master' into feature/fiction
      | | |       
      | | |       # Conflicts:
      | | |       #	.gitignore
      | | |    
      | * | commit 4dda452
      |/ /  Author: Nicholas Avenell 
      | |   Date:   Fri Apr 7 18:12:06 2017 +0200
      | |   
      | |       Local development ssl generation
      | |   
      * | commit 031f7b9
      | | Author: Nicholas Avenell 
      | | Date:   Wed Feb 1 23:10:34 2017 +0100
      | | 
      | |     Update forecast.io to new API address
      | |   
      * | commit 0e75d41
      | | Author: Nicholas Avenell 
      | | Date:   Fri Dec 30 14:18:50 2016 +0100
      | | 
      | |     React better to Trello performing poorly
      | |   
      * | commit b823627
      | | Author: Nicholas Avenell 
      | | Date:   Fri Dec 30 14:18:06 2016 +0100
      | | 
      | |     Remove outdated template files
      | |   
      * | commit 7e629fb
      | | Author: Nicholas Avenell 
      | | Date:   Mon Oct 24 21:04:32 2016 +0200
      | | 
      | |     fix syntax errors
      | |     
      * |   commit 9970ba2
      |\ \  Merge: 1cbe2a7 32a18fd
      | | | Author: Nicholas Avenell 
      | | | Date:   Mon Oct 24 20:52:59 2016 +0200
      | | | 
      | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | |    
      * | | commit 1cbe2a7
      | | | Author: Nicholas Avenell 
      | | | Date:   Mon Oct 24 20:52:46 2016 +0200
      | | | 
      | | |     Update filepicker API
      | | |    
      | | * commit e7ca96a
      | | | Author: Nicholas Avenell 
      | | | Date:   Fri Apr 7 18:46:31 2017 +0100
      | | | 
      | | |     Update dev environments
      | | |    
      | | * commit 4c63495
      | | | Author: Nicholas Avenell 
      | | | Date:   Fri Apr 7 17:20:34 2017 +0100
      | | | 
      | | |     Use seperate IP
      | | |    
      | | * commit 9948b68
      | | | Author: Nicholas Avenell 
      | | | Date:   Fri Apr 7 17:20:25 2017 +0100
      | | | 
      | | |     T&C Update
      | | |    
      | | * commit 1d1a7ac
      | | | Author: Nicholas Avenell 
      | | | Date:   Fri Apr 7 17:20:18 2017 +0100
      | | | 
      | | |     Warnings should be multiselect
      | | |    
      | | * commit fe3777e
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed Oct 12 14:53:28 2016 +0100
      | | | 
      | | |     Ignore more things
      | | |    
      | | * commit 2d85cd2
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed Oct 12 13:47:56 2016 +0000
      | | | 
      | | |     Codeigniter revision
      | | |      
      | | *   commit 8c370eb
      | | |\  Merge: 8746d77 32a18fd
      | | |/  Author: Nicholas Avenell 
      | |/|   Date:   Sat Oct 8 09:51:16 2016 +0100
      | | |   
      | | |       Merge branch 'master' into feature/2015-06_fiction
      | | |      
      | * |   commit 32a18fd
      | |\ \  Merge: 63471ca 665ec79
      | |/ /  Author: Nicholas Avenell 
      |/| |   Date:   Sat Oct 8 09:44:46 2016 +0100
      | | |   
      | | |       Merge branch 'master' of https://github.com/aquarion/Larp.Me
      | | |    
      * | | commit 665ec79 (tag: 2016-10-08_Misc-fixes)
      | | | Author: Nicholas Avenell 
      | | | Date:   Sat Oct 8 01:07:32 2016 +0200
      | | | 
      | | |     Clean up user flows a bit
      | | |    
      * | | commit ae4e509
      | | | Author: Nicholas Avenell 
      | | | Date:   Thu Oct 6 10:09:44 2016 +0200
      | | | 
      | | |     Fixes for password & login issues
      | | |    
      * | | commit 7a7079e
      | | | Author: Nicholas Avenell 
      | | | Date:   Thu Oct 6 10:09:18 2016 +0200
      | | | 
      | | |     Reluctantly require recaptcha resolving registration regrets
      | | |    
      * | | commit cbdcddc
      | | | Author: Nicholas Avenell 
      | | | Date:   Thu Oct 6 09:22:39 2016 +0200
      | | | 
      | | |     Move trello updates over to Guzzle
      | | |    
      * | | commit 33e5e01
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed Oct 5 08:19:02 2016 +0200
      | | | 
      | | |     Bold official events
      | | |    
      * | | commit a946be6
      | | | Author: Nicholas Avenell 
      | | | Date:   Tue Oct 4 21:20:49 2016 +0200
      | | | 
      | | |     Fix error sending to use Postmark
      | | |    
      * | | commit 185dbdc
      | | | Author: Nicholas Avenell 
      | | | Date:   Tue Oct 4 20:56:12 2016 +0200
      | | | 
      | | |     Import event from Facebook
      | | |    
      * | | commit 8e9aa7b
      | | | Author: Nicholas Avenell 
      | | | Date:   Tue Oct 4 15:37:29 2016 +0200
      | | | 
      | | |     A multitude of miscellanious fixes
      | | |     
      | | |     * [Events] Change error message on events editing where ends < start
      | | |     * [Events] Fix bug where events would lose Official Event status
      | | |     * [Events] Make datetime entry in events suck a great deal less
      | | |     * [Groups] Add group taglines
      | | |     * [Groups] Fix group display to display taglines and not display empty sets
      | | |     * [System] Add custom name for factions so Empire's factions can be called Nations
      | | |     * [Systems] Add text-based filtering to systems list
      | | |     * Fix some login errors
      | | |     * phpcs whitespace formatting
      | | |     * Remove debug that broke the display of non-System characters
      | | |     * Speculative fixes for Apache logging
      | | |     + Generic formatting for form validation
      | | |    
      * | | commit 20e24f4
      | | | Author: Nicholas Avenell 
      | | | Date:   Mon Oct 3 03:42:09 2016 +0200
      | | | 
      | | |     PHP Code Sniffer: For when you have to kill every motherf*cking tab in the room
      | | |    
      * | | commit d6a6553
      | | | Author: Nicholas Avenell 
      | | | Date:   Mon Oct 3 03:23:06 2016 +0200
      | | | 
      | | |     Fix datetime entry in Event editing
      | | |    
      * | | commit 4f70de2
      | | | Author: Nicholas Avenell 
      | | | Date:   Mon Oct 3 03:07:27 2016 +0200
      | | | 
      | | |     Fix some docker-related issues
      | | |    
      * | | commit 96450f6
      | | | Author: Nicholas Avenell 
      | | | Date:   Mon May 23 15:33:40 2016 +0200
      | | | 
      | | |     Behave better when behind a proxy
      | | |    
      * | | commit 1126aed
      | | | Author: Nicholas Avenell 
      | | | Date:   Mon May 23 15:33:02 2016 +0200
      | | | 
      | | |     Update larpme for running on archipelago
      | | |    
      * | | commit 5321caa
      | | | Author: Nicholas Avenell 
      | | | Date:   Sat May 21 18:24:36 2016 +0200
      | | | 
      | | |     force https
      | | |    
      * | | commit 48eca1f
      | | | Author: Nicholas Avenell 
      | | | Date:   Sat May 21 18:23:51 2016 +0200
      | | | 
      | | |     Reverse sort events when you're looking backwards
      | | |    
      * | | commit f733cac
      | | | Author: Nicholas Avenell 
      | | | Date:   Sat May 21 18:23:21 2016 +0200
      | | | 
      | | |     Make dev work less pretty
      | | |      
      * | |   commit 31e3c2f
      |\ \ \  Merge: ea25af6 0aa9365
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Fri Apr 15 14:56:09 2016 +0200
      | | | | 
      | | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | | |     
      * | | | commit ea25af6
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Fri Apr 15 14:56:03 2016 +0200
      | | | | 
      | | | |     Update codeigniter
      | | | |     
      * | | | commit 1c728d7
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Fri Apr 15 14:55:44 2016 +0200
      | | | | 
      | | | |     Update crew to not use sodding shorttags
      | | | |       
      | | | *   commit 8746d77
      | | | |\  Merge: e6edacf 63471ca
      | | | |/  Author: Nicholas Avenell 
      | | |/|   Date:   Sat Oct 8 09:13:22 2016 +0100
      | | | |   
      | | | |       Merge branch 'master' into feature/2015-06_fiction
      | | | |     
      | | * | commit 63471ca
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Sun Oct 11 15:09:08 2015 +0100
      | | | | 
      | | | |     Improve output
      | | | |     
      | | * | commit caf1d9e
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Sun Oct 11 15:09:01 2015 +0100
      | | | | 
      | | | |     remove xss_clean, as per 3.0 upgrade
      | | | |     
      | | * | commit c1da79a
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Sun Oct 11 14:36:58 2015 +0100
      | | | | 
      | | | |     Improve Provisioning
      | | | |       
      | | | *   commit e6edacf
      | | | |\  Merge: 9cfc2e7 9ac70fc
      | | | | | Author: Nicholas Avenell 
      | | | | | Date:   Sat Oct 8 09:12:29 2016 +0100
      | | | | | 
      | | | | |     Merge branch 'feature/2015-06_fiction' of https://github.com/aquarion/Larp.Me into feature/2015-06_fiction
      | | | | |      
      | | | | * commit 9ac70fc
      | | | | | Author: Nicholas Avenell 
      | | | | | Date:   Sat Sep 3 23:55:54 2016 +0100
      | | | | | 
      | | | | |     First version of composer
      | | | | |      
      | | | | * commit c0a16a8
      | | | | | Author: Nicholas Avenell 
      | | | | | Date:   Sun May 1 11:56:47 2016 +0100
      | | | | | 
      | | | | |     Fix folder share for Debian
      | | | | |      
      | | | * | commit 9cfc2e7
      | | | |/  Author: Nicholas Avenell 
      | | | |   Date:   Sat Oct 8 09:09:06 2016 +0100
      | | | |   
      | | | |       Provisioning update
      | | | |     
      | | | * commit 068c2bb
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Thu Apr 14 23:38:40 2016 +0100
      | | | | 
      | | | |     Display of Tags
      | | | |     
      | | | * commit c57418e
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Thu Apr 14 21:14:34 2016 +0100
      | | | | 
      | | | |     Add back the stripey development background
      | | | |     
      | | | * commit b55825a
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Thu Apr 14 21:04:12 2016 +0100
      | | | | 
      | | | |     Oh gods I hate getting dev environments set up
      | | | |       
      | | | *   commit 2ece217
      | | | |\  Merge: 947197d 5e5cc60
      | | | | | Author: Nicholas Avenell 
      | | | | | Date:   Thu Apr 14 17:48:11 2016 +0100
      | | | | | 
      | | | | |     Merge branch 'feature/fiction' of https://github.com/aquarion/Larp.Me into feature/fiction
      | | | | |     
      | | | | |     # Conflicts:
      | | | | |     #	Vagrantfile
      | | | | |     #	application/core/MY_Model.php
      | | | | |        
      | | | | *   commit 5e5cc60
      | | | | |\  Merge: 0c09290 1ac1cf7
      | | | | | | Author: Nicholas Avenell 
      | | | | | | Date:   Sun Apr 3 00:05:17 2016 +0100
      | | | | | | 
      | | | | | |     Merge remote-tracking branch 'refs/remotes/origin/master' into feature/fiction
      | | | | | |     
      | | | | | |     # Conflicts:
      | | | | | |     #	Vagrantfile
      | | | | | |     #	application/core/MY_Model.php
      | | | | | |         
      | | | * | |   commit 947197d
      | | | |\ \ \  Merge: 7a76711 5a5bf3e
      | | | | | | | Author: Nicholas Avenell 
      | | | | | | | Date:   Thu Apr 14 16:45:41 2016 +0100
      | | | | | | | 
      | | | | | | |     Merge branch 'feature/fic' into feature/fiction
      | | | | | | |          
      | | | | * | |   commit 5a5bf3e
      | | | | |\ \ \  Merge: 9674bac 13d797b
      | | | | | | | | Author: Nicholas Avenell 
      | | | | | | | | Date:   Thu Jun 4 14:22:13 2015 +0100
      | | | | | | | | 
      | | | | | | | |     Merge branch 'master' into develop
      | | | | | | | |     
      | | | | | | | |     # Conflicts:
      | | | | | | | |     #	application/core/MY_Controller.php
      | | | | | | | |         
      | | | | * | | | commit 9674bac
      | | | | | | | | Author: Nicholas Avenell 
      | | | | | | | | Date:   Wed Apr 2 13:18:16 2014 +0100
      | | | | | | | | 
      | | | | | | | |     Upgraded to new version of Codeigniter
      | | | | | | | |           
      | | | * | | | |   commit 7a76711
      | | | |\ \ \ \ \  Merge: 0c09290 0aa9365
      | | |_|/ / / / /  Author: Nicholas Avenell 
      | |/| | | | / /   Date:   Thu Apr 14 16:45:30 2016 +0100
      | | | | |_|/ /    
      | | | |/| | |         Merge branch 'master' into feature/fiction
      | | | | | | |         
      | | | | | | |         # Conflicts:
      | | | | | | |         #	Vagrantfile
      | | | | | | |         #	application/core/MY_Model.php
      | | | | | | |        
      | * | | | | | commit 0aa9365
      | | | | | | | Author: Nicholas Avenell 
      | | | | | | | Date:   Thu Apr 14 16:42:39 2016 +0100
      | | | | | | | 
      | | | | | | |     Ignore PHPIntel
      | | | | | | |          
      | * | | | | |   commit dd255cd
      | |\ \ \ \ \ \  Merge: 6983ac5 eea3e9e
      | |/ / / / / /  Author: Nicholas Avenell 
      |/| | | | | |   Date:   Thu Apr 14 16:35:44 2016 +0100
      | | | | | | |   
      | | | | | | |       Merge branch 'master' of https://github.com/aquarion/Larp.Me
      | | | | | | |          
      * | | | | | |   commit eea3e9e
      |\ \ \ \ \ \ \  Merge: 67625ba fccb80b
      | | | | | | | | Author: Nicholas Avenell 
      | | | | | | | | Date:   Thu Apr 14 17:34:25 2016 +0200
      | | | | | | | | 
      | | | | | | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | | | | | | |         
      | * | | | | | | commit fccb80b
      | | |_|_|_|_|/  Author: Nicholas Avenell 
      | |/| | | | |   Date:   Tue Apr 12 16:11:53 2016 +0000
      | | | | | | |   
      | | | | | | |       Terraform for EC2 development
      | | | | | | |        
      * | | | | | | commit 67625ba
      | | | | | | | Author: Nicholas Avenell 
      | | | | | | | Date:   Thu Apr 14 17:34:09 2016 +0200
      | | | | | | | 
      | | | | | | |     Add new fb integration file
      | | | | | | |        
      * | | | | | | commit 2aa4b1a
      | | | | | | | Author: Nicholas Avenell 
      | | | | | | | Date:   Thu Apr 14 17:33:37 2016 +0200
      | | | | | | | 
      | | | | | | |     Update apache conf
      | | | | | | |        
      * | | | | | | commit 28235c5
      |/ / / / / /  Author: Nicholas Avenell 
      | | | | | |   Date:   Thu Apr 14 17:33:21 2016 +0200
      | | | | | |   
      | | | | | |       Update facebook integration
      | | | | | |       
      * | | | | | commit 1ac1cf7
      | | | | | | Author: Nicholas Avenell 
      | | | | | | Date:   Tue Oct 13 14:24:18 2015 +0200
      | | | | | | 
      | | | | | |     Be less zealous with xss stripping
      | | | | | |       
      * | | | | | commit d5d8fea
      | | | | | | Author: Nicholas Avenell 
      | | | | | | Date:   Tue Oct 13 14:23:40 2015 +0200
      | | | | | | 
      | | | | | |     Update AnyTime
      | | | | | |       
      * | | | | | commit 9d47226
      | |/ / / /  Author: Nicholas Avenell 
      |/| | | |   Date:   Sun Oct 11 16:25:59 2015 +0200
      | | | | |   
      | | | | |       Update db schema
      | | | | |        
      * | | | |   commit 0061a8f
      |\ \ \ \ \  Merge: 3fb3ecc d4cb8e6
      | | | | | | Author: Nicholas Avenell 
      | | | | | | Date:   Tue Jun 9 12:29:48 2015 +0200
      | | | | | | 
      | | | | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | | | | |       
      * | | | | | commit 3fb3ecc
      | | | | | | Author: Nicholas Avenell 
      | | | | | | Date:   Tue Jun 9 12:06:40 2015 +0200
      | | | | | | 
      | | | | | |     Apache upgrades for 2.4
      | | | | | |       
      | | * | | | commit 6983ac5
      | | | | | | Author: Nicholas Avenell 
      | | | | | | Date:   Thu Apr 14 16:32:22 2016 +0100
      | | | | | | 
      | | | | | |     Only attempt to print systems when there's a system
      | | | | | |       
      | | * | | | commit 5a84b14
      | |/ / / /  Author: Nicholas Avenell 
      | | | | |   Date:   Thu Apr 14 16:31:44 2016 +0100
      | | | | |   
      | | | | |       Disable Stathat on non-live
      | | | | |      
      | * | | | commit d4cb8e6
      | | |_|/  Author: Nicholas Avenell 
      | |/| |   Date:   Tue Jun 9 11:28:36 2015 +0100
      | | | |   
      | | | |       Deal better with broken data objects
      | | | |     
      | * | | commit 13d797b
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Thu Jun 4 14:17:27 2015 +0100
      | | | | 
      | | | |     Update Debian & Codeigniter
      | | | |     
      | * | | commit e19412e
      |/ / /  Author: Nicholas Avenell 
      | | |   Date:   Thu Jun 4 14:01:51 2015 +0100
      | | |   
      | | |       Ignore PHPIntel file
      | | |    
      * | | commit 9ca4d07
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed May 20 17:47:54 2015 +0200
      | | | 
      | | |     Display percentage chance of rain
      | | |    
      * | | commit 80ee121
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed May 20 17:47:41 2015 +0200
      | | | 
      | | |     Remove some shortcodes
      | | |      
      * | |   commit b464b48 (tag: 2015-05-12_nonsystem_characters)
      |\ \ \  Merge: 413af00 8a9e635
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Tue May 12 11:03:53 2015 +0200
      | | | | 
      | | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | | |     
      | * | | commit 8a9e635 (origin/feature/nonsystem_user, origin/feature/2015-04_nonsystem_user)
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Tue May 12 08:40:24 2015 +0100
      | | | | 
      | | | |     Ability to add chars for systems we don't cover yet
      | | | |     
      | * | | commit 21352f9
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Tue May 12 08:19:38 2015 +0100
      | | | | 
      | | | |     Add redis caching
      | | | |     
      * | | | commit 413af00
      |/ / /  Author: Nicholas Avenell 
      | | |   Date:   Tue May 12 11:03:47 2015 +0200
      | | |   
      | | |       New SSL config, and upgrades for Apache 2.4
      | | |    
      * | | commit d322aee
      | | | Author: Nicholas Avenell 
      | | | Date:   Tue Mar 31 09:27:36 2015 +0200
      | | | 
      | | |     Include weather information for outside time-in
      | | |    
      | * | commit 0c09290 (origin/feature/fiction)
      |/ /  Author: Nicholas Avenell 
      | |   Date:   Tue May 12 05:51:58 2015 +0100
      | |   
      | |       First draft at fic models
      | |   
      * | commit 30dc2ef
      | | Author: Nicholas Avenell 
      | | Date:   Sun Oct 5 19:18:51 2014 +0200
      | | 
      | |     Disable caching - memory problems
      | |   
      * | commit c1ee716
      | | Author: Nicholas Avenell 
      | | Date:   Thu Sep 25 21:25:56 2014 +0100
      | | 
      | |     More useful error emails
      | |   
      * | commit ee20061
      | | Author: Nicholas Avenell 
      | | Date:   Thu Sep 25 21:25:47 2014 +0100
      | | 
      | |     Query Caching mk1
      | |   
      * | commit 4b5b201
      | | Author: Nicholas Avenell 
      | | Date:   Thu Sep 25 21:25:36 2014 +0100
      | | 
      | |     Prettify character listings
      | |   
      * | commit 51b7dd8
      | | Author: Nicholas Avenell 
      | | Date:   Tue Sep 23 10:21:20 2014 +0100
      | | 
      | |     My Events, Attend quietly & iCal feeds
      | |   
      * | commit 4feb92b
      | | Author: Nicholas Avenell 
      | | Date:   Tue Sep 23 02:03:17 2014 +0100
      | | 
      | |     Attendances
      | |   
      * | commit b796dde
      | | Author: Nicholas Avenell 
      | | Date:   Mon Sep 22 23:51:07 2014 +0100
      | | 
      | |     Clean up systems page a notch
      | |   
      * | commit 48d45cb
      | | Author: Nicholas Avenell 
      | | Date:   Mon Sep 22 23:50:48 2014 +0100
      | | 
      | |     Fix help links
      | |   
      * | commit d329686
      | | Author: Nicholas Avenell 
      | | Date:   Tue Sep 23 00:23:38 2014 +0200
      | | 
      | |     Minor visual improvements
      | |   
      * | commit 7a8b4e7
      | | Author: Nicholas Avenell 
      | | Date:   Tue Sep 23 00:23:26 2014 +0200
      | | 
      | |     API support for cabals
      | |   
      * | commit 81c71b4
      | | Author: Nicholas Avenell 
      | | Date:   Mon Sep 22 12:12:51 2014 +0100
      | | 
      | |     Show Player Events
      | |   
      * | commit b36288b
      | | Author: Nicholas Avenell 
      | | Date:   Mon Sep 22 11:42:35 2014 +0100
      | | 
      | |     Show subtitles
      | |   
      * | commit e3c6094
      | | Author: Nicholas Avenell 
      | | Date:   Mon Sep 22 11:28:30 2014 +0100
      | | 
      | |     Once more with working URLs...
      | |   
      * | commit 21a8a88
      | | Author: Nicholas Avenell 
      | | Date:   Mon Sep 22 11:24:46 2014 +0100
      | | 
      | |     Text updates
      | |   
      * | commit 2f98c11
      | | Author: Nicholas Avenell 
      | | Date:   Mon Sep 22 11:19:59 2014 +0100
      | | 
      | |     New events front page
      | |   
      * | commit 6f024d5
      | | Author: Nicholas Avenell 
      | | Date:   Mon Sep 22 11:19:34 2014 +0100
      | | 
      | |     Reworking of Navigation & front page
      | |   
      * | commit 391c926
      | | Author: Nicholas Avenell 
      | | Date:   Sat Sep 20 16:41:46 2014 +0100
      | | 
      | |     Add a note to the events page
      | |     
      * |   commit 1c3316d
      |\ \  Merge: cf608b6 a3fd726
      | | | Author: Nicholas Avenell 
      | | | Date:   Sat Sep 20 16:39:25 2014 +0100
      | | | 
      | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | |    
      | * | commit a3fd726
      | | | Author: Nicholas Avenell 
      | | | Date:   Sat Sep 20 12:59:30 2014 +0200
      | | | 
      | | |     Fix weather edge case
      | | |    
      | * | commit 8458a9f
      | | | Author: Nicholas Avenell 
      | | | Date:   Tue Aug 5 23:59:49 2014 +0100
      | | | 
      | | |     Don't show last day
      | | |    
      | * | commit 706bcc3
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed Aug 6 00:59:17 2014 +0200
      | | | 
      | | |     Now with less debug text
      | | |    
      | * | commit 910e9b4
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed Aug 6 00:59:00 2014 +0200
      | | | 
      | | |     Skycons credit
      | | |      
      | * |   commit b391b3a
      | |\ \  Merge: f6d68c2 f243c85
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Wed Aug 6 00:31:59 2014 +0200
      | | | | 
      | | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | | |     
      | | * | commit f243c85
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Tue Aug 5 23:29:24 2014 +0100
      | | | | 
      | | | |     Location Forecast
      | | | |       
      | * | |   commit f6d68c2
      | |\ \ \  Merge: 96fe235 d5ef70f
      | | |/ /  Author: Nicholas Avenell 
      | | | |   Date:   Fri Jun 27 16:43:28 2014 +0200
      | | | |   
      | | | |       Merge branch 'master' of github.com:aquarion/Larp.Me
      | | | |     
      | * | | commit 96fe235
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Fri Jun 27 16:43:03 2014 +0200
      | | | | 
      | | | |     Fix errors in ical generation
      | | | |     
      | * | | commit f7158ab
      | | |/  Author: Nicholas Avenell 
      | |/|   Date:   Fri Jun 27 16:42:53 2014 +0200
      | | |   
      | | |       New SSL cert
      | | |    
      * | | commit cf608b6
      | |/  Author: Nicholas Avenell 
      |/|   Date:   Sat Sep 20 16:27:03 2014 +0100
      | |   
      | |       Fix issue if new crewmember doesn't include image
      | |   
      * | commit d5ef70f
      | | Author: Nicholas Avenell 
      | | Date:   Fri Jun 27 15:41:25 2014 +0100
      | | 
      | |     Fix display issue when only Archived characters
      | |     
      | |     Thanks to DragonDave for the bug report
      | |   
      * | commit 6016807
      |/  Author: Nicholas Avenell 
      |   Date:   Fri Jun 27 15:40:50 2014 +0100
      |   
      |       Unbreak provisioning
      |  
      * commit ef64e27
      | Author: Nicholas Avenell 
      | Date:   Tue Apr 1 14:37:37 2014 +0100
      | 
      |     Photo credits
      |  
      * commit 8d399dc
      | Author: Nicholas Avenell 
      | Date:   Tue Apr 1 14:37:15 2014 +0100
      | 
      |     Save on objects
      |  
      * commit 9d112a4
      | Author: Nicholas Avenell 
      | Date:   Mon Mar 31 16:26:58 2014 +0200
      | 
      |     Better view for events pages
      |  
      * commit 95dfbbd
      | Author: Nicholas Avenell 
      | Date:   Wed Mar 26 15:35:44 2014 +0000
      | 
      |     Cabals list fixes
      |  
      * commit 723bb73
      | Author: Nicholas Avenell 
      | Date:   Wed Mar 26 15:22:09 2014 +0000
      | 
      |     Alphabetise all systems list
      |  
      * commit f92cdf2
      | Author: Nicholas Avenell 
      | Date:   Wed Mar 26 15:21:15 2014 +0000
      | 
      |     All Systems page
      |    
      *   commit d1a52e4
      |\  Merge: 61f9ffc 945810f
      | | Author: Nicholas Avenell 
      | | Date:   Wed Mar 26 15:08:36 2014 +0000
      | | 
      | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | |   
      | * commit 945810f
      | | Author: Nicholas Avenell 
      | | Date:   Wed Mar 26 16:06:11 2014 +0100
      | | 
      | |     Unbreak cabals for normal users
      | |     
      | *   commit db2543f
      | |\  Merge: 1c7fc09 6b008b4
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed Mar 26 14:56:07 2014 +0100
      | | | 
      | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | |      
      | * |   commit 1c7fc09
      | |\ \  Merge: 1701b2d 9275583
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Fri Mar 21 17:31:26 2014 +0100
      | | | | 
      | | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | | |     
      | | | |     Conflicts:
      | | | |     	application/models/event.php
      | | | |     
      | * | | commit 1701b2d
      | | | | Author: Nicholas Avenell 
      | | | | Date:   Fri Mar 21 17:29:57 2014 +0100
      | | | | 
      | | | |     Some fixes
      | | | |     
      * | | | commit 61f9ffc
      | |_|/  Author: Nicholas Avenell 
      |/| |   Date:   Wed Mar 26 15:07:49 2014 +0000
      | | |   
      | | |       Display fixes
      | | |    
      * | | commit 6b008b4
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed Mar 26 13:55:22 2014 +0000
      | | | 
      | | |     Title character page
      | | |    
      * | | commit 5e9faf2
      | | | Author: Nicholas Avenell 
      | | | Date:   Wed Mar 26 13:54:04 2014 +0000
      | | | 
      | | |     Add Crew
      | | |    
      * | | commit 422c3e7
      | |/  Author: Nicholas Avenell 
      |/|   Date:   Wed Mar 26 08:57:53 2014 +0000
      | |   
      | |       Delete Icon
      | |   
      * | commit 9275583
      | | Author: Nicholas Avenell 
      | | Date:   Fri Mar 21 16:26:45 2014 +0000
      | | 
      | |     Various updates, mostly to cabals
      | |   
      * | commit 610c24d
      | | Author: Nicholas Avenell 
      | | Date:   Thu Feb 20 14:51:01 2014 +0000
      | | 
      | |     iCal events export
      | |   
      * | commit 2b9b044 (origin/development)
      |/  Author: Nicholas Avenell 
      |   Date:   Mon Feb 10 16:05:41 2014 +0000
      |   
      |       Cabal Development
      |  
      * commit 858b035
      | Author: Nicholas Avenell 
      | Date:   Mon Feb 10 12:51:50 2014 +0000
      | 
      |     Add API
      |  
      * commit deca01f
      | Author: Nicholas Avenell 
      | Date:   Sun Oct 13 09:37:13 2013 +0100
      | 
      |     Filtering for systems
      |  
      * commit 91f78b8
      | Author: Nicholas Avenell 
      | Date:   Mon Oct 7 22:33:02 2013 +0100
      | 
      |     Better error on CI errors
      |  
      * commit 75dc0b6
      | Author: Nicholas Avenell 
      | Date:   Sat Oct 5 11:36:43 2013 +0200
      | 
      |     Update database schema
      |  
      * commit 36d65c7
      | Author: Nicholas Avenell 
      | Date:   Sat Oct 5 11:36:23 2013 +0200
      | 
      |     Fix retire
      |  
      * commit f90bd77
      | Author: Aquarion 
      | Date:   Wed Jun 5 04:49:56 2013 +0100
      | 
      |     Fix error when registering
      |  
      * commit 69cf4b4
      | Author: Aquarion 
      | Date:   Wed Jun 5 04:39:27 2013 +0100
      | 
      |     Whitespace formatting
      |  
      * commit 0c1559a
      | Author: Aquarion 
      | Date:   Wed Jun 5 04:37:48 2013 +0100
      | 
      |     Deal better with Trello errors
      |  
      * commit ecf047e
      | Author: Nicholas Avenell 
      | Date:   Sat May 11 22:31:47 2013 +0200
      | 
      |     Fix 404s
      |  
      * commit a4e1d5e
      | Author: Aquarion 
      | Date:   Fri May 10 21:06:25 2013 +0100
      | 
      |     Fix some errors in group creation
      |  
      * commit 8e0b25a
      | Author: Aquarion 
      | Date:   Fri May 10 20:47:02 2013 +0100
      | 
      |     Fix some issues with adding events
      |  
      * commit dd31ae3
      | Author: Aquarion 
      | Date:   Fri May 10 20:46:27 2013 +0100
      | 
      |     Remodel user admin & Ability to empathise
      |    
      *   commit 442ed95
      |\  Merge: 7d15dfc 959e1de
      | | Author: Nicholas Avenell 
      | | Date:   Fri May 10 12:15:57 2013 +0200
      | | 
      | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | |     
      | |     Conflicts:
      | |     	application/config/autoload.php
      | |     	application/controllers/events.php
      | |     	application/controllers/my.php
      | |   
      | * commit 959e1de
      | | Author: Aquarion 
      | | Date:   Tue May 7 11:56:18 2013 +0100
      | | 
      | |     Exposed system to testing cycle. Mostly survived
      | |   
      | * commit 574a60a
      | | Author: Aquarion 
      | | Date:   Tue May 7 09:47:05 2013 +0100
      | | 
      | |     Improve exception handling
      | |   
      | * commit 367b201
      | | Author: Aquarion 
      | | Date:   Tue May 7 08:28:30 2013 +0100
      | | 
      | |     Turn anonymous user to a first-class object
      | |   
      | * commit 0af795c
      | | Author: Nicholas Avenell 
      | | Date:   Sun May 5 19:40:17 2013 +0200
      | | 
      | |     Init of Unauthed User object
      | |   
      | * commit 7c59baf
      | | Author: Nicholas Avenell 
      | | Date:   Sun May 5 19:40:00 2013 +0200
      | | 
      | |     Fix some errors in type checking
      | |   
      | * commit 20e1821
      | | Author: Aquarion 
      | | Date:   Fri May 3 01:04:45 2013 +0100
      | | 
      | |     Move 404s into Exceptions
      | |   
      * | commit 7d15dfc
      | | Author: Nicholas Avenell 
      | | Date:   Fri May 10 12:13:33 2013 +0200
      | | 
      | |     Stathat integration
      | |     
      * |   commit 14327e6
      |\ \  Merge: 22ccadb 0add8f7
      | |/  Author: Nicholas Avenell 
      | |   Date:   Tue Apr 23 20:37:46 2013 +0200
      | |   
      | |       Merge branch 'master' of github.com:aquarion/Larp.Me
      | |   
      | * commit 0add8f7
      | | Author: Aquarion 
      | | Date:   Tue Apr 23 19:35:59 2013 +0100
      | | 
      | |     Fix ability to add new systems
      | |   
      * | commit 22ccadb
      | | Author: Nicholas Avenell 
      | | Date:   Tue Apr 23 20:37:17 2013 +0200
      | | 
      | |     Admin users better
      | |     
      * |   commit 13513d2
      |\ \  Merge: a4ae608 fd11c82
      | |/  Author: Nicholas Avenell 
      | |   Date:   Tue Apr 23 17:06:31 2013 +0200
      | |   
      | |       Merge branch 'master' of github.com:aquarion/Larp.Me
      | |   
      | * commit fd11c82
      | | Author: Nicholas Avenell 
      | | Date:   Tue Apr 23 17:04:09 2013 +0200
      | | 
      | |     Clarify what 'Name' means on the registration letter
      | |   
      | * commit 9c48ddf
      | | Author: Nicholas Avenell 
      | | Date:   Tue Apr 23 17:03:46 2013 +0200
      | | 
      | |     Fix some display bugs on character pages
      | |   
      * | commit a4ae608
      |/  Author: Nicholas Avenell 
      |   Date:   Tue Apr 23 17:06:14 2013 +0200
      |   
      |       Make unarchive button a bit better
      |    
      *   commit 501533a
      |\  Merge: 2d9d78e f4706f0
      | | Author: Aquarion 
      | | Date:   Mon Apr 22 20:13:27 2013 +0100
      | | 
      | |     Merge branch 'master' of https://github.com/aquarion/Larp.Me
      | |   
      | * commit f4706f0
      | | Author: Nicholas Avenell 
      | | Date:   Mon Apr 22 18:14:42 2013 +0200
      | | 
      | |     Various bug fixes
      | |   
      | * commit 319cf1a
      | | Author: Nicholas Avenell 
      | | Date:   Mon Apr 22 11:24:47 2013 +0200
      | | 
      | |     Fix broken groups link
      | |   
      * | commit 2d9d78e
      |/  Author: Aquarion 
      |   Date:   Mon Apr 22 20:13:09 2013 +0100
      |   
      |       Ability to delete and retire characters
      |  
      * commit 4618a2d
      | Author: Aquarion 
      | Date:   Sun Apr 21 23:34:03 2013 +0100
      | 
      |     Minor styling fixes & blog link
      |  
      * commit bb0d5d4
      | Author: Aquarion 
      | Date:   Sun Apr 21 22:35:20 2013 +0100
      | 
      |     Fix my characters image display
      |  
      * commit dea2ab4
      | Author: Aquarion 
      | Date:   Sun Apr 21 19:15:00 2013 +0100
      | 
      |     Limit maximum upload size.
      |  
      * commit 414c396
      | Author: Aquarion 
      | Date:   Sun Apr 21 18:27:10 2013 +0100
      | 
      |     Fix profile image display
      |  
      * commit bd3ffd4
      | Author: Aquarion 
      | Date:   Sun Apr 21 18:14:20 2013 +0100
      | 
      |     More valid SQL update
      |  
      * commit 580c9cf
      | Author: Aquarion 
      | Date:   Sun Apr 21 18:10:12 2013 +0100
      | 
      |     Remove some debug output
      |  
      * commit 46a931a
      | Author: Aquarion 
      | Date:   Sun Apr 21 18:08:49 2013 +0100
      | 
      |     stop ignoring icons folder, and commit one.
      |  
      * commit 8a874cb
      | Author: Aquarion 
      | Date:   Sun Apr 21 18:03:18 2013 +0100
      | 
      |     Redesign character list pages
      |  
      * commit fbc3cb1
      | Author: Aquarion 
      | Date:   Sun Apr 21 17:15:00 2013 +0100
      | 
      |     Character portrait uploads
      |  
      * commit 9908387
      | Author: Aquarion 
      | Date:   Sun Apr 21 14:34:53 2013 +0100
      | 
      |     Return false properly on invalid slug
      |  
      * commit a10d565
      | Author: Nicholas Avenell 
      | Date:   Sun Apr 21 15:22:14 2013 +0200
      | 
      |     Fix unsecured content warnings
      |  
      * commit 63ae9a1
      | Author: Nicholas Avenell 
      | Date:   Sun Apr 21 15:19:36 2013 +0200
      | 
      |     Fix jQuery links to be protocol specific
      |  
      * commit 99cd4ea
      | Author: Aquarion 
      | Date:   Sun Apr 21 13:36:42 2013 +0100
      | 
      |     Fix recruitment design issues
      |  
      * commit 4d44018
      | Author: Aquarion 
      | Date:   Sun Apr 21 13:33:54 2013 +0100
      | 
      |     Fix typo in systems page
      |  
      * commit 515c73a (origin/feature/2013-04-boostrap, origin/bootstrap)
      | Author: Aquarion 
      | Date:   Sun Apr 21 13:28:35 2013 +0100
      | 
      |     My Groups redesign
      |  
      * commit 4dfe5f5
      | Author: Aquarion 
      | Date:   Sun Apr 21 13:15:33 2013 +0100
      | 
      |     System Character List
      |  
      * commit dbcf053
      | Author: Aquarion 
      | Date:   Sun Apr 21 13:11:03 2013 +0100
      | 
      |     A wild favicon appears!
      |  
      * commit efe93a2
      | Author: Aquarion 
      | Date:   Sun Apr 21 13:10:51 2013 +0100
      | 
      |     Minor reformat
      |  
      * commit 9310615
      | Author: Aquarion 
      | Date:   Sun Apr 21 13:02:16 2013 +0100
      | 
      |     Move group admin over to the new world order
      |  
      * commit 6b462d1
      | Author: Aquarion 
      | Date:   Sun Apr 21 03:37:42 2013 +0100
      | 
      |     Empty space was bothering me
      |  
      * commit 8668a40
      | Author: Aquarion 
      | Date:   Sun Apr 21 03:37:35 2013 +0100
      | 
      |     Credit glyphicons
      |  
      * commit 5dd50a1
      | Author: Aquarion 
      | Date:   Sun Apr 21 03:37:28 2013 +0100
      | 
      |     Stop registering twice
      |  
      * commit f617a89
      | Author: Aquarion 
      | Date:   Sun Apr 21 03:37:10 2013 +0100
      | 
      |     Restyle My & Character views
      |  
      * commit 379522c
      | Author: Aquarion 
      | Date:   Sun Apr 21 03:36:34 2013 +0100
      | 
      |     Restyle site admin
      |  
      * commit 1f18385
      | Author: Aquarion 
      | Date:   Sun Apr 21 01:14:37 2013 +0100
      | 
      |     Convert non-admin Group stuff to new layout.
      |  
      * commit b02159f
      | Author: Aquarion 
      | Date:   Sat Apr 20 18:51:07 2013 +0100
      | 
      |     Move Events over to New World Order
      |  
      * commit 70f3335
      | Author: Aquarion 
      | Date:   Sat Apr 20 16:23:20 2013 +0100
      | 
      |     Reformat, Fix Git display
      |  
      * commit 5049db3
      | Author: Aquarion 
      | Date:   Sat Apr 20 16:21:07 2013 +0100
      | 
      |     Commit forgotten SQL files
      |  
      * commit 33fb200
      | Author: Aquarion 
      | Date:   Sat Apr 20 16:20:50 2013 +0100
      | 
      |     UTF8 ALL THE THINGS!
      |  
      * commit b9616ef
      | Author: Aquarion 
      | Date:   Sat Apr 20 15:40:36 2013 +0100
      | 
      |     Convert Static docs to Bootstrap
      |  
      * commit 2569cf6
      | Author: Aquarion 
      | Date:   Sat Apr 20 15:40:20 2013 +0100
      | 
      |     Remove old views
      |  
      * commit 4290153
      | Author: Aquarion 
      | Date:   Sat Apr 20 15:34:07 2013 +0100
      | 
      |     Converted Auth to Bootstrap
      |  
      * commit b3de33b
      | Author: Aquarion 
      | Date:   Mon Apr 8 23:37:50 2013 +0100
      | 
      |     Front page and site design moved to Bootstrap
      |  
      * commit bcbb392
      | Author: Aquarion 
      | Date:   Sat Apr 6 20:06:09 2013 +0100
      | 
      |     Ability to archive off group applications
      |  
      * commit 2ec7ee2
      | Author: Aquarion 
      | Date:   Sat Apr 6 19:43:40 2013 +0100
      | 
      |     Accept and reject group applications
      |  
      * commit ff9b132
      | Author: Aquarion 
      | Date:   Sat Apr 6 18:39:58 2013 +0100
      | 
      |     Move JS into its own file
      |  
      * commit 129dfdb
      | Author: Aquarion 
      | Date:   Sun Mar 24 14:45:32 2013 +0000
      | 
      |     Fix some places relying on Systems being global
      |    
      *   commit 97c05cc
      |\  Merge: 2c5fd96 fdb88fe
      | | Author: Nicholas Avenell 
      | | Date:   Thu Mar 28 01:34:13 2013 +0100
      | | 
      | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | |   
      | * commit fdb88fe
      | | Author: Aquarion 
      | | Date:   Sun Mar 24 14:34:31 2013 +0000
      | | 
      | |     Move system header styles into their own page
      | |   
      | * commit e525fd1
      | | Author: Aquarion 
      | | Date:   Sun Mar 24 14:33:03 2013 +0000
      | | 
      | |     function to get best Name value
      | |   
      | * commit 44663e3
      | | Author: Aquarion 
      | | Date:   Sun Mar 24 14:32:48 2013 +0000
      | | 
      | |     Minor restyling
      | |   
      | * commit c7bd2bf
      | | Author: Aquarion 
      | | Date:   Sat Mar 23 09:42:11 2013 +0000
      | | 
      | |     Once more for luck
      | |   
      | * commit 3b0895f
      | | Author: Aquarion 
      | | Date:   Sat Mar 23 09:40:21 2013 +0000
      | | 
      | |     Use new image location on system images
      | |   
      | * commit df483de
      | | Author: Aquarion 
      | | Date:   Sat Mar 23 09:18:15 2013 +0000
      | | 
      | |     Fixed clash
      | |     
      | *   commit ab8a011
      | |\  Merge: 223a76a 66345fb
      | | | Author: Aquarion 
      | | | Date:   Sat Mar 23 09:17:06 2013 +0000
      | | | 
      | | |     Merge branch 'master' of https://github.com/aquarion/Larp.Me
      | | |    
      | | * commit 66345fb
      | | | Author: Aquarion 
      | | | Date:   Thu Mar 21 15:06:37 2013 +0000
      | | | 
      | | |     Fall back to full name if nickname isn't available
      | | |    
      | * | commit 223a76a
      | | | Author: Aquarion 
      | | | Date:   Sat Mar 23 09:14:44 2013 +0000
      | | | 
      | | |     Move site banners to S3
      | | |    
      | * | commit 7089249
      | | | Author: Aquarion 
      | | | Date:   Sun Mar 17 01:56:14 2013 +0000
      | | | 
      | | |     Subtitle humour
      | | |    
      * | | commit 2c5fd96
      | |/  Author: Nicholas Avenell 
      |/|   Date:   Thu Mar 28 01:32:25 2013 +0100
      | |   
      | |       Limit groups list to public by default
      | |   
      * | commit ad3d0fb
      | | Author: Aquarion 
      | | Date:   Mon Mar 18 16:59:47 2013 +0000
      | | 
      | |     Fix password reset
      | |   
      * | commit aff5fde
      | | Author: Aquarion 
      | | Date:   Mon Mar 18 16:59:24 2013 +0000
      | | 
      | |     Fix issue with the 'Members Of' title
      | |     
      * |   commit c57c538
      |\ \  Merge: 1810bf3 39f2df4
      | |/  Author: Aquarion 
      | |   Date:   Mon Mar 18 12:36:55 2013 +0000
      | |   
      | |       Merge branch 'master' of github.com:aquarion/Larp.Me
      | |   
      | * commit 39f2df4
      | | Author: Aquarion 
      | | Date:   Sat Mar 16 11:04:19 2013 +0000
      | | 
      | |     Clean up character create/edit a bit
      | |   
      * | commit 1810bf3
      |/  Author: Aquarion 
      |   Date:   Mon Mar 18 12:36:18 2013 +0000
      |   
      |       Don't force moving off ssl
      |  
      * commit 12e292a
      | Author: Aquarion 
      | Date:   Sat Mar 16 10:47:52 2013 +0000
      | 
      |     Better page titles
      |  
      * commit 40a18e3
      | Author: Aquarion 
      | Date:   Sat Mar 16 10:47:38 2013 +0000
      | 
      |     Ability for user to manage their group applications
      |  
      * commit 792cc77
      | Author: Aquarion 
      | Date:   Sat Mar 16 01:07:38 2013 +0000
      | 
      |     Rearrange front page
      |  
      * commit 2db516d
      | Author: Aquarion 
      | Date:   Sat Mar 16 01:06:54 2013 +0000
      | 
      |     Move todo list to Trello
      |  
      * commit fa7c58b
      | Author: Aquarion 
      | Date:   Sat Mar 16 00:30:45 2013 +0000
      | 
      |     Reworked todo list to be more useful to me and everyone else.
      |  
      * commit 5b66a02
      | Author: Aquarion 
      | Date:   Sat Mar 16 00:08:25 2013 +0000
      | 
      |     Ability to apply to join a group
      |  
      * commit 932e680
      | Author: Aquarion 
      | Date:   Fri Mar 15 23:22:20 2013 +0000
      | 
      |     Update todo list
      |  
      * commit f62aa0a
      | Author: Aquarion 
      | Date:   Fri Mar 15 21:06:45 2013 +0000
      | 
      |     Increase clickability of header
      |    
      *   commit 4b1aed6
      |\  Merge: cfea4bd 3cb2b04
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 20:36:47 2013 +0000
      | | 
      | |     Merge remote-tracking branch 'origin/group_membership'
      | |   
      | * commit 3cb2b04
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 20:32:46 2013 +0000
      | | 
      | |     Ability to join open groups
      | |   
      | * commit 6509224
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 18:31:45 2013 +0000
      | | 
      | |     Group membership part one
      | |   
      | * commit 1f01dd9
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 18:31:32 2013 +0000
      | | 
      | |     Hide hidden groups' recruitment cards
      | |   
      | * commit f25e68e
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 18:30:40 2013 +0000
      | | 
      | |     Fix edit system for groups and systems
      | |   
      | * commit 66696bf
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 16:50:16 2013 +0000
      | | 
      | |     Clean up iconned lists
      | |   
      | * commit 7e19858
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 16:49:37 2013 +0000
      | | 
      | |     Deal better with missing slugs
      | |   
      | * commit 976df91
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 16:49:07 2013 +0000
      | | 
      | |     Fix system editing
      | |   
      | * commit f403481
      | | Author: Aquarion 
      | | Date:   Fri Mar 15 16:20:01 2013 +0000
      | | 
      | |     Update cookie policy with Uservoice data
      | |   
      * | commit cfea4bd
      |/  Author: Aquarion 
      |   Date:   Mon Dec 24 22:43:33 2012 +0000
      |   
      |       Reword password reset a bit
      |    
      *   commit ca94a3c
      |\  Merge: fa9142d c6c4469
      | | Author: Aquarion 
      | | Date:   Thu Sep 27 09:00:53 2012 +0100
      | | 
      | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | |     
      | |     Conflicts:
      | |     	views/fragments/footer.php
      | |   
      | * commit c6c4469
      | | Author: Aquarion 
      | | Date:   Thu Sep 27 08:54:34 2012 +0100
      | | 
      | |     Added Cookie Policy
      | |   
      * | commit fa9142d
      | | Author: Aquarion 
      | | Date:   Thu Sep 27 08:56:31 2012 +0100
      | | 
      | |     Fix group editing.
      | |   
      * | commit da82f22
      |/  Author: Aquarion 
      |   Date:   Thu Sep 27 08:56:13 2012 +0100
      |   
      |       Restyle footer slightly
      |    
      | * commit 74becdb (origin/image-upload, origin/feature/2012-09_image-upload)
      | | Author: Nicholas Avenell 
      | | Date:   Wed Oct 17 20:04:32 2012 +0100
      | | 
      | |     Tag development
      | |     
      | *   commit 0e9066c
      | |\  Merge: ef09621 2552676
      | |/  Author: Aquarion 
      |/|   Date:   Tue Sep 25 23:39:56 2012 +0100
      | |   
      | |       Merge remote-tracking branch 'origin/master' into image-upload
      | |       
      | |       Conflicts:
      | |       	application/config/routes.php
      | |       	application/core/MY_Object.php
      | |       	application/models/user.php
      | |   
      * | commit 2552676
      | | Author: Aquarion 
      | | Date:   Sun Sep 23 13:56:34 2012 +0100
      | | 
      | |     Allow system owners to edit system details
      | |   
      * | commit 4e3312e
      | | Author: Aquarion 
      | | Date:   Sun Sep 23 13:56:25 2012 +0100
      | | 
      | |     Repair group creation.
      | |   
      * | commit 99bb05d (origin/group_membership, group_membership)
      | | Author: Aquarion 
      | | Date:   Sun Sep 23 13:14:30 2012 +0100
      | | 
      | |     Fixing bugs caused by hidden groups.
      | |   
      * | commit cf6a762
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 19:49:33 2012 +0100
      | | 
      | |     Fix group recruitment display.
      | |   
      * | commit 7501c36
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 17:33:52 2012 +0100
      | | 
      | |     Fix complications from screwing with the metamodels.
      | |   
      * | commit 2286c91
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 17:33:14 2012 +0100
      | | 
      | |     Fix display of user icons on All Groups page
      | |   
      * | commit 2ee873d
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 17:31:51 2012 +0100
      | | 
      | |     Fix saving users.
      | |   
      * | commit 3b06827
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 17:09:41 2012 +0100
      | | 
      | |     Hide hidden groups from the UNWORTHY
      | |   
      * | commit e6d2d6a
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 17:08:46 2012 +0100
      | | 
      | |     And showing errors on the dev server saves time
      | |   
      * | commit 37a289a
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 17:08:18 2012 +0100
      | | 
      | |     Equally, not breaking the save system would be useful
      | |   
      * | commit cbce3ec
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 17:07:33 2012 +0100
      | | 
      | |     It'd be nice if the model system returned sane things, but we're all mad here
      | |   
      * | commit 7086548
      | | Author: Aquarion 
      | | Date:   Fri Sep 21 15:48:04 2012 +0100
      | | 
      | |     Display dev information.
      | |   
      * | commit a59d96a
      | | Author: Aquarion 
      | | Date:   Thu Sep 20 18:08:52 2012 +0100
      | | 
      | |     Hidden groups pt.1
      | |     
      * |   commit a317fcd
      |\ \  Merge: 158edc7 2d768ce
      | | | Author: Aquarion 
      | | | Date:   Thu Sep 20 16:57:27 2012 +0100
      | | | 
      | | |     Merge branch 'master' of github.com:aquarion/Larp.Me into group_membership
      | | |      
      | * |   commit 2d768ce
      | |\ \  Merge: 4643a0d 455b484
      | | | | Author: Aquarion 
      | | | | Date:   Thu Sep 20 16:55:58 2012 +0100
      | | | | 
      | | | |     Merge branch 'master' of github.com:aquarion/Larp.Me
      | | | |     
      | * | | commit 4643a0d
      | | | | Author: Aquarion 
      | | | | Date:   Thu Sep 20 16:54:13 2012 +0100
      | | | | 
      | | | |     Clean up My Groups display
      | | | |       
      * | | |   commit 158edc7
      |\ \ \ \  Merge: 698a710 455b484
      | | |/ /  Author: Aquarion 
      | |/| |   Date:   Thu Sep 20 16:54:46 2012 +0100
      | | | |   
      | | | |       Merge branch 'master' of github.com:aquarion/Larp.Me into group_membership
      | | | |     
      * | | | commit 698a710
      | |/ /  Author: Aquarion 
      |/| |   Date:   Wed Sep 19 17:31:08 2012 +0100
      | | |   
      | | |       Database changes to prep for group membership
      | | |    
      * | | commit 02f1e3e
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 17:29:53 2012 +0100
      | | | 
      | | |     Modify header images css override.
      | | |    
      * | | commit 8643900
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 17:28:06 2012 +0100
      | | | 
      | | |     Colour OOC information in groups pages
      | | |    
      * | | commit 18d6000
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 17:26:58 2012 +0100
      | | | 
      | | |     Fix typo causing my/groups to bsod
      | | |    
      | | * commit ef09621
      | | | Author: Aquarion 
      | | | Date:   Thu Sep 20 21:32:33 2012 +0100
      | | | 
      | | |     ... And more.
      | | |    
      | | * commit 0c9c95c
      | | | Author: Aquarion 
      | | | Date:   Thu Sep 20 21:31:54 2012 +0100
      | | | 
      | | |     ...More Lightbox.
      | | |    
      | | * commit 3ec2f0a
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 22:30:52 2012 +0100
      | | | 
      | | |     Add file paths to lightbox.
      | | |    
      | | * commit 736f0ff
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 22:30:27 2012 +0100
      | | | 
      | | |     Add non-git Lightbox
      | | |    
      | | * commit 6840528
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 22:29:09 2012 +0100
      | | | 
      | | |     Deleted Lightbox.
      | | |    
      | | * commit 7e2dfc5
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 22:26:48 2012 +0100
      | | | 
      | | |     Fixing Lightbox
      | | |    
      | | * commit 84f7fdb
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 22:26:40 2012 +0100
      | | | 
      | | |     Add Image from FB Tags
      | | |    
      | | * commit 914f086
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 22:25:58 2012 +0100
      | | | 
      | | |     Update object models.
      | | |    
      | | * commit 8acd04f
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 22:24:56 2012 +0100
      | | | 
      | | |     Facebook Integration.
      | | |    
      | | * commit da968eb
      | | | Author: Aquarion 
      | | | Date:   Wed Sep 19 22:23:21 2012 +0100
      | | | 
      | | |     Remove Lightbox from gitmodules
      | | |    
      | | * commit a412a78
      | | | Author: Aquarion 
      | | | Date:   Tue Sep 18 03:49:31 2012 +0100
      | | | 
      | | |     Remove file upload
      | | |    
      | | * commit 4cc3573
      | | | Author: Aquarion 
      | | | Date:   Thu Sep 13 20:19:44 2012 +0100
      | | | 
      | | |     Switched to new method
      | | |    
      | | * commit 219d25d
      | | | Author: Aquarion 
      | | | Date:   Thu Sep 13 16:53:23 2012 +0100
      | | | 
      | | |     Process Upload
      | | |      
      | | *   commit 46815b4
      | | |\  Merge: 0412188 455b484
      | | |/  Author: Aquarion 
      | |/|   Date:   Tue Sep 11 20:52:29 2012 +0100
      | | |   
      | | |       Merge remote-tracking branch 'origin/master' into image-upload
      | | |       
      | | |       Conflicts:
      | | |       	views/character/view.php
      | | |    
      | * | commit 455b484
      |/ /  Author: Aquarion 
      | |   Date:   Tue Sep 11 20:24:00 2012 +0100
      | |   
      | |       Ignore uploads
      | |   
      * | commit 50fb550
      | | Author: Aquarion 
      | | Date:   Tue Sep 11 19:46:00 2012 +0100
      | | 
      | |     Create new object return syntax.
      | |   
      * | commit b64dd8f
      | | Author: Aquarion 
      | | Date:   Mon Sep 10 22:58:38 2012 +0100
      | | 
      | |     Move character edit button for great consistancy
      | |   
      * | commit 0513568
      | | Author: Aquarion 
      | | Date:   Mon Sep 10 22:51:33 2012 +0100
      | | 
      | |     Make hidden changelogs a bit more subtle :).
      | |   
      * | commit e36ef9d
      | | Author: Aquarion 
      | | Date:   Mon Sep 10 22:48:32 2012 +0100
      | | 
      | |     First version of Player Profile page
      | |   
      * | commit acd2def
      | | Author: Aquarion 
      | | Date:   Sun Sep 9 10:46:53 2012 +0100
      | | 
      | |     Added Lightbox
      | |   
      * | commit 584c418
      | | Author: Aquarion 
      | | Date:   Sun Sep 9 10:03:24 2012 +0100
      | | 
      | |     Visual difference between dev and live [PRIVATE]
      | |   
      * | commit 9be8bc5
      | | Author: Aquarion 
      | | Date:   Sun Sep 9 09:46:19 2012 +0100
      | | 
      | |     Improve environment management (Dev internal)
      | |   
      * | commit 39b7554
      | | Author: Aquarion 
      | | Date:   Mon Sep 10 17:13:17 2012 +0100
      | | 
      | |     Ability to hide specific changelog entries from the front page.
      | |   
      * | commit 1a5025e
      | | Author: Aquarion 
      | | Date:   Mon Sep 10 17:11:17 2012 +0100
      | | 
      | |     Fix display of long nicknames in character pages
      | |   
      | * commit 0412188
      | | Author: Aquarion 
      | | Date:   Mon Sep 10 22:30:56 2012 +0100
      | | 
      | |     Starting with the image upload stuff.
      | |   
      | * commit 84f2883
      | | Author: Aquarion 
      | | Date:   Sun Sep 9 10:46:53 2012 +0100
      | | 
      | |     Added Lightbox
      | |   
      | * commit 1783a30
      | | Author: Aquarion 
      | | Date:   Sun Sep 9 10:03:24 2012 +0100
      | | 
      | |     Visual difference between dev and live [PRIVATE]
      | |   
      | * commit 85802a2
      |/  Author: Aquarion 
      |   Date:   Sun Sep 9 09:46:19 2012 +0100
      |   
      |       Improve environment management (Dev internal)
      |  
      * commit bd7576b
      | Author: Aquarion 
      | Date:   Sun Sep 9 09:31:32 2012 +0100
      | 
      |     After login, redirect back to where you wanted to go to (Fixed)
      |  
      * commit 5fc1d3a
      | Author: Aquarion 
      | Date:   Sun Sep 9 09:29:47 2012 +0100
      | 
      |     Stop dev config files being deployed to live, you muppet. [PRIVATE]
      |  
      * commit 76590ec
      | Author: Aquarion 
      | Date:   Sat Sep 8 12:45:54 2012 +0100
      | 
      |     Automatic Changelog
      |  
      * commit 56b03d9
      | Author: Aquarion 
      | Date:   Sat Sep 8 12:45:40 2012 +0100
      | 
      |     Restyle systemlist banners
      |     
      |     Magic alpha changes!
      |  
      * commit aa82abb
      | Author: Aquarion 
      | Date:   Fri Sep 7 18:09:39 2012 +0100
      | 
      |     Define a home for banner images
      |  
      * commit 555f630
      | Author: Aquarion 
      | Date:   Fri Sep 7 18:09:26 2012 +0100
      | 
      |     Fix PHP Warnings
      |  
      * commit 2db3832
      | Author: Aquarion 
      | Date:   Fri Sep 7 18:08:44 2012 +0100
      | 
      |     Be nicer about broken database settings
      |  
      * commit 6928f0f
      | Author: Aquarion 
      | Date:   Fri Sep 7 18:08:18 2012 +0100
      | 
      |     Localconfig should not exist
      |  
      * commit 6f29182
      | Author: Aquarion 
      | Date:   Fri Sep 7 18:07:35 2012 +0100
      | 
      |     Don't support 404 handler
      |     
      |     Mod_Rewrite or death.
      |  
      * commit 26722d4
      | Author: Aquarion 
      | Date:   Fri Sep 7 14:39:54 2012 +0100
      | 
      |     View all groups in a system
      |  
      * commit 3b9655b
      | Author: Aquarion 
      | Date:   Fri Sep 7 14:39:41 2012 +0100
      | 
      |     Google Tracking
      |  
      * commit 6fa3d61
      | Author: Aquarion 
      | Date:   Fri Sep 7 00:17:12 2012 +0100
      | 
      |     Only show Uservoice popup if Javascript is installed
      |  
      * commit 1a5509c
      | Author: Aquarion 
      | Date:   Thu Sep 6 23:24:45 2012 +0100
      | 
      |     Add initial character profile and editing
      |  
      * commit ea7349b
      | Author: Aquarion 
      | Date:   Thu Sep 6 23:24:32 2012 +0100
      | 
      |     Fix text display for group recruitment
      |  
      * commit ae5d242
      | Author: Aquarion 
      | Date:   Thu Sep 6 23:24:12 2012 +0100
      | 
      |     Fix some styling issues
      |  
      * commit cd73159
      | Author: Aquarion 
      | Date:   Thu Sep 6 22:19:58 2012 +0100
      | 
      |     Final tweeks and new frontpage
      |  
      * commit 3c26013
      | Author: Aquarion 
      | Date:   Thu Sep 6 22:19:43 2012 +0100
      | 
      |     Logical deleting of groups
      |  
      * commit 25e9b5f
      | Author: Aquarion 
      | Date:   Thu Sep 6 22:19:02 2012 +0100
      | 
      |     WYSIWYG on textareas
      |  
      * commit 1555203
      | Author: Aquarion 
      | Date:   Thu Sep 6 18:01:55 2012 +0100
      | 
      |     Email Verification
      |  
      * commit 8498572
      | Author: Aquarion 
      | Date:   Thu Sep 6 18:01:27 2012 +0100
      | 
      |     HTML Validation errors
      |  
      * commit e22e103
      | Author: Aquarion 
      | Date:   Thu Sep 6 18:00:58 2012 +0100
      | 
      |     Notifications system
      |  
      * commit 370f0b6
      | Author: Aquarion 
      | Date:   Thu Sep 6 12:08:04 2012 +0100
      | 
      |     User account modification and password change
      |  
      * commit 19edc7e
      | Author: Aquarion 
      | Date:   Thu Sep 6 12:06:25 2012 +0100
      | 
      |     Remove stupid background
      |  
      * commit 32aff43
      | Author: Aquarion 
      | Date:   Thu Sep 6 12:05:58 2012 +0100
      | 
      |     Enable Profiler for admin users only
      |  
      * commit 6db3f82
      | Author: Aquarion 
      | Date:   Thu Sep 6 12:05:40 2012 +0100
      | 
      |     Credit Anytime
      |  
      * commit ba8e518
      | Author: Aquarion 
      | Date:   Thu Sep 6 12:05:28 2012 +0100
      | 
      |     Update apache config for new site layout
      |  
      * commit 44fc4c8
      | Author: Aquarion 
      | Date:   Thu Sep 6 00:59:13 2012 +0100
      | 
      |     Fix force-ssl for errors
      |  
      * commit 50b3267
      | Author: Aquarion 
      | Date:   Thu Sep 6 00:58:57 2012 +0100
      | 
      |     Password reset functions
      |  
      * commit c0c5cfe
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:47:34 2012 +0100
      | 
      |     Display some help text on the My Groups page WRT creating new ones. HT: Teron
      |  
      * commit 997bd00
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:47:03 2012 +0100
      | 
      |     Better support for player events
      |  
      * commit e2541a6
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:46:43 2012 +0100
      | 
      |     Change label on submit button to 'Save' (HT: Beornwulf), and label System Faction selectablity a bit better (HT: Dwm)
      |  
      * commit 2dc7f82
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:43:42 2012 +0100
      | 
      |     Support HTTPS for fonts
      |  
      * commit da0c1a1
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:43:29 2012 +0100
      | 
      |     Better Player Event support
      |  
      * commit 34f0701
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:42:53 2012 +0100
      | 
      |     'Not Yet' for characters
      |  
      * commit 1679162
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:42:38 2012 +0100
      | 
      |     Restyle register a bit for ease of use
      |  
      * commit 36a8672
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:42:18 2012 +0100
      | 
      |     Remove labels for most pronouns
      |  
      * commit dd5ce46
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:42:00 2012 +0100
      | 
      |     Not Yet for cabals
      |  
      * commit 280f152
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:41:43 2012 +0100
      | 
      |     Validate end dates are after start dates (HT: Vivaphonics)
      |  
      * commit a65b271
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:41:17 2012 +0100
      | 
      |     Add 'Not Yet' for characters & cabal views
      |  
      * commit 4a69650
      | Author: Aquarion 
      | Date:   Wed Sep 5 18:40:26 2012 +0100
      | 
      |     Force SSL capability, and add that to Authentication
      |  
      * commit b6da23c
      | Author: Aquarion 
      | Date:   Tue Sep 4 22:09:43 2012 +0100
      | 
      |     First round of user testing and associated fixes
      |  
      * commit f587667
      | Author: Aquarion 
      | Date:   Tue Sep 4 22:09:23 2012 +0100
      | 
      |     Groups & Group Recruitment Developmetn
      |  
      * commit b96abfb
      | Author: Aquarion 
      | Date:   Tue Sep 4 00:26:53 2012 +0100
      | 
      |     Update the todo list
      |  
      * commit 232b0f1
      | Author: Aquarion 
      | Date:   Tue Sep 4 00:23:31 2012 +0100
      | 
      |     Adding/Editing groups v1
      |  
      * commit 0dea8ed
      | Author: Aquarion 
      | Date:   Mon Sep 3 16:30:00 2012 +0100
      | 
      |     The start of the terrifying groups system
      |  
      * commit 73b8e4a
      | Author: Aquarion 
      | Date:   Mon Sep 3 16:29:43 2012 +0100
      | 
      |     Edit for clarity (HT: freddiefraggles)
      |  
      * commit ebe5549
      | Author: Aquarion 
      | Date:   Mon Sep 3 16:29:16 2012 +0100
      | 
      |     Colophon
      |  
      * commit 13254d2
      | Author: Aquarion 
      | Date:   Fri Aug 31 18:26:00 2012 +0100
      | 
      |     Alphabetical order
      |  
      * commit 107a915
      | Author: Aquarion 
      | Date:   Fri Aug 31 15:59:54 2012 +0100
      | 
      |     Clean up the systems list a bit, fix some CSS
      |  
      * commit fa80345
      | Author: Aquarion 
      | Date:   Tue Aug 28 23:48:35 2012 +0100
      | 
      |     View/Edit event
      |  
      * commit 33d592b
      | Author: Aquarion 
      | Date:   Mon Aug 27 14:08:18 2012 +0100
      | 
      |     Update front-page messages
      |  
      * commit 833188b
      | Author: Aquarion 
      | Date:   Mon Aug 27 14:04:13 2012 +0100
      | 
      |     Normalize line endings
      |  
      * commit 37f3d2f
      | Author: Aquarion 
      | Date:   Mon Aug 27 14:03:16 2012 +0100
      | 
      |     Attributes file
      |  
      * commit 6e51882
      | Author: Aquarion 
      | Date:   Mon Aug 27 13:58:57 2012 +0100
      | 
      |     Event add & Create, plus other fixes
      |  
      * commit d140f55
      | Author: Aquarion 
      | Date:   Sun Aug 26 19:33:37 2012 +0100
      | 
      |     Anytime
      |  
      * commit 17c338c
      | Author: Aquarion 
      | Date:   Wed Aug 22 04:47:42 2012 +0100
      | 
      |     Update homepage & Nav a bit
      |  
      * commit cf1a274
      | Author: Aquarion 
      | Date:   Wed Aug 22 04:43:40 2012 +0100
      | 
      |     A lot of stubs for future functionality, and the first bit of Events
      |  
      * commit 811ef88
      | Author: Aquarion 
      | Date:   Wed Aug 22 04:42:10 2012 +0100
      | 
      |     A lot of stubs for future functionality, and the first bit of Events
      |  
      * commit b6532cf
      | Author: Aquarion 
      | Date:   Sun Aug 19 20:05:52 2012 +0100
      | 
      |     First version of system information page
      |  
      * commit b6577cf
      | Author: Aquarion 
      | Date:   Sun Aug 19 20:05:32 2012 +0100
      | 
      |     Update Codeigniter version
      |  
      * commit f7ca2a9
      | Author: Aquarion 
      | Date:   Sun Aug 19 18:49:33 2012 +0100
      | 
      |     Add characters & Systems List pt1
      |  
      * commit 27e759b
      | Author: Aquarion 
      | Date:   Sun Aug 19 13:41:35 2012 +0100
      | 
      |     Part one of add new character
      |  
      * commit 6ff42c7
      | Author: Aquarion 
      | Date:   Sun Aug 19 11:19:17 2012 +0100
      | 
      |     Tidy up registration page a bit
      |  
      * commit 5734aae
      | Author: Aquarion 
      | Date:   Sun Aug 19 11:18:54 2012 +0100
      | 
      |     Add warranty stuff to T&C
      |  
      * commit 1fcbeee
      | Author: Aquarion 
      | Date:   Sun Aug 19 11:18:29 2012 +0100
      | 
      |     Move docs to the new world order
      |  
      * commit 3e9bdcb
      | Author: Aquarion 
      | Date:   Sun Aug 19 11:13:28 2012 +0100
      | 
      |     Pretty 404 pages
      |  
      * commit 65be2f3
      | Author: Aquarion 
      | Date:   Sun Aug 19 11:13:14 2012 +0100
      | 
      |     Database import stuff
      |  
      * commit f0abd29
      | Author: Nicholas Avenell 
      | Date:   Sun Jun 24 13:41:25 2012 +0000
      | 
      |     As of a recent commit, num_rows now should be replaced with num_rows()
      |  
      * commit 1523bb3
      | Author: Nicholas Avenell 
      | Date:   Sun Jun 24 11:29:41 2012 +0000
      | 
      |     Undid the downgrade from 3.0alpha to 2.1.1, switched to my own branch of CI, fixes to keep up with CI development
      |  
      * commit 828980f
      | Author: Nicholas Avenell 
      | Date:   Sun Jun 24 10:27:54 2012 +0000
      | 
      |     Update Codeigniter to 2.1.1
      |  
      * commit 28e0156
      | Author: Nicholas Avenell 
      | Date:   Sun Jun 24 01:56:44 2012 +0000
      | 
      |     Restyle
      |  
      * commit 3a7b6a1
      | Author: Nicholas Avenell 
      | Date:   Sun Jun 24 01:56:33 2012 +0000
      | 
      |     System add/edit
      |  
      * commit 5c42bce
      | Author: Nicholas Avenell 
      | Date:   Sun Jun 24 01:01:36 2012 +0000
      | 
      |     User auth
      |  
      * commit da0a880
      | Author: Nicholas Avenell 
      | Date:   Sun Jun 24 01:01:10 2012 +0000
      | 
      |     Inital admin system
      |  
      * commit 818475f
      | Author: Nicholas Avenell 
      | Date:   Sat Apr 14 03:51:03 2012 +0000
      | 
      |     Registration and login
      |  
      * commit 076475d
      | Author: Nicholas Avenell 
      | Date:   Sat Apr 14 03:50:20 2012 +0000
      | 
      |     This should not be here
      |  
      * commit 5e173a3
      | Author: Nicholas Avenell 
      | Date:   Sat Apr 14 03:45:44 2012 +0000
      | 
      |     Config data for apache
      |  
      * commit 04766e4
      | Author: Aquarion 
      | Date:   Sat Mar 24 10:47:45 2012 +0000
      | 
      |     Terms & Conditions
      |  
      * commit 49a915f
      | Author: Aquarion 
      | Date:   Sat Mar 10 20:39:33 2012 +0000
      | 
      |     Validation for User Registration
      |  
      * commit 353f8a7
      | Author: Aquarion 
      | Date:   Sat Mar 10 20:38:54 2012 +0000
      | 
      |     Ignore pointless frippery
      |  
      * commit 68b7188
      | Author: Nicholas Avenell 
      | Date:   Fri Mar 9 23:18:45 2012 +0000
      | 
      |     Registration pt. 1
      |  
      * commit 139fbdf
      | Author: Nicholas Avenell 
      | Date:   Sun Feb 19 13:55:03 2012 +0000
      | 
      |     Development environment go\!
      |  
      * commit 1f8d0df
      | Author: Nicholas Avenell 
      | Date:   Sat Feb 18 18:53:44 2012 +0000
      | 
      |     Use htaccess files
      |  
      * commit 32e5205
      | Author: Nicholas Avenell 
      | Date:   Sat Feb 18 18:53:31 2012 +0000
      | 
      |     Ignore aptana files
      |  
      * commit c36bbeb
      | Author: Nicholas Avenell 
      | Date:   Sat Feb 18 18:30:12 2012 +0000
      | 
      |     And, as if by magic, we're now a code-igniter project
      |  
      * commit c9287b7
      | Author: Nicholas Avenell 
      | Date:   Sat Feb 18 18:17:15 2012 +0000
      | 
      |     Add codeigniter submodule
      |  
      * commit a0c9d5b
      | Author: Nicholas Avenell 
      | Date:   Sat Feb 18 18:10:28 2012 +0000
      | 
      |     Delete django project. Time for a change
      |  
      * commit 0dbc5cb (tag: 2011-08_final-django-version, origin/django)
      | Author: Nicholas Avenell 
      | Date:   Tue Feb 7 01:26:55 2012 +0000
      | 
      |     User Profile
      |  
      * commit 1a22daa
      | Author: Nicholas Avenell 
      | Date:   Fri Jan 20 00:16:50 2012 +0000
      | 
      |     Navigation and structure
      |  
      * commit 5d53618
      | Author: Nicholas Avenell 
      | Date:   Fri Jan 20 00:15:48 2012 +0000
      | 
      |     Ignore .e project files
      |  
      * commit 887ac1a
      | Author: Nicholas Avenell 
      | Date:   Fri Jan 20 00:15:24 2012 +0000
      | 
      |     Ignore .e project files
      |  
      * commit fe537a3
      | Author: Nicholas Avenell 
      | Date:   Fri Jan 20 00:14:45 2012 +0000
      | 
      |     Front page content
      |  
      * commit 6ee905b
      | Author: Nicholas Avenell 
      | Date:   Fri Jan 20 00:14:10 2012 +0000
      | 
      |     New version of Bootstrap
      |  
      * commit 6c483dd
      | Author: Nicholas Avenell 
      | Date:   Thu Jan 19 21:07:34 2012 +0000
      | 
      |     New frontpage & styling
      |  
      * commit bc97a53
      | Author: Aquarion 
      | Date:   Sun Aug 28 02:57:32 2011 +0100
      | 
      |      Pronouns
      |  
      * commit 504b3dd
      | Author: Aquarion 
      | Date:   Sun Aug 28 02:56:59 2011 +0100
      | 
      |     Basic templates
      |  
      * commit f502675
      | Author: Aquarion 
      | Date:   Sun Aug 28 02:56:41 2011 +0100
      | 
      |     Ignore netbeans too
      |  
      * commit bc88d60
      | Author: Aquarion 
      | Date:   Sun Aug 28 02:56:06 2011 +0100
      | 
      |     Start with some models
      |  
      * commit a16226e
      | Author: Aquarion 
      | Date:   Sun Aug 28 02:55:40 2011 +0100
      | 
      |     Ignore local settings and compile files
      |  
      * commit 6b21120
      | Author: Aquarion 
      | Date:   Sun Aug 28 02:54:59 2011 +0100
      | 
      |     Basic config
      |  
      * commit 9920fda
      | Author: Aquarion 
      | Date:   Sun Aug 28 02:54:27 2011 +0100
      | 
      |     Make manage executable
      |  
      * commit 413a76a
      | Author: Aquarion 
      | Date:   Sun Aug 28 02:54:05 2011 +0100
      | 
      |     Move assets into static
      |  
      * commit 895d87c
      | Author: Aquarion 
      | Date:   Tue Aug 23 23:19:54 2011 +0100
      | 
      |     Add bootstrap submodules
      |  
      * commit ee06f23
        Author: Aquarion 
        Date:   Tue Aug 23 23:15:02 2011 +0100
        
            Initial Django Scaffold