makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
Vjacheslav Trushkin 583da4274f Merge branch 'develop' into feature/prosilver-cleanup/duplicate-colors 
* develop: (117 commits)
  [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
  [task/travis] Adding Travis Continuous Intergration Support
  [ticket/10704] minor typo in a comment
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
  [ticket/10691] Fixed the speed of creating search index
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
  [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
  [ticket/10689] Fix "First character"-option in "Find a member"-search
  ...

Conflicts:
	phpBB/styles/prosilver/theme/cp.css
2012-03-24 11:45:53 +02:00
..
adm [ticket/10645] Missing CSS for checkboxes 2012-02-13 12:28:01 +02:00
assets/javascript [ticket/10155] Update to jQuery 1.6.2 2011-07-12 10:24:20 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop Merge branch 'develop-olympus' into develop 2012-03-19 12:55:37 +01:00
docs Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
download [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
files [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
images [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
includes Merge branch 'develop-olympus' into develop 2012-03-22 18:15:10 +01:00
install [ticket/10637] Leftovers from implementation of extensions in convertor 2012-02-09 22:24:46 +02:00
language [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue 2012-03-14 22:22:22 +01:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge branch 'develop' into feature/prosilver-cleanup/duplicate-colors 2012-03-24 11:45:53 +02:00
.htaccess [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http 2010-01-19 19:08:51 +00:00
common.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
cron.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
faq.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
feed.php [ticket/10672] Fix total post count language string in statistics and feed 2012-02-27 19:13:31 +01:00
index.php [ticket/10672] Fix total post count language string in statistics and feed 2012-02-27 19:13:31 +01:00
mcp.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
memberlist.php Merge branch 'develop-olympus' into develop 2012-03-16 06:06:56 -04:00
posting.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
report.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
search.php Merge branch 'develop-olympus' into develop 2012-02-26 15:47:16 +01:00
ucp.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewforum.php Merge branch 'develop-olympus' into develop 2012-02-11 05:48:03 -05:00
viewonline.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewtopic.php Merge branch 'develop-olympus' into develop 2012-02-11 05:48:03 -05:00
web.config [ticket/10219] Remove invalid and invisible character from web.config. 2011-06-14 23:18:33 +02:00