Skip to content
Commits on Aug 17, 2012
  1. @JonTheNiceGuy

    Merge pull request #111 from JonTheNiceGuy/Issue67

    JonTheNiceGuy committed
    Missed these from the previous commit, resolving Issue #67
  2. @JonTheNiceGuy
  3. @JonTheNiceGuy

    Merge pull request #108 from JonTheNiceGuy/Issue67

    JonTheNiceGuy committed
    Resolving Issue #67: "Tidy up templates to remove errors from the log files."
  4. @JonTheNiceGuy
Commits on Aug 16, 2012
  1. @JonTheNiceGuy

    Merge pull request #107 from JonTheNiceGuy/Issue81

    JonTheNiceGuy committed
    Resolves issue #81: "On the User page, if the viewer is an admin, worker or the user in question, show the talks the user is attending. Also, show any available Auth Codes for pairing with ParseInput plugin."
  2. @JonTheNiceGuy

    Resolves issue #81: "On the User page, if the viewer is an admin, wor…

    JonTheNiceGuy committed
    …ker or the user in question, show the talks the user is attending. Also, show any available Auth Codes for pairing with ParseInput plugin."
  3. @JonTheNiceGuy

    Merge pull request #106 from JonTheNiceGuy/Issue101

    JonTheNiceGuy committed
    Resolves issue #101: "Replace MySpace OpenID with StackExchange"
  4. @JonTheNiceGuy
  5. @JonTheNiceGuy
  6. @JonTheNiceGuy

    Merge pull request #104 from JonTheNiceGuy/Issue102

    JonTheNiceGuy committed
    Resolves Issue #102: "Improve the CSS on the mainscreen"
  7. @JonTheNiceGuy

    Merge pull request #105 from JonTheNiceGuy/Issue103

    JonTheNiceGuy committed
    Resolves issue #103: "Improve the textparser responses."
  8. @JonTheNiceGuy
  9. @JonTheNiceGuy

    Resolves Issue #102: "Improve the CSS on the mainscreen"

    JonTheNiceGuy committed
    * Added borders to the timetable
    * Made limbo talks smaller
    * Identified empty slots
    * Moved warning flags to the right.
  10. @JonTheNiceGuy

    Merge pull request #100 from JonTheNiceGuy/Issue87

    JonTheNiceGuy committed
    Resolves Issue #87: "On the first page view after a login attempt, add a line showing the login status at the top of the grid."
  11. @JonTheNiceGuy
  12. @JonTheNiceGuy

    Resolves Issue #87: "On the first page view after a login attempt,

    JonTheNiceGuy committed
    add a line showing the login status at the top of the grid."
  13. @JonTheNiceGuy
  14. @JonTheNiceGuy

    Merge pull request #99 from JonTheNiceGuy/Issue36

    JonTheNiceGuy committed
    Resolving Issue #36: "Create a Collection_MainScreen class and template"
  15. @JonTheNiceGuy
  16. @JonTheNiceGuy
Commits on Aug 15, 2012
  1. @JonTheNiceGuy

    Merge pull request #98 from JonTheNiceGuy/Issue36

    JonTheNiceGuy committed
    Progression on Issue36: "Create a Collection_MainScreen class and template"
  2. @JonTheNiceGuy
  3. @JonTheNiceGuy

    Resolves issue #95: 'Limit the maximum number of slots a talk can be'

    JonTheNiceGuy committed
    * Added options to the talk db columns
    * Amended the templates for a new talk and the existing talk editor
Commits on Aug 14, 2012
  1. @JonTheNiceGuy
  2. @JonTheNiceGuy

    Merge pull request #88 from JonTheNiceGuy/Issue16

    JonTheNiceGuy committed
    Resolves Issue #16: "Integrate with Joind.in"
  3. @JonTheNiceGuy

    Merge pull request #90 from JonTheNiceGuy/Issue89

    JonTheNiceGuy committed
    Resolving Issue #89: "Default timetable view (/timetable/yyyy-mm-dd) returns all slots not just slots for that day"
  4. @JonTheNiceGuy

    Merge branch 'Issue62' of github.com:JonTheNiceGuy/cfm2

    JonTheNiceGuy committed
    Conflicts:
    	SmartyTemplates/Collection_DirectionScreen.html.tpl
  5. @JonTheNiceGuy

    Merge pull request #93 from JonTheNiceGuy/issue92

    JonTheNiceGuy committed
    Resolve Issue #92: "Need auto-refresh javascript on all collection screens"
  6. @JonTheNiceGuy

    Tweak to supplied patches to Issue #92.

    JonTheNiceGuy committed
    * Added some <baseurl>'s to the DirectionScreen and MainScreen templates.
    * Changed the calling of the setRefresh to just reflect the time to run it, as
    the URL wasn't being used.
    * Added the jQueryMobile Library to the DirectionScreen template.
  7. @NotBobTheBuilder
  8. @JonTheNiceGuy

    Slight fixes to Issue #62.

    JonTheNiceGuy committed
    * Amended paths to use the site standard
    * Updated direction arrows to only show one per direction.
    
    Requires sign-off by @heeed
  9. @JonTheNiceGuy

    Resolving Issue #89: "Default timetable view (/timetable/yyyy-mm-dd) …

    JonTheNiceGuy committed
    …returns all
    
    slots not just slots for that day"
    
    * Amend timetable template to show the date if it's not today.
    * Amend timetable collection to return all slots, or just the slots for the date
    which is specified.
    * Change default redirect to show the whole timetable, not just today.
Commits on Aug 13, 2012
  1. @JonTheNiceGuy
  2. @JonTheNiceGuy

    This allows CFM to post to Joind.in. It requires some SecureConfig va…

    JonTheNiceGuy committed
    …lues to be
    
    set, but then works. Many many thanks to Lorna Jane Mitchell for all her help
    getting this working! Even the basic code is hers!! I've just tweaked it to make
    it work with the data structures and plugin layout of CFM2.
  3. @JonTheNiceGuy
Something went wrong with that request. Please try again.