mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
20,130 Commits 17 Branches 190 Tags
Commit Graph

1370 Commits

Author SHA1 Message Date
Gaëtan Muller
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable 
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
 2013-05-06 21:31:16 +02:00
Andreas Fischer
1dea12d607 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11517] Fix list numbering
 2013-05-02 23:13:27 +02:00
hjpotter92
6d4a75b3cb [ticket/11517] Fix list numbering 
PHPBB3-11517
 2013-05-02 06:29:32 +05:30
Nils Adermann
8ae2ea68a6 Merge pull request #1311 from VSEphpbb/ticket/11461 
[ticket/11461] - Template Event added to bottom of view topic pages
 2013-03-31 14:57:51 -07:00
Matt Friedman
3089f5d0bb [ticket/11461] cut doc entry to 79 cols 
PHPBB3-11461
 2013-03-19 13:32:48 -07:00
Matt Friedman
578ed03b7e [ticket/11461] Further clarify doc for viewtopic_body_footer_before 
PHPBB3-11461
 2013-03-19 13:32:48 -07:00
Matt Friedman
c9da6c5952 [ticket/11461] Add viewtopic_body_footer_before to the event docs 
PHPBB3-11461
 2013-03-19 13:32:42 -07:00
Joas Schilling
c50af28077 [ticket/11438] Add spaces after # comment start and before \ line breaks 
PHPBB3-11438
 2013-03-16 01:18:15 +01:00
Joas Schilling
ef63c2db8b [ticket/11438] Add empty sql_query_pre to delta-source 
PHPBB3-11438
 2013-03-15 08:19:50 +01:00
Joas Schilling
8fe776dff7 [ticket/11438] Move backslash to concatenate the query strings correctly 
Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88

PHPBB3-11438
 2013-03-15 08:16:37 +01:00
Joas Schilling
dc7afd05eb [ticket/11438] Update sphinx.sample.conf to one provided by config_generate() 
PHPBB3-11438
 2013-03-15 08:06:45 +01:00
Joas Schilling
d41cf293e1 [ticket/9657] Check for post visibility when searching with Sphinx 
This update will require admins to manually update their Sphinx config
file aswell as to delete the index and rebuild it from scratch. Before
this is done the search will not be usable anymore.

PHPBB3-9657
 2013-03-14 12:10:07 +01:00
Nils Adermann
0fdbdd01fb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
 2013-02-24 17:37:38 +01:00
Andreas Fischer
c69b1c2ef2 [ticket/11122] Move rxu to 'Former Contributors' section. 
PHPBB3-11122
 2013-02-24 12:43:31 +01:00
Andreas Fischer
c4f8c64a23 [ticket/11122] Add EXreaction to docs/AUTHORS. 
PHPBB3-11122
 2013-02-24 12:37:02 +01:00
Andreas Fischer
7f0fa6477f Merge remote-tracking branch 'p/ticket/11248' into develop 
* p/ticket/11248:
  [ticket/11248] Convert line endings to LF - develop edition.
 2012-12-22 23:25:54 +01:00
David King
a89ed49cbf [ticket/11287] Add template event naming to docs/coding-guidelines.html 
PHPBB3-11287
 2012-12-20 16:40:53 -05:00
David King
00c61f9060 [feature/events] Fix improperly named event in documentation 
PHPBB3-9550
 2012-12-20 15:03:45 -05:00
David King
c7618ff669 [feature/events] Fix alphabetization of events 
PHPBB3-9550
 2012-12-20 14:46:00 -05:00
David King
3504e761a3 [feature/events] Put events in alphabetical order 
PHPBB3-9550
 2012-12-20 14:41:55 -05:00
David King
7fa3405cd1 [feature/events] Make EVENTS.md lowercase 
PHPBB3-9550
 2012-12-20 14:39:07 -05:00
David King
a740ae9c22 [feature/events] Use ` to escape HTML tags in markdown 
PHPBB3-9550
 2012-12-17 19:44:30 -05:00
David King
736b8e4456 [feature/events] Remove HTML tags from markdown so they don't get parsed 
PHPBB3-9550
 2012-12-17 19:16:10 -05:00
David King
52cd0b8a6d [feature/events] Add markdown template event documentation file 
PHPBB3-9550
 2012-12-17 18:00:47 -05:00
Oleg Pudeyev
03d2c6413c [ticket/11248] Convert line endings to LF - develop edition. 
PHPBB3-11248
 2012-12-07 21:57:33 -05:00
Oleg Pudeyev
b67f112e03 [ticket/10091] Bump minimum supported postgresql version to 8.3. 
PHPBB3-10091
 2012-12-04 02:52:18 -05:00
Andreas Fischer
5d78346453 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11227] @return void -> @return null in develop-olympus.
 2012-11-29 23:17:58 +01:00
Oleg Pudeyev
65253a3023 [ticket/11227] @return void -> @return null in develop-olympus. 
PHPBB3-11227
 2012-11-29 15:37:12 -05:00
Oleg Pudeyev
5d0796624f [ticket/11205] Fix merge conflict in readme.html. 
PHPBB3-11205
 2012-11-15 17:45:00 -05:00
Oleg Pudeyev
7987e0e681 Merge PR #1052 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
  [ticket/10865] Phrase change for visiting with browser
  [ticket/10865] Grammar corrections for the entire document
  [ticket/10865] Typo and phrasing change
  [ticket/10865] Updates and additions to /docs/INSTALL.html

Conflicts:
	phpBB/docs/INSTALL.html
 2012-11-09 20:20:37 -05:00
Oleg Pudeyev
3ebabc8da2 Merge PR #1052 branch 'p/ticket/10865' into develop-olympus 
* p/ticket/10865:
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
  [ticket/10865] Phrase change for visiting with browser
  [ticket/10865] Grammar corrections for the entire document
  [ticket/10865] Typo and phrasing change
  [ticket/10865] Updates and additions to /docs/INSTALL.html
 2012-11-09 20:14:52 -05:00
Oleg Pudeyev
7c4318c033 [ticket/10865] Use code tags for install/database_update.php. 
PHPBB3-10865
 2012-11-09 20:13:06 -05:00
Oleg Pudeyev
6e6cc28b76 [ticket/10865] Should have been a slash. 
PHPBB3-10865
 2012-11-09 20:10:43 -05:00
Igor Wiedler
7d7dc98b10 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) 
PHPBB3-11181
 2012-11-09 23:16:42 +01:00
Andreas Fischer
0daab4e0ef Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
 2012-09-29 00:26:43 +02:00
Joas Schilling
f7a6169184 [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors 
PHPBB3-11122
 2012-09-27 13:22:43 +02:00
Patrick Webster
72eef2af5c [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files 
PHPBB3-10865
 2012-08-03 20:27:35 -05:00
Oleg Pudeyev
7fd1a166da Merge PR #865 branch 'dhruvgoel92/feature/sphinx-fulltext-search' into develop 
* dhruvgoel92/feature/sphinx-fulltext-search: (57 commits)
  [feature/sphinx-fulltext-search] add sphinx to Authors file
  [feature/sphinx-fulltext-search] add sphinxapi.php file
  [feature/sphinx-fulltext-search] fix auth bug
  [feature/sphinx-fulltext-search] remove unused property
  [feature/sphinx-fulltext-search] use 9312 as default port
  [feature/sphinx-fulltext-search] fix language of host config
  [feature/sphinx-fulltext-search] fix sphinx for arbitary host
  [feature/sphinx-fulltext-search] coding changes acc to phbb conventions
  [feature/sphinx-fulltext-search] fixing comments
  [feature/sphinx-fulltext-search] add trailing slash in language
  [feature/sphinx-fulltext-search] improve port option
  [feature/sphinx-fulltext-search] remove stopwords and config path
  [feature/sphinx-fulltext-search] makes sql host configurable
  [feature/sphinx-fulltext-search] use readonly instead of disabled
  [feature/sphinx-fulltext-search] fix language keys' typo
  [feature/sphinx-fulltext-search] remove note from db_tools
  [feature/sphinx-fulltext-search] add support for postgres
  [feature/sphinx-fulltext-search] add pgsql functionality
  [feature/sphinx-fulltext-search] use Update in sphinx query
  [feature/sphinx-fulltext-search] use CASE instead of IF
  ...
 2012-07-27 22:27:26 -04:00
Dhruv
f1729281e6 [feature/sphinx-fulltext-search] add sphinx to Authors file 
PHPBB3-10946
 2012-07-27 11:28:14 +05:30
Andreas Fischer
efbc02acf3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

Conflicts:
	phpBB/install/database_update.php
 2012-07-23 23:57:08 +02:00
Andreas Fischer
ece4a2edb7 [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. 2012-07-23 23:41:58 +02:00
Dhruv
39bac86f7d [feature/sphinx-fulltext-search] improve port option 
Use listen instead of deprecated port value in sphinx config file.
sqlhost uses default $dbhost.

PHPBB3-10946
 2012-07-22 04:24:34 +05:30
Dhruv
161e469b5a [feature/sphinx-fulltext-search] makes sql host configurable 
The SQL server host which sphinx connects to index the posts is now
configurable via ACP.

PHPBB3-10946
 2012-07-22 02:50:53 +05:30
Dhruv
81959927e5 [feature/sphinx-fulltext-search] use Update in sphinx query 
Instead of REPLACE use UPDATE since pgsql does not support REPLACE.
A row is inserted at time of creating table so REPLACE is no longer
needed.

PHPBB3-10946
 2012-07-19 23:01:49 +05:30
Dhruv
b81941a997 [feature/sphinx-fulltext-search] use CASE instead of IF 
IF is not supported in pgsql, use CASE instead supported in both mysql
and pgsql.

PHPBB3-10946
 2012-07-19 23:01:48 +05:30
Dhruv
118b57f71d [feature/sphinx-fulltext-search] minor changes in sphinx.conf 
PHPBB3-10946
 2012-07-19 23:01:47 +05:30
Dhruv
172c583f19 [feature/sphinx-fulltext-search] use new unique id instead of salt 
a new unique id is generated by sphinx and stored in the config table
instead of using avatar_salt.

PHPBB3-10946
 2012-07-19 23:01:42 +05:30
Nils Adermann
5095b6abd2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html

Conflicts:
	phpBB/docs/README.html
 2012-07-19 17:57:16 +02:00
Dhruv Goel
10b706674e [feature/sphinx-fulltext-search] add binlog_path to config 
binlog files are now added to the data folder.

PHPBB3-10946
 2012-07-12 17:31:58 +05:30
Dhruv Goel
a3b2caf841 [feature/sphinx-fulltext-search] include sample sphinx.conf in docs 
PHPBB3-10946
 2012-07-12 17:27:26 +05:30