Permalink
Commits on Jun 15, 2012
  1. @dazoakley

    Merge pull request #13 from nature/custom_commit_credentials

    Add an input field to the editing screen so that a user can have their c...
    dazoakley committed Jun 15, 2012
  2. @dazoakley

    Add an input field to the editing screen so that a user can have thei…

    …r commits attributed to their github account (rather than their nature.com email address).
    dazoakley committed May 31, 2012
Commits on May 31, 2012
  1. @dazoakley

    Merge pull request #10 from nature/tidy_up

    More from "Tidy up"
    dazoakley committed May 31, 2012
  2. @dazoakley

    Merge pull request #12 from nature/commit_as_logged_in_user

    Add the currently logged in user (and email) to the commit message so th...
    dazoakley committed May 31, 2012
Commits on May 30, 2012
  1. @dazoakley

    Merge remote-tracking branch 'upstream/master' into merge_upstream

    * upstream/master: (81 commits)
      Rename is_supported to supported_useragent?.
      Fall back to old edit mode for browsers that are not officially supported by Ace.
      stay on 1.8.7 for the foreseeable future
      Add --base-path option.
      Call page.versions once.
      Add mathjax using SSL CDN.
      Remove empty line.
      Gem uninstall does not require sudo (pointed out by @michaelklishin).
      nuke the ffi gem on travis boxes
      Update README.md
      Avoid nil.
      Only use versions.
      Avoid nil.
      Merge modified #350.
      Only set parentpage if a subpage was found Fixes error if there's no header or footer
      Use org-ruby 0.6.3. Fixes #86.
      Revert "Merge pull request #350 from blmarket/pageauthor"
      Fix click.
      Remove unload on save.
      Add unload confirmation on live preview, edit, and create.
      ...
    
    Conflicts:
    	gollum.gemspec
    	lib/gollum/frontend/app.rb
    	lib/gollum/frontend/templates/layout.mustache
    dazoakley committed May 30, 2012
  2. @dazoakley

    Add the currently logged in user (and email) to the commit message so…

    … that commits are attributed correctly.
    dazoakley committed May 29, 2012
  3. @dazoakley

    Merge pull request #6 from nature/create_empty_folder

    Create Empty Folders
    dazoakley committed May 30, 2012
  4. @bootstraponline

    Merge pull request #367 from bootstraponline/browser_fallback

    Enable live preview only for supported user agents.
    bootstraponline committed May 30, 2012
  5. @bootstraponline
Commits on May 29, 2012
  1. @bootstraponline
  2. @dazoakley

    Make the 'normal' view file endpoint function using the same pattern …

    …as the rest of the app.
    dazoakley committed May 29, 2012
  3. @dazoakley

    Use the extract_name helper.

    dazoakley committed May 29, 2012
  4. @dazoakley

    Merge branch 'master' of github.com:nature/deagol

    * 'master' of github.com:nature/deagol:
      Extract out some duplication into a helper function.
    dazoakley committed May 29, 2012
  5. @dazoakley
  6. @clowder

    Merge pull request #9 from nature/tidy_up

    Extract out some duplication into a helper function.
    clowder committed May 29, 2012
  7. @dazoakley
  8. @dazoakley

    Refactor the empty directory creation to make a '.gitkeep' file rathe…

    …r than a 'delete.me' file.
    dazoakley committed May 29, 2012
  9. @dazoakley

    Add a new function to the interface to create an 'empty' folder. (rea…

    …lly there is a 'delete.me' file created in the folder, but the user doesn't see this in the interface).
    
    Extend the 'New Page' button to do both pages and folders.
    dazoakley committed May 18, 2012
  10. @dazoakley

    Merge pull request #7 from nature/ldap

    Ldap Authentication
    dazoakley committed May 29, 2012
Commits on May 28, 2012
  1. @atmos

    stay on 1.8.7 for the foreseeable future

    Settles #365 for now
    atmos committed May 28, 2012
  2. @dazoakley
Commits on May 25, 2012
  1. @dazoakley
  2. @dazoakley
  3. @dazoakley

    Merge pull request #5 from nature/create_new_file

    Create New Files
    dazoakley committed May 25, 2012
  4. @bootstraponline

    Add --base-path option.

    bootstraponline committed May 25, 2012
  5. @bootstraponline

    Call page.versions once.

    bootstraponline committed May 25, 2012
Commits on May 24, 2012
  1. @bootstraponline

    Merge pull request #354 from bootstraponline/mathjax

    Add MathJax (only for gollum, not github.com).
    bootstraponline committed May 24, 2012
  2. @bootstraponline
  3. @bootstraponline

    Remove empty line.

    bootstraponline committed May 24, 2012
  4. @bootstraponline
  5. @bootstraponline

    Merge pull request #361 from github/travis-fixes

    nuke the ffi gem on travis boxes
    bootstraponline committed May 24, 2012
  6. @atmos
  7. @dazoakley
  8. @dazoakley

    Make the changes needed to allow deagol to create files within the di…

    …rectory structure.
    
    And also it sets the format dropdown correctly on the create/edit page based on the file extension of the file.
    dazoakley committed May 17, 2012
  9. @dazoakley

    Merge pull request #4 from nature/file_browser

    Alternative File browser
    dazoakley committed May 24, 2012