makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 20:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
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
..
adm Merge branch 'develop-olympus' into develop 2012-05-06 18:39:32 +02:00
assets/javascript [ticket/10784] Do not show ajax overlay unless needed 2012-04-12 21:03:47 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
docs Merge PR #725 branch 'develop-olympus' into develop 2012-05-10 15:58:55 -04:00
download [feature/event-dispatcher] Add missing dispatcher to file.php 2012-03-28 21:45:21 +02: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 PR #721 branch 'rahulr92/ticket/10650' into develop 2012-05-21 23:42:48 -04:00
install Merge PR #721 branch 'rahulr92/ticket/10650' into develop 2012-05-21 23:42:48 -04:00
language Merge PR #721 branch 'rahulr92/ticket/10650' into develop 2012-05-21 23:42:48 -04:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge PR #721 branch 'rahulr92/ticket/10650' into develop 2012-05-21 23:42:48 -04: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/10756] Renaming phpbb_style_template to phpbb_template 2012-04-19 04:25:25 +02:00
composer.json [feature/event-dispatcher] Use real EventDispatcher through composer 2012-03-11 15:15:33 +01:00
composer.lock [feature/event-dispatcher] Use real EventDispatcher through composer 2012-03-11 15:15:33 +01: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/10586] Moved some loading stuff below extension controller, updated tests 2012-03-28 16:48:16 -04: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-04-03 20:57:31 -04:00
posting.php [feature/qrpreview] Do not error or show preview if no text is entered 2012-03-31 15:52:16 -04:00
report.php [feature/save-post-on-report] Changed the name of the column 2012-03-19 08:27:32 -04: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 [ticket/10847] fixing all misspelled "dependant" to "dependent" 2012-04-30 21:55:24 +02:00
web.config [ticket/10219] Remove invalid and invisible character from web.config. 2011-06-14 23:18:33 +02:00