Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: develop-ascrae…

Apr 10, 2014

  1. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12370' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12370:
      [ticket/12370] Add unit tests for topic notifications
      [ticket/12370] Fix functional notification test and remove unneeded requests
      [ticket/12370] Do not delete topic notifications when the topic is visible
    authored April 10, 2014
  2. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12367' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12367:
      [ticket/12367] Change phpbb_wrapper_gmgetdate_test to use data providers
    authored April 10, 2014
  3. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12113:
      [ticket/12113] Fix view_log() tests
      [ticket/12113] Correctly use plurals when deleting user warnings
      [ticket/12113] Allow log entries to use plurals
    authored April 10, 2014
  4. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12373' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12373:
      [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
    authored April 10, 2014
  5. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12348' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12348:
      [ticket/12348] Allow to run create_schema_files when phpBB is not installed
    authored April 10, 2014
  6. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12331' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12331:
      [ticket/12331] Add functional test for saving custom profile fields
      [ticket/12331] Fix SQL error when inserting a new entry to profile field data
    authored April 10, 2014
  7. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12286' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12286:
      [ticket/12286] Reword section about plurals
      [ticket/12286] Fix spelling of elephant(s) in the sample
      [ticket/12286] Correctly capitalize PHP
      [ticket/12286] Fix nesting of ul inside li element
      [ticket/12286] Add note that goto should not be used
      [ticket/12286] Add section about plurals to the coding guidelines
      [ticket/12286] Classes must use the name space
      [ticket/12286] Remove section about utf8_normalize_nfc()
      [ticket/12286] Use $request->variable() instead of request_var()
      [ticket/12286] Function names should be prefixed with phpbb_
      [ticket/12286] Add "Since" to template event docs
      [ticket/12286] style.php and imagesets dont exist anymore
      [ticket/12286] Styles have a phpbb_version and a style_version in 3.1
      [ticket/12286] Use UTF8 (c) in style.cfg samples
    authored April 10, 2014
  8. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12282:
      [ticket/12282] Update new references
      [ticket/12282] Update container db mock
      [ticket/12282] Add new line at EOF of the interface
      [ticket/12282] Use interface for type hinting
      [ticket/12282] Use {@inheritDoc} for inherited methods
      [ticket/12282] Add Interface for DBAL drivers
    authored April 10, 2014
  9. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/11352:
      [ticket/11352] Add functional tests for disapproving a post/topic
      [ticket/11352] Redirect the user back to view*.php after disapproving
    authored April 10, 2014

Apr 07, 2014

  1. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12358' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/12358:
      [ticket/12358] Correctly check and change the redirect url for ajax requests
    authored April 07, 2014

Mar 29, 2014

  1. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/11459:
      [ticket/11459] 3.0.1-RC1 should depend on 3.0.0 migration
    authored March 29, 2014
  2. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into…

    … develop-ascraeus
    
    * github-nickvergessen/ticket/11459: (21 commits)
      [ticket/11459] Make 3.1.0-dev migration depend on migrations_table
      [ticket/11459] Move $supported_dbms to beginning of create schema file
      [ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index()
      [ticket/11459] Fix auth provider test
      [ticket/11459] Correctly set up the database from schema in unit tests
      [ticket/11459] Install DB schema from json file
      [ticket/11459] Clean up a little more
      [ticket/11459] Do not add table schema to database schema files
      [ticket/11459] Create schema.json from migration files
      [ticket/11459] Do not take files of extensions into account
      [ticket/11459] Pass array with migration class names to schema generator
      [ticket/11459] Refresh schema files
      [ticket/11459] Remove spaces from the end of lines in MSSQL
      [ticket/11459] Correctly handle index column length
      [ticket/11459] Add migration for migrations table
      [ticket/11459] Update doc blocks
      [ticket/11459] Remove old schema file
      [ticket/11459] Update schema files with new script
      [ticket/11459] Use new migration/schema_generator to create schema files
      [ticket/11459] Add Schema from 3.0.0
      ...
    authored March 29, 2014
  3. Nils Adermann

    Merge pull request #2192 from bantu/ticket/12314

    [ticket/12314] Workaround HHVM SPL autoloader sometimes using leading ba...
    authored March 28, 2014
  4. Nils Adermann

    Merge pull request #2194 from bantu/ticket/12317

    [ticket/12317] Fix notification tests for DBMS drivers using int for integers ;-)
    authored March 28, 2014

Mar 27, 2014

  1. Nils Adermann

    Merge branch 'develop-olympus' into develop-ascraeus

    * develop-olympus:
      [ticket/12310] Don't autocomplete SMTP user/pass on install
    authored March 26, 2014
  2. Nils Adermann

    Merge remote-tracking branch 'marshalrusty/ticket/12310' into develop…

    …-olympus
    
    * marshalrusty/ticket/12310:
      [ticket/12310] Don't autocomplete SMTP user/pass on install
    authored March 26, 2014

Mar 05, 2014

  1. Nils Adermann

    [develop] Fix incorrect merge conflict resolution from PR #2085

    PHPBB3-12235
    authored March 05, 2014
  2. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into…

    … develop
    
    * github-nickvergessen/ticket/12235:
      [ticket/12235] Convert WLM to custom profile field
      [ticket/12187] Do not make clickable when using as contact field
      [ticket/12187] Split generate_profile_fields_template() into 2 methods
      [ticket/12187] Remove user_website field
      [ticket/12187] Remove user_website functionality
      [ticket/12187] Convert website field data to custom profile field
      [ticket/12187] Add URL type for profile fields
      [ticket/12234] Replace ICQ with custom profile field
      [ticket/12233] Update schema file
      [ticket/12233] Add images back to subsilver2
      [ticket/12233] Allow profile fields to be contact fields
    
    Conflicts:
    	phpBB/adm/style/acp_prune_users.html
    authored March 05, 2014
  3. Nils Adermann

    Merge pull request #2057 from nickvergessen/ticket/12226

    Ticket/12226 Split language strings to correctly allow multiple plural rules
    authored March 05, 2014

Feb 27, 2014

  1. Nils Adermann

    Merge pull request #2062 from nickvergessen/ticket/12194

    [ticket/12194] Ensure that field_show_novalue is present
    authored February 27, 2014

Feb 26, 2014

  1. Nils Adermann

    Merge pull request #2060 from nickvergessen/ticket/12205-develop

    [ticket/12205-Develop] Do not display 0 for empty integers when show_novalue is off
    authored February 26, 2014

Feb 25, 2014

  1. Nils Adermann

    Merge pull request #2059 from nickvergessen/ticket/12205

    [ticket/12205] Do not display 0 for empty integers when show_novalue is off
    authored February 25, 2014

Feb 18, 2014

  1. Nils Adermann

    Merge branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
    authored February 18, 2014
  2. Nils Adermann

    Merge remote-tracking branch 'github-exreaction/ticket/12210' into de…

    …velop-olympus
    
    * github-exreaction/ticket/12210:
      [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
    authored February 18, 2014

Feb 13, 2014

  1. Nils Adermann

    Merge branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/12188] Add php 5.6 to travis enviroments
    
    Conflicts:
    	.travis.yml
    authored February 13, 2014
  2. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into…

    … develop-olympus
    
    * github-nickvergessen/ticket/12188:
      [ticket/12188] Add php 5.6 to travis enviroments
    authored February 13, 2014

Feb 11, 2014

  1. Nils Adermann

    Merge pull request #2010 from nickvergessen/ticket/12169

    Ticket/12169  Convert location user field to profile field
    authored February 11, 2014

Feb 10, 2014

  1. Nils Adermann

    Merge pull request #1988 from nickvergessen/ticket/12115

    [ticket/12115] Convert occupation profile field to custom field
    authored February 10, 2014

Feb 05, 2014

  1. Nils Adermann

    Merge pull request #1995 from EXreaction/ticket/11880

    Schema changes can take too long and cause a timeout
    authored February 05, 2014

Feb 04, 2014

  1. Nils Adermann

    [develop] Remove left over conflict marker from merge 1a31f03

    authored February 04, 2014
  2. Nils Adermann

    Merge branch 'develop-olympus' into develop

    * develop-olympus:
      [ticket/12162] Set language to C before running diff to ensure its english
      [ticket/11509] Be exact when referencing the branch name.
      [ticket/12161] Do not use subdirectories in build/save directory.
      [ticket/11509] Run commit message checker only in one environment.
      [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.
    
    Conflicts:
    	.travis.yml
    authored February 04, 2014
  3. Nils Adermann

    Merge remote-tracking branch 'github-nickvergessen/ticket/12162' into…

    … develop-olympus
    
    * github-nickvergessen/ticket/12162:
      [ticket/12162] Set language to C before running diff to ensure its english
    authored February 04, 2014
  4. Nils Adermann

    Merge pull request #2001 from bantu/ticket/12161

    [ticket/12161] Do not use subdirectories in build/save directory.
    authored February 04, 2014
  5. Nils Adermann

    Merge pull request #1999 from bantu/ticket/11509

    [ticket/11509] Further improvements/fixes for the Travis CI commit message checker
    authored February 04, 2014
  6. Nils Adermann

    Merge pull request #1998 from bantu/ticket/12141

    [ticket/12141] Disable opcache extension on PHP 5.5.7
    authored February 04, 2014
Something went wrong with that request. Please try again.