Permalink
Switch branches/tags
Commits on May 30, 2015
  1. Merge branch '3.1.x'

    naderman committed May 30, 2015
    * 3.1.x:
      [ticket/13790] Update phpcs
    
    Conflicts:
    	phpBB/composer.json
    	phpBB/composer.lock
  2. Merge pull request #3560 from Nicofuma/ticket/13790

    naderman committed May 30, 2015
    [ticket/13790] Update phpcs
Commits on May 29, 2015
  1. Merge branch '3.1.x'

    bantu committed May 29, 2015
    * 3.1.x:
      [ticket/13875] Ignore cache, ext, and store folder in lint test
  2. Merge branch '3.0.x' into 3.1.x

    bantu committed May 29, 2015
    * 3.0.x:
      [ticket/13875] Ignore cache, ext, and store folder in lint test
    
    Conflicts:
    	tests/lint_test.php
  3. Merge pull request #3639 from marc1706/ticket/13875

    bantu committed May 29, 2015
    [ticket/13875] Ignore cache, ext, and store folder in lint test
    
    * marc1706/ticket/13875:
      [ticket/13875] Ignore cache, ext, and store folder in lint test
  4. Merge pull request #3660 from Nicofuma/ticket/13890

    Elsensee committed May 29, 2015
    [ticket/13890] Fix di tests
  5. Merge pull request #3561 from s9e/ticket/10922

    Nicofuma committed May 29, 2015
    [ticket/10922] Added support for body and subject in email BBCode
  6. Merge pull request #3383 from nickvergessen/ticket/9109

    Nicofuma committed May 29, 2015
    Ticket/9109 Properly document and calculate the group settings with value 0
  7. Merge pull request #3613 from nickvergessen/ticket/13844

    Nicofuma committed May 29, 2015
    Ticket/13844 Better FAQ language files
  8. Merge pull request #3616 from s9e/ticket/13847

    Nicofuma committed May 29, 2015
    [ticket/13847] Move quote generation to text_formatter.utils
  9. [ticket/13890] Fix di tests

    Nicofuma committed May 29, 2015
    PHPBB3-13890
  10. Merge pull request #3622 from s9e/ticket/13860

    Nicofuma committed May 29, 2015
    [ticket/13860] Fixed array-to-string conversion
  11. Merge pull request #3625 from s9e/ticket/11742

    Nicofuma committed May 29, 2015
    [ticket/11742] Remove tabs-to-space conversion in [code]
  12. Merge pull request #3648 from marc1706/ticket/13872

    nickvergessen committed May 29, 2015
    [ticket/13872] Remove subsilver2 from md exporter test
  13. Merge pull request #3554 from Nicofuma/ticket/13770

    naderman committed May 29, 2015
    [ticket/13770] Wither interface for container_builder
Commits on May 28, 2015
  1. Merge branch '3.1.x'

    marc1706 committed May 28, 2015
  2. Merge pull request #3640 from callumacrae/ticket/13876

    marc1706 committed May 28, 2015
    [ticket/13876] Use webfontloader asyncronously.
  3. Merge branch '3.1.x'

    marc1706 committed May 28, 2015
  4. Merge pull request #3634 from prototech/ticket/13858

    marc1706 committed May 28, 2015
    [ticket/13858] Make Plupload uploader available in the global namespace.
  5. [ticket/13876] set webfont async to true

    callumacrae committed May 28, 2015
    PHPBB3-13876
  6. [ticket/13872] Remove subsilver2 from md exporter test

    marc1706 committed May 28, 2015
    PHPBB3-13872
  7. Merge branch '3.1.x'

    prototech committed May 28, 2015
    * 3.1.x:
      [ticket/13878] Display background images when printing topic in webkit
  8. Merge remote-tracking branch 'marc1706/ticket/13878' into 3.1.x

    prototech committed May 28, 2015
    * marc1706/ticket/13878:
      [ticket/13878] Display background images when printing topic in webkit
  9. [ticket/13876] Use webfontloader asyncronously.

    callumacrae committed May 28, 2015
    This PR adds typekit and Google's webfontloader and calls it
    asyncronously, removing the SPOF in the header. Now, if google
    goes down, some buttons display with a different font.
    
    https://github.com/typekit/webfontloader
    
    PHPBB3-13876
  10. Merge branch '3.1.x'

    marc1706 committed May 28, 2015
  11. Merge pull request #3637 from callumacrae/ticket/13873

    marc1706 committed May 28, 2015
    [ticket/13873] Removed broken print stylesheet.
  12. Merge branch '3.1.x'

    marc1706 committed May 28, 2015
  13. Merge pull request #3633 from nickvergessen/ticket/13872

    marc1706 committed May 28, 2015
    [ticket/13872] Allow template events to have a changed version
  14. Merge branch '3.1.x'

    prototech committed May 28, 2015
    * 3.1.x:
      [ticket/12542] Use more specific CSS for drag-n-drop
      [ticket/12542] Do not use browser specific css for outline
      [ticket/12542] Properly check if textarea is undefined or null
      [ticket/12542] Use extended CSS for all browsers
      [ticket/12542] Rename javascript method and add doc block
      [ticket/12542] Add different outline colors for body & textarea
      [ticket/12542] Add initial drag-n-drop animation
  15. Merge remote-tracking branch 'marc1706/ticket/12542' into 3.1.x

    prototech committed May 28, 2015
    * marc1706/ticket/12542:
      [ticket/12542] Use more specific CSS for drag-n-drop
      [ticket/12542] Do not use browser specific css for outline
      [ticket/12542] Properly check if textarea is undefined or null
      [ticket/12542] Use extended CSS for all browsers
      [ticket/12542] Rename javascript method and add doc block
      [ticket/12542] Add different outline colors for body & textarea
      [ticket/12542] Add initial drag-n-drop animation
  16. Merge branch '3.1.x'

    nickvergessen committed May 28, 2015
    * 3.1.x:
      [ticket/13672] Removed bogus sting concatenation
      [ticket/13672] BUMP version to 3.1.5-dev
      [ticket/13672] Allow changing the data from the user-submitted report
  17. Merge pull request #3469 from brunoais/ticket/13672

    nickvergessen committed May 28, 2015
    [ticket/13672] Allow changing the data from the user-submitted report
    
    * brunoais/ticket/13672:
      [ticket/13672] Removed bogus sting concatenation
      [ticket/13672] BUMP version to 3.1.5-dev
      [ticket/13672] Allow changing the data from the user-submitted report
  18. Merge branch '3.1.x'

    nickvergessen committed May 28, 2015
    * 3.1.x:
      [ticket/13668] Removed bogus sting concatenation
      [ticket/13668] BUMP version to 3.1.5-dev
      [ticket/13668] Allow changing the query to obtain the user-submitted report.
      [ticket/13668] Convert the mcp report_details query to a built query
    
    Conflicts:
    	phpBB/includes/mcp/mcp_reports.php