mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
15,109 Commits 17 Branches 190 Tags
Commit Graph

1251 Commits

Author SHA1 Message Date
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
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
Patrick Webster
5d0aa8e516 [ticket/10441] Make CDB linking more consistent 
PHPBB3-10441
 2012-07-02 21:38:27 -05:00
Patrick Webster
6203ef0c61 [ticket/10441] Typo 
PHPBB3-10441
 2012-06-29 12:10:14 -05:00
Oyabun1
c9f9e66328 [ticket/10441] Update to docs/README.html 
Updated information about styles, languages, and MODs
Added a section about the Knowledge Base.
Various phrase changes.

PHPBB3-10441
 2012-06-29 01:39:14 -05:00
Patrick Webster
2b89186294 [ticket/10865] Phrase change for visiting with browser 
PHPBB3-10865
 2012-06-28 20:29:07 -05:00
Patrick Webster
08e319198c [ticket/10865] Grammar corrections for the entire document 
Fixed more grammatical issues, changed some phrasings, added a link
for offline conversions, and other corrections.

PHPBB3-10865
 2012-06-22 23:47:13 -05:00
Andreas Fischer
69ef2f55cc Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:35 +02:00
Andreas Fischer
155c93d71a Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11 
* Noxwizard/ticket/10925:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:08 +02:00
Patrick Webster
5bc2219bbe [ticket/10865] Typo and phrasing change 
PHPBB3-10865
 2012-06-19 12:51:44 -05:00
Oyabun1
fd2ab22556 [ticket/10865] Updates and additions to /docs/INSTALL.html 
Added anti-spam section.
Changed www.mydomain.com/tld to www.example.com.
Updated update section to mention third party styles.
Reworded several sentences for clarity.
Made file name/path formatting more consistent.
Corrected update archive type availabilities.
Changed PHP version listing to be less redundant.

PHPBB3-10865
PHPBB3-10918
 2012-06-19 04:36:27 -05:00
Patrick Webster
d26606f986 [ticket/10925] Clarify installation requirements for SQLite 
PHPBB3-10925
 2012-06-19 01:20:58 -05:00
Nils Adermann
13c4db8255 Merge pull request #779 from callumacrae/ticket/10855 
[ticket/10855] Modified coding guidelines to reflect JS brace changes.
 2012-06-18 03:12:53 -07:00
Andreas Fischer
4af503e11b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
  [develop-olympus] Add changelog for 3.0.11 release.
  [develop-olympus] Bump version numbers for 3.0.11-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.11 releases.

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
 2012-05-31 23:11:27 +02:00
Andreas Fischer
19a47dfbbc [develop-olympus] Add changelog for 3.0.11 release. 2012-05-31 22:07:02 +02:00
Andreas Fischer
d8ddda5121 [develop-olympus] Bumping version numbers to final for 3.0.11 releases. 2012-05-31 20:19:28 +02:00
Nils Adermann
b0eb7768bd Merge branch 'develop-olympus' into develop 
By Andreas Fischer
via Nils Adermann (2) and Andreas Fischer (1)
* develop-olympus:
  [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
 2012-05-31 20:07:18 +02:00
Nils Adermann
791c4136f7 Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympus 
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10788:
  [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
 2012-05-31 20:06:29 +02:00
Andreas Fischer
d22e7ce9df [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS. 
PHPBB3-10788
 2012-05-31 19:57:13 +02:00