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/language/en
History
Nathan Guse e8ab8fe0bc Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 
# By Joas Schilling (613) and others
# Via Andreas Fischer (214) and others
* 'develop' of github.com:phpbb/phpbb3: (2494 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...

Conflicts:
	phpBB/includes/functions_privmsgs.php
2013-09-05 13:56:57 -05:00
..
acp [ticket/11734] Readd accidently removed language strings of forum permissions 2013-07-23 16:26:01 +02:00
email Merge branch 'develop-olympus' into develop 2013-09-02 12:31:27 +02:00
mods [feature/sphinx-fulltext-search] integrate sphinx language keys with core 2012-07-12 17:31:49 +05:30
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/9975] Moved a few E_USER_ERROR errors to /language 2013-04-23 09:55:36 -07:00
common.php Merge remote-tracking branch 'phpbb/develop' into ticket/9657 2013-07-13 09:36:24 -04: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 Merge branch 'develop-olympus' into develop 2013-07-25 14:08:06 +02:00
index.htm ISO 2002-10-04 12:40:07 +00:00
install.php [ticket/11574] Remove install/udpate/new/ fallback from database_update.php 2013-07-30 01:38:06 +02:00
iso.txt #10549 2007-05-13 22:20:30 +00:00
mcp.php [ticket/9657] Fix english language :( 2013-07-11 22:46:34 -04:00
memberlist.php [ticket/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +01:00
migrator.php [ticket/11662] Typos: occured -> occurred 2013-07-12 17:51:29 +02:00
posting.php [ticket/9657] Fix english language :( 2013-07-11 22:46:34 -04: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:phpbb/phpbb3 into ticket/8323 2013-09-05 13:56:57 -05:00
viewforum.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewtopic.php [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI) 2012-11-03 23:37:35 +01:00