phpbb/phpBB/language/en
Nathan Guse a194e6ce7a Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832
# By Nathan Guse (22) and others
# Via Nathan Guse (10) and others
* 'develop' of github.com:phpbb/phpbb3: (39 commits)
  [ticket/11843] Added newlines and included numbers in the DEFINE vars test
  [ticket/11843] Add checking DEFINE variables with underscores to template_test
  [ticket/11843] The twig lexer fixes DEFINE variables with underscores again
  [ticket/11727] Fix indentation
  [ticket/11727] Fix indentation
  [ticket/11745] Correct language, coding guidelines
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
  [ticket/11833] Fix bad template loop
  [ticket/11816] !$DOESNT_EXIST test
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [ticket/11816] Test !$DEFINITION
  [ticket/11822] Use namespace lookup order for asset loading
  [ticket/11727] Template loader support for safe directories to load files from
  [ticket/11816] Fix define/loop checks in IF statements containing parenthesis
  [ticket/11373] Use inheritdoc
  [ticket/11637] generate_text_for_display on search.php
  [ticket/11744] Cast to int
  [ticket/11744] Inheritdoc
  ...
2013-09-13 09:15:23 -05:00
..
acp Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832 2013-09-13 09:15:23 -05:00
email Merge pull request #1620 from EXreaction/ticket/11745 2013-09-12 21:25:00 -07: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 pull request #1620 from EXreaction/ticket/11745 2013-09-12 21:25:00 -07: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 pull request #1617 from EXreaction/ticket/11744 2013-09-12 21:24:11 -07: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