phpbb/phpBB/language/en
Oleg Pudeyev 3b6ca178aa Merge PR #721 branch 'rahulr92/ticket/10650' into develop
* rahulr92/ticket/10650:
  [ticket/10650] Subject is cleared if no permissions exist
  [ticket/10650] Changed apostrophe to utf8 single quote
  [ticket/10650] Moving censoring to before truncation
  [ticket/10650] Added apostrophe in explanation in language file
  [ticket/10650] Inserted correct utf ELLIPSIS character
  [ticket/10650] Added space after if and comment
  [ticket/10650] Added ellipsis to language file
  [ticket/10650] Added href title to subject link
  [ticket/10650] Made use of truncate_string() function
  [ticket/10650] Removed changes from acp_forums.php
  [ticket/10650]Removed incorrect newline
  [ticket/10650] Changed acp option from per forum to global
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list

Conflicts:
	phpBB/install/database_update.php
	phpBB/language/en/common.php
2012-05-21 23:42:48 -04:00
..
acp Merge PR #721 branch 'rahulr92/ticket/10650' into develop 2012-05-21 23:42:48 -04:00
email [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
mods - include missing files in language pack download 2006-08-11 10:09:54 +00: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 PR #721 branch 'rahulr92/ticket/10650' into develop 2012-05-21 23:42:48 -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 [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
index.htm ISO 2002-10-04 12:40:07 +00:00
install.php Merge PR #753 branch 'Senky/ticket/10161' into develop 2012-04-26 22:57:30 -04: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/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
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 PR #785 branch 'develop-olympus' into develop 2012-05-11 02:37:25 -04: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