Skip to content
Commits on May 9, 2016
  1. @chillu

    Merge pull request #1484 from open-sausages/pulls/4.0/Add-page-steps-bug

    Make page steps use the same styles, consistent markup
    chillu committed May 9, 2016
Commits on May 8, 2016
  1. @chillu

    Merge pull request #1475 from candidasa/ss4-issue1473

    MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it up…
    chillu committed May 9, 2016
Commits on May 7, 2016
  1. @dhensby

    Merge pull request #1481 from frankmullenger/4917-renaming

    MINOR: Removing camel cased 'Html' references.
    dhensby committed May 7, 2016
Commits on May 6, 2016
  1. @clarkepaul
  2. @clarkepaul
  3. @frankmullenger
Commits on May 5, 2016
  1. @candidasa

    MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it up…

    …on first viewing of a new database (fixes #1473)
    candidasa committed May 6, 2016
  2. @dhensby

    Update translations

    dhensby committed May 5, 2016
  3. @dhensby
  4. @dhensby

    Update translations

    dhensby committed May 5, 2016
  5. @dhensby
  6. @dhensby

    Update translations

    dhensby committed May 5, 2016
Commits on May 2, 2016
  1. @chillu

    Merge pull request #1467 from open-sausages/pulls/4.0/menu-title-over…

    …ride
    
    API set menu title without editing transifex masters
    chillu committed May 2, 2016
  2. @tractorcow @chillu
  3. @chillu

    Merge pull request #1464 from open-sausages/pulls/4.0/cleanup-navigator

    API Changes to CMSPreviewable interface implementors
    chillu committed May 2, 2016
  4. @tractorcow
Commits on Apr 29, 2016
  1. @tractorcow

    Rebuild dist files for merge

    tractorcow committed Apr 29, 2016
  2. @tractorcow

    Merge 3 into master

    # Conflicts:
    #	code/controllers/CMSPageAddController.php
    #	code/model/ErrorPage.php
    #	composer.json
    #	css/screen.css
    #	tests/behat/features/insert-a-link.feature
    tractorcow committed Apr 29, 2016
Commits on Apr 27, 2016
  1. @tractorcow

    Merge pull request #1459 from open-sausages/pulls/4.0/add-to-campaign

    Add 'Add to campaign' button to pages
    tractorcow committed Apr 28, 2016
Commits on Apr 26, 2016
  1. @dhensby

    Merge branch '3.3' into 3

    dhensby committed Apr 26, 2016
  2. @dhensby

    Merge 3.2 into 3.3

    dhensby committed Apr 26, 2016
Commits on Apr 25, 2016
  1. @tractorcow
  2. @dhensby

    Merge 3.1 into 3.2

    Conflicts:
    	code/reports/SideReport.php
    dhensby committed Apr 26, 2016
  3. @chillu

    Merge pull request #1461 from open-sausages/pulls/4.0/OSS-1750-js-fil…

    …e-rename
    
    Adapted JS lib references to renamed paths
    chillu committed Apr 25, 2016
  4. @chillu
Commits on Apr 22, 2016
  1. @kinglozzer

    Merge pull request #1460 from open-sausages/pulls/4.0/fix-icon-styles

    Fix font-icon regression on tree view
    kinglozzer committed Apr 22, 2016
  2. @chillu

    Merge pull request #1457 from open-sausages/pulls/3/fix-dependencies

    BUG Correct framework/module dependencies for cms
    chillu committed Apr 22, 2016
Commits on Apr 21, 2016
  1. Fix font-icon regression on tree view

    David Craig committed Apr 22, 2016
  2. @scott1702 @hafriedlander
  3. @tractorcow
Commits on Apr 20, 2016
  1. @chillu

    Merge pull request #1456 from open-sausages/pulls/4.0/static-file-res…

    …tructure
    
    Adjust file paths for new static file structure in framework
    chillu committed Apr 20, 2016
  2. @chillu
Commits on Apr 18, 2016
  1. @sminnee

    Merge pull request #1455 from open-sausages/pulls/4.0/css-editorconfig

    Editorconfig for JS and CSS
    sminnee committed Apr 19, 2016
  2. @chillu

    Editorconfig for JS and CSS

    chillu committed Apr 19, 2016
Commits on Apr 14, 2016
  1. @tractorcow

    Merge pull request #1450 from open-sausages/pulls/4.0/build-tooling

    Improved build tooling
    tractorcow committed Apr 15, 2016
Something went wrong with that request. Please try again.