Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Commits on Aug 25, 2013
  1. @JonTheNiceGuy

    Merge pull request #177 from JonTheNiceGuy/IssuesCausedBy175

    JonTheNiceGuy authored
    Fixing issues raised after merging #175
  2. @JonTheNiceGuy

    Fixing issues raised after merging #175

    JonTheNiceGuy authored
    PullRequest #175 introduced some issues in the Puppet manifest, and
    introduced issues in the unit tests. This commit fixes many of those
    issues (plus issues which were identified as a result).
    
    * Puppet now also installs Gammu-smsd and Gammu-doc. It points the CFM2
    install file to the MySQL definition for Gammu, to install that as well
    (Puppet).
    * GenericObject now checks for the "old" value before simply inserting
    it (Unit Test). To prevent PDO locks with multiple SQL statements, it
    also closes cursors where required (Install script). Lastly, it checks
    when installing database tables that the changelog table already exists
    before proceeding (Install script).
    * Object_Userauth checks whether "old" values are set before referring
    to them (Install script).
    * Install script now only freshens the jQueryMobile libraries, not
    prompts (Install script)
    * Amended talk tests in the Limbo plugin to return the correct slot
    based on current logic (Unit Test)
    * Ensure that the sessions are saved to an appropriate place during unit
    testing (/tmp) - (Unit Test)
    * Prevent testing of OpenID from erroring due to headers already being
    sent messages (Unit Test, but probably not a bad idea elsewhere too?)
  3. @JonTheNiceGuy

    Merge pull request #175 from JonTheNiceGuy/Issue132

    JonTheNiceGuy authored
    This change implements features which should close #132.
Commits on Jul 31, 2013
  1. @JonTheNiceGuy
  2. @JonTheNiceGuy
Commits on Jul 29, 2013
  1. @JonTheNiceGuy
  2. @JonTheNiceGuy

    Corrections to the talk templates

    JonTheNiceGuy authored
    There was a typo in the Smarty Template, and an issue in the terminology
    around presenters.
  3. @JonTheNiceGuy

    Merge pull request #174 from JonTheNiceGuy/SmartyTemplateError

    JonTheNiceGuy authored
    Corrections to the talk templates
Commits on Jul 28, 2013
  1. @JonTheNiceGuy

    Corrections to the talk templates

    JonTheNiceGuy authored
    There was a typo in the Smarty Template, and an issue in the terminology
    around presenters.
  2. @JonTheNiceGuy

    This change implements features which should close #132.

    JonTheNiceGuy authored
    This implements a new Object type - "ChangeLog", which stores the
    diff(ish) of each change, the actor who performed said change, and on
    which table this occurred.
    
    This Object type is instantiated by the Generic_Object function
    writeChangeLog() that bundles up the required fields, and creates the
    object. This object is then overloaded by the SecureConfig and UserAuth
    objects to prevent leakage of private data. This is also overloaded by
    the ChangeLog object to prevent it from writing its own data over and
    over again!
    
    To call the Generic_Object function, there is a new Plugin called,
    again, ChangeLog which triggers on the Create, Update and Delete
    actions, after the entry has been written.
Commits on Jul 15, 2013
  1. @JonTheNiceGuy

    Merge pull request #170 from JonTheNiceGuy/Issue120

    JonTheNiceGuy authored
    Adds double booking flag to close issue #120.
Commits on Jul 14, 2013
  1. @JonTheNiceGuy
  2. @JonTheNiceGuy

    This closes #116

    JonTheNiceGuy authored
    * Add new placeholder entries on TextArea, TextBox and Multi-element
    TextBoxes.
    * Add placeholder fields in Object_Talk and Object_User templates and
    classes.
    * Amends Generic_Object class to include placeholder texts
  3. @JonTheNiceGuy
Commits on Jul 13, 2013
  1. @JonTheNiceGuy

    Adds double booking flag to close issue #120.

    JonTheNiceGuy authored
    * Added new "hasOverlap" boolean to Talk objects
    * Adds new grey triangle flag to MainScreen, and a more complete flag on
    the Object_Talk and Timetable screens (visible only to workers and
    admins on the last two screens). Object_Talk includes a hyperlink to get
    you to at least one of the conflicted talks (aside from this one,
    assuming multiple conflicts!)
  2. @JonTheNiceGuy

    Merge pull request #168 from NotBobTheBuilder/issue167

    JonTheNiceGuy authored
    Fixes #167; upgrades JQM 1.1.1 -> 1.3.1
  3. @NotBobTheBuilder
Commits on Jul 12, 2013
  1. @JonTheNiceGuy

    Update init.pp - typo

    JonTheNiceGuy authored
  2. @JonTheNiceGuy

    This closes #116

    JonTheNiceGuy authored
    * Add new placeholder entries on TextArea, TextBox and Multi-element
    TextBoxes.
    * Add placeholder fields in Object_Talk and Object_User templates and
    classes.
    * Amends Generic_Object class to include placeholder texts
  3. @JonTheNiceGuy

    Merge pull request #1 from CampFireManager/master

    JonTheNiceGuy authored
    Bring local fork into line with Origin:master
  4. @JonTheNiceGuy

    Merge pull request #165 from JonTheNiceGuy/Issue163

    JonTheNiceGuy authored
    Create Vagrantfile, Puppet manifest to support #163
  5. @JonTheNiceGuy

    Various fixes to the Vagrant configuration

    JonTheNiceGuy authored
    * Commented out the "mirror://" format as it's down during test - change
    back if required.
    * Move from turning on AllowOverride to putting the rewrite in a new
    entry in /etc/apache2/conf.d
    * As a result of that, move cfm2 into it's own /var/www/ directory.
    * Add a pointer to the /var/www/cfm2 directory
  6. @JonTheNiceGuy
  7. @JonTheNiceGuy

    Fixing typo

    JonTheNiceGuy authored
Commits on Jul 11, 2013
  1. @JonTheNiceGuy

    Create Vagrantfile, Puppet manifest to support #163

    JonTheNiceGuy authored
    * Fixed loads of glitches in the Setup script. Some pretty heavy
    repositioning went on there too.
    * Created a very basic Vagrantfile
    * Created a slightly more complex manifest which spins up all the
    services.
    * Added a .gitignore entry for the Vagrant support files.
  2. @JonTheNiceGuy

    Merge pull request #162 from NotBobTheBuilder/issue158

    JonTheNiceGuy authored
    Padding removed from header once greeting is closed
  3. @NotBobTheBuilder
Commits on Jul 10, 2013
  1. @JonTheNiceGuy

    Merge pull request #161 from NotBobTheBuilder/issue158

    JonTheNiceGuy authored
    Fixes #158 - moves 'welcome back' message into header
  2. @NotBobTheBuilder
  3. @JonTheNiceGuy

    Merge pull request #160 from NotBobTheBuilder/issue159

    JonTheNiceGuy authored
    Fixed display bug in past softlocked slot messages
  4. @NotBobTheBuilder
  5. @JonTheNiceGuy

    Merge pull request #152 from NotBobTheBuilder/issue127

    JonTheNiceGuy authored
    Smarty waits 'til end of slot to render the "Empty" block
  6. @NotBobTheBuilder
  7. @NotBobTheBuilder
Commits on Jul 9, 2013
  1. @JonTheNiceGuy

    Merge pull request #153 from NotBobTheBuilder/issue149

    JonTheNiceGuy authored
    Fix slider initialisation bug
Something went wrong with that request. Please try again.