Vjacheslav Trushkin ba431def5d Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components ...

* upstream/develop: (65 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10723] Stop Travis running all tests on sqlite
  [ticket/10703] Added a condition to check if ext directory exists
  [task/travis] Refactor php version check for dbunit install
  [task/travis] Exclude functional and slow tests
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [ticket/10684] Adjust function and parameter name, minor changes.
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  ...

Conflicts:
	phpBB/install/database_update.php

2012-03-29 22:38:07 +03:00

..

add_permissions.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

adjust_avatars.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

adjust_bbcodes.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

adjust_magic_urls.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

adjust_sizes.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

adjust_smilies.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

adjust_uids.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

adjust_usernames.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

benchmark.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

calc_email_hash.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

change_smiley_ref.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

check_flash_bbcodes.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

collect_cache_stats.sh

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

compile_template.php

[ticket/10500] Fix phpbb_template_compile instantiation.

2011-12-03 21:15:29 -05:00

create_schema_files.php

Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components

2012-03-29 22:38:07 +03:00

create_search_index.php

Merge branch 'develop-olympus' into develop

2012-03-19 12:55:37 +01:00

create_variable_overview.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

extensions.php

[ticket/10703] Added a condition to check if ext directory exists

2012-03-23 00:27:29 +05:30

fill.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

fix_files.sh

exclude the image file with text in the name from having newlines fixed

2010-03-05 22:22:39 +01:00

generate_utf_casefold.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

generate_utf_confusables.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

generate_utf_tables.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

imageset_to_css.php

Merge remote-tracking branch 'cyberalien/ticket/10378' into develop

2012-02-17 14:08:03 +01:00

lang_duplicates.php

[ticket/9916] Updating header license and removing Version $Id$

2012-01-02 19:10:27 +01:00

merge_attachment_tables.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

merge_post_tables.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

mysql_upgrader.php

[feature/merging-style-components] Updating database and acp modules

2012-03-14 23:18:18 +02:00

nuke-db.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

regex.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

remove-php-end-tags.py

[ticket/9916] Updating header license and removing Version $Id$

2012-01-02 19:10:27 +01:00

repair_bots.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

search_fill.php

[ticket/10637] Leftovers from implementation of extensions in develop tools

2012-02-09 22:22:32 +02:00

set_permissions.sh

[task/set-permissions] shell script to set file permissions

2010-06-28 18:12:56 +02:00

unicode_testing.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

update_email_hash.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

utf_normalizer_test.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00