phpbb/phpBB/language/en
Nathan Guse d64eb0e575 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Oleg Pudeyev (21) and others
# Via Andreas Fischer (7) and others
* 'develop' of github.com:phpbb/phpbb3: (56 commits)
  [ticket/11015] Move comment in the right place.
  [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31
  [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.
  [ticket/11015] Change permission adding in database updater to new style.
  [ticket/11015] Change more docblocks to phpbb_db_driver.
  [ticket/11015] Installer still needs 3.0-style dbms name.
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11015] Include functions.php because it is not always included.
  [ticket/11265] Add assertions for board installation success.
  [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
  [ticket/11015] Convert database drivers to new spelling in post setup sync.
  [ticket/11015] Convert connect test to the new syntax.
  [ticket/11015] Restore whitespace to avoid conflict when merging develop.
  [ticket/10975] Add a test for viewing a profile.
  [ticket/10975] Test restricting by first character.
  [ticket/10975] Avoid rewriting global config twice.
  [ticket/10975] Test memberlist, not user creation.
  [ticket/10975] Some quick tests to check the memberlist behaviour
  [ticket/10491] Make recreate_database static.
  [ticket/11088] Pass required objects in as arguments
  ...

Conflicts:
	phpBB/install/database_update.php
2012-12-13 19:21:29 -06:00
..
acp Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103 2012-12-13 19:21:29 -06:00
email [ticket/11103] Newlines at end of files 2012-12-08 13:20:14 -06:00
mods Copy 3.0.x branch to trunk 2009-10-04 18:14:59 +00:00
app.php [feature/controller] Remove unused language strings 2012-11-18 15:51:32 -05:00
captcha_qa.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
captcha_recaptcha.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
common.php Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-12-12 16:30:50 -06:00
groups.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
help_bbcode.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
help_faq.php [ticket/10771] changed value in help_faq.php 2012-12-02 14:51:28 +05:30
index.htm ISO 2002-10-04 12:40:07 +00:00
install.php [ticket/10091] Bump minimum supported postgresql version to 8.3. 2012-12-04 02:52:18 -05:00
iso.txt #10549 2007-05-13 22:20:30 +00:00
mcp.php [ticket/10797] language key rank moved to common 2012-04-20 04:30:42 +05:30
memberlist.php Merge PR #753 branch 'Senky/ticket/10161' into develop 2012-04-26 22:57:30 -04:00
posting.php Merge branch 'develop-olympus' into develop 2012-03-31 19:29:56 +02:00
search.php [ticket/11032] fix language of error displayed 2012-08-15 22:57:02 +05:30
search_ignore_words.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
search_synonyms.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp.php Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-12-07 21:14:39 -06:00
viewforum.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewtopic.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00