Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: thoth/bootstrap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.4
Choose a base ref
...
head repository: UpgradeAndroid/bootstrap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.4
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 9 commits
  • 17 files changed
  • 2 contributors

Commits on May 31, 2012

  1. renamed folders to match convention

    @interlock
    interlock committed May 31, 2012
    Configuration menu
    Copy the full SHA
    4d7dc39 View commit details
    Browse the repository at this point in the history

  2. Twitter Bootstrap update to 2.0.3

    @interlock
    interlock committed May 31, 2012
    Configuration menu
    Copy the full SHA
    2c80d6b View commit details
    Browse the repository at this point in the history

  3. added some Bootstrap helpers

    @interlock
    interlock committed May 31, 2012
    Configuration menu
    Copy the full SHA
    5a5175e View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2013

  1. header.ctp: fix logo link to use webroot 

    It was pointing to /, which may be incorrect depending on the
server configuration (e.g. an instance running on example.com/croogo/
or so).
    @Ithamar
    Ithamar committed Nov 28, 2013
    Configuration menu
    Copy the full SHA
    07fc1c2 View commit details
    Browse the repository at this point in the history

  2. header.ctp: fix search in header 

    This however breaks search in the sidebar, so it is currently one
or the other. Need to check how to fix it properly I guess.
    @Ithamar
    Ithamar committed Nov 28, 2013
    Configuration menu
    Copy the full SHA
    849e6b4 View commit details
    Browse the repository at this point in the history

  3. default.ctp: cleanup head tag 

    * Simplify the title tag generation
* Add feed() call for RSS feed link for promoted content
    @Ithamar
    Ithamar committed Nov 28, 2013
    Configuration menu
    Copy the full SHA
    ae42648 View commit details
    Browse the repository at this point in the history

  4. default.ctp: use webroot for hero-unit check too 

    It was still checking for '/', fix that.
    @Ithamar
    Ithamar committed Nov 28, 2013
    Configuration menu
    Copy the full SHA
    0e3123b View commit details
    Browse the repository at this point in the history

  5. default.ctp: extract homepage layout to home.ctp 

    Now the main page layout is a seperate element, as it is required
to be edited to be really useful.
    @Ithamar
    Ithamar committed Nov 28, 2013
    Configuration menu
    Copy the full SHA
    7bd00de View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2013

  1. CustomHelper: fix nested links code. 

    call to nestedLinks was referencing variables not defined.
    @Ithamar
    Ithamar committed Dec 17, 2013
    Configuration menu
    Copy the full SHA
    602fd22 View commit details
    Browse the repository at this point in the history
Loading