1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 13:46:33 +02:00
Commit Graph

1228 Commits

Author SHA1 Message Date
b8c55291ed [feature/soft-delete] Lay the groundwork for a soft-delete feature
So far, I've added no new functionality.  The biggest change here is adjusting the DB column names to "visibility" rather than "approved".  Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)

PHPBB3-9657
2012-08-29 17:49:37 +02:00
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
f1729281e6 [feature/sphinx-fulltext-search] add sphinx to Authors file
PHPBB3-10946
2012-07-27 11:28:14 +05:30
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
ece4a2edb7 [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. 2012-07-23 23:41:58 +02:00
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
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
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
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
118b57f71d [feature/sphinx-fulltext-search] minor changes in sphinx.conf
PHPBB3-10946
2012-07-19 23:01:47 +05:30
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
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
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
a3b2caf841 [feature/sphinx-fulltext-search] include sample sphinx.conf in docs
PHPBB3-10946
2012-07-12 17:27:26 +05:30
5d0aa8e516 [ticket/10441] Make CDB linking more consistent
PHPBB3-10441
2012-07-02 21:38:27 -05:00
6203ef0c61 [ticket/10441] Typo
PHPBB3-10441
2012-06-29 12:10:14 -05:00
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
69ef2f55cc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10925] Clarify installation requirements for SQLite
2012-06-20 10:31:35 +02:00
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
d26606f986 [ticket/10925] Clarify installation requirements for SQLite
PHPBB3-10925
2012-06-19 01:20:58 -05:00
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
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
19a47dfbbc [develop-olympus] Add changelog for 3.0.11 release. 2012-05-31 22:07:02 +02:00
d8ddda5121 [develop-olympus] Bumping version numbers to final for 3.0.11 releases. 2012-05-31 20:19:28 +02:00
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
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
d22e7ce9df [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
PHPBB3-10788
2012-05-31 19:57:13 +02:00
22cc7c73fd [ticket/10855] Fixed a couple issues in coding guidelines.
PHPBB3-10855
2012-05-22 19:38:30 +01:00
61eb0151f0 Merge PR #725 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9896] Links changed
2012-05-10 15:58:55 -04:00
4b3d807293 Merge PR #725 branch 'Senky/ticket/9896' into develop-olympus
* Senky/ticket/9896:
  [ticket/9896] Links changed
2012-05-10 15:57:24 -04:00
8393b8e755 [ticket/9896] Links changed
Link to languaged updated to http://www.phpbb.com/languages/
Link to styles updated to http://www.phpbb.com/customise/db/styles-2/
Link to MODs updated to http://www.phpbb.com/customise/db/modifications-1/
Link to Community Forums updated to http://www.phpbb.com/community/

PHPBB3-9896
2012-05-10 21:40:39 +02:00
c34ee343ba [ticket/10843] Backport changes to install language.
PHPBB3-10688
PHPBB3-10843
2012-05-05 16:08:37 -04:00
58842b5ca8 [ticket/10834] Backport general development language changes to 3.0.
PHPBB3-10688
PHPBB3-10834
2012-05-05 16:05:55 -04:00
06efa6c0be [ticket/10855] Added JS camelCaps info to guidelines.
PHPBB3-10855
2012-05-03 22:34:35 +01:00
ee2e2cb2c3 [ticket/10855] Added array trailing commas info in js to guidelines.
PHPBB3-10855
2012-05-03 22:30:22 +01:00
3978e2620e [ticket/10855] Modified coding guidelines to reflect JS brace changes.
Braces always go on the same line in JavaScript.

PHPBB3-10855
2012-04-29 19:07:48 +01:00
2a92fee06d Merge PR #753 branch 'Senky/ticket/10161' into develop
* Senky/ticket/10161:
  [ticket/10161] added fullstop to the end of sentence
  [ticket/10161] coding-guidelines.html updated
  [ticket/10161] all "e-mail" strings in language files changed to "email"
2012-04-26 22:57:30 -04:00
0858a8023b [ticket/10161] added fullstop to the end of sentence
PHPBB3-10161
2012-04-26 09:20:33 +02:00
02cc32b901 [ticket/10161] coding-guidelines.html updated
PHPBB3-10161
2012-04-26 09:19:51 +02:00
248559d7d1 Merge PR #734 branch 'shibulijack/ticket/10688' into develop
* shibulijack/ticket/10688:
  [ticket/10688] Update install.html for 3.1 and current practices.
  [ticket/10688] Update readme for 3.1 and current practices.
  [ticket/10688] Changed version 3.0 to 3.1
  [ticket/10688] Updated version to 3.1
  [ticket/10688] Changed 3.0 to 3.1 in docs

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
2012-04-19 21:43:23 -04:00
3ece096a1e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
  [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
2012-04-12 14:37:55 +02:00
8bb083eed9 [ticket/10688] Update install.html for 3.1 and current practices.
PHPBB3-10688
2012-04-12 00:24:09 -04:00
8382e44942 [ticket/10688] Update readme for 3.1 and current practices.
PHPBB3-10688
2012-04-11 23:59:11 -04:00
f394fd250e [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
PHPBB3-10788
2012-04-11 22:08:36 +02:00
534d966957 [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
PHPBB3-10788
2012-04-11 21:39:27 +02:00
3da5166703 [ticket/10688] Changed 3.0 to 3.1 in docs
Replaced all the occurrences of phpBB 3.0 with phpBB 3.1 in all the doc
files

PHPBB-10688
2012-04-11 17:46:47 +05:30
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth
PHPBB3-10609
2012-03-31 18:14:11 +02:00
6deb7b3671 [feature/class-prefix] Rename user and session to phpbb_*
PHPBB-10609
2012-03-31 18:14:07 +02:00
e13e4d9206 [feature/merging-style-components] Updating styles in coding guidelines
Updating styles section in coding guidelines

PHPBB3-10632
2012-03-31 16:33:30 +03:00
398a6c8045 Merge branch 'develop' into feature/merging-style-components
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
2012-03-31 10:43:06 +03:00