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
13,472 Commits 17 Branches 190 Tags
Commit Graph

12493 Commits

Author SHA1 Message Date
Andreas Fischer
38e261c955 Merge remote-tracking branch 'imkingdavid/ticket/10938' into develop 
* imkingdavid/ticket/10938:
  [ticket/10938] Serve subforum listing on forumlist from template loop
 2012-06-20 10:44:32 +02: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
3e80268249 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:23 +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
Oleg Pudeyev
820ad818dd Merge PR #844 branch 'dhruvgoel92/ticket/10936' into develop 
* dhruvgoel92/ticket/10936:
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
 2012-06-19 19:51:39 -04:00
Nils Adermann
419d6cd035 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9551] uncomment line and change length to 255
 2012-06-19 20:09:31 +02:00
Nils Adermann
08763ac99e Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-olympus 
* github-dhruvgoel92/ticket/9551:
  [ticket/9551] uncomment line and change length to 255
 2012-06-19 20:09:23 +02:00
Callum Macrae
3f7d55a053 [ticket/10801] Fixed quickmod tools. 
Fixes 10801, 10802, 10807 and 10808.

PHPBB3-10801
 2012-06-19 17:28:30 +01:00
Dhruv Goel
bbd3204a9c [ticket/9551] uncomment line and change length to 255 
incase of partial collation change post_subject field will be changed back
to the default collation and length 255.

PHPBB3-9551
 2012-06-19 20:03:57 +05:30
Patrick Webster
d26606f986 [ticket/10925] Clarify installation requirements for SQLite 
PHPBB3-10925
 2012-06-19 01:20:58 -05:00
Oleg Pudeyev
e7da931d3a Merge PR #571 branch 'unknownbliss/ticket/10640' into develop 
* unknownbliss/ticket/10640:
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
 2012-06-18 20:55:01 -04:00
David King
58a3342c3e [ticket/10938] Serve subforum listing on forumlist from template loop 
Subforum listing is available both via implode()-ed PHP loop and
via template loop. The latter allows more flexibility for changing
the subforum listing per style, so that is the better option.

PHPBB3-10938
 2012-06-18 12:26:28 -04: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
Michael Cullum
a41f86f2f7 [ticket/10640] Change subject length in mcp in subsilver 
PHPBB3-10640
 2012-06-17 19:22:50 +01:00
Michael Cullum
7a6a5738db [ticket/10640] Change subject length in MCP 
PHPBB3-10640
 2012-06-17 19:07:21 +01:00
Joas Schilling
a259db7105 [ticket/10640] Do not change default value of truncate_string() 
The default value should be kept, so we do not change the behaviour for MODs
and Extensions that use the function with its default values.

PHPBB3-10640
 2012-06-17 19:07:17 +01:00
Michael Cullum
53d8464776 [ticket/10640] Change maximum subject length 
PHPBB3-10640
 2012-06-17 19:07:09 +01:00
Dhruv Goel
96cb75dedb [ticket/10936] remove PCRE and mbstring support check 
Since PCRE UTF8 support already has a global check no need for mbstring
or PCRE check here.

PHPBB3-10936
 2012-06-13 01:43:32 +05:30
Dhruv Goel
e127ba17ea [ticket/10936] fix language key 
Language key changes from INCOMPATIBLE_VERSION to INCOMPATIBLE_DATABASE to
make it more meaningfull.

PHPBB3-10936
 2012-06-12 18:40:48 +05:30
Oleg Pudeyev
2a9698a13a [ticket/10829] Delete T_STYLESHEET_NAME - no longer used. 
PHPBB3-10829
 2012-06-11 21:03:12 -04:00
Oleg Pudeyev
699aab8e8e [ticket/10829] $style_name -> $style_path in style class. 
Here the style path is taken and the variable name should be $style_path.

PHPBB3-10829
 2012-06-11 21:00:22 -04:00
Oleg Pudeyev
436ade19fc Merge PR #839 branch 'p/ticket/10743' into develop 
* p/ticket/10743:
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
 2012-06-11 20:33:11 -04:00
Oleg Pudeyev
1564da616b Merge PR #787 branch 'cyberalien/ticket/10799' into develop 
* cyberalien/ticket/10799:
  [ticket/10799] Removing global variable from includejs
 2012-06-11 20:12:59 -04:00
Vjacheslav Trushkin
71ca9b4fe6 [ticket/10743] Renaming user->theme 
Renaming user->theme to user->style

PHPBB3-10743
 2012-06-11 19:56:50 -04:00
Vjacheslav Trushkin
33b72ec62b [ticket/10743] Changing obtain_cfg_items 
Changing obtain_cfg_items to work only with style
because other components no longer exist

PHPBB3-10743
 2012-06-11 19:56:49 -04:00
Nils Adermann
5acbf0980d Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' into develop 
* github-dhruvgoel92/feature/delete-auto-logins:
  [feature-delete-auto-logins] adds module to database update
  [feature/delete-auto-logins] fixes style
  [feature/delete-auto-logins] improves styling
  [feature/delete-auto-logins] fixes language entry
  [feature/delete-auto-logins] fix language keys and styling
  [feature/delete-auto-logins] explain persistent keys in the ucp.
  [feature/delete-auto-logins] template added for subsilver2
  [feature/delete-auto-logins] improved styling and fixes language
  [feature/delete-auto-logins] using loop for errors
  [feature/delete-auto-logins] fixes css corners
  [feature/delete-auto-logins] Fixes language entries
  [feature/delete-auto-logins] checks form key
  [feature/delete-auto-logins] Fixes language entries and redirection.
  [feature/delete-auto-logins] User can view/delete auto logins.
 2012-06-11 23:39:09 +02:00
Andreas Fischer
4468847107 [ticket/10931] Apply strtolower() correctly, i.e. not on false. 
PHPBB3-10931
 2012-06-11 15:46:03 +02:00
Andreas Fischer
cbff02db4f [ticket/10931] Make to_numeric function globally available. 
PHPBB3-10931
 2012-06-11 15:46:03 +02:00
Andreas Fischer
09fb9a9efe [ticket/10931] Make sure get_bytes() always returns either an int or a float. 
PHPBB3-10931
 2012-06-11 15:15:08 +02:00
Andreas Fischer
e9348b172a [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes(). 
PHPBB3-10931
 2012-06-11 15:06:52 +02:00
Andreas Fischer
80dfa53ee3 [ticket/10931] Correctly use GNU GPL version 2. 
PHPBB3-10931
 2012-06-11 14:24:30 +02:00
Andreas Fischer
7501ea825a [ticket/10931] Document that false is also returned if value is not well formed 
PHPBB3-10931
 2012-06-11 13:53:17 +02:00
Andreas Fischer
63b2e36492 [ticket/10931] Correct method description of get_string(). 
PHPBB3-10931
 2012-06-11 13:45:39 +02:00
Andreas Fischer
5bea6ed946 [ticket/10931] Let us try ini_get() without error suppression. 
PHPBB3-10931
 2012-06-11 13:40:14 +02:00
Andreas Fischer
ca974e2f2a [ticket/10931] Add wrapper class for ini_get function. 
Provides easier handling of the different interpretations of ini values.

PHPBB3-10931
 2012-06-11 13:18:00 +02:00
we3b
07e946c189 [feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 3. 
PHPBB3-9730
 2012-06-08 21:28:51 +05:30
wagnerch
fa470c3792 [feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 2. 
PHPBB3-9730
 2012-06-08 21:28:45 +05:30
wagnerch
0191e1313c [feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 1. 
PHPBB3-9730
 2012-06-08 21:28:23 +05:30
Dhruv Goel
a9549cbe6a [feature-delete-auto-logins] adds module to database update 
ucp delete auto-login keys module is added to database_update.php
under 3.1-dev
 2012-06-03 15:56:55 +05:30
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
118c5d90da [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. 2012-05-31 22:07:34 +02:00
Andreas Fischer
19a47dfbbc [develop-olympus] Add changelog for 3.0.11 release. 2012-05-31 22:07:02 +02:00
Andreas Fischer
2011085c29 [develop-olympus] Bump version numbers for 3.0.11-RC1 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
Nils Adermann
edefd11087 Merge remote-tracking branch 'github-bantu/ticket/10790' into develop 
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
  [ticket/10790] Remove a (kind of) dead code section from submit_pm().
 2012-05-31 15:50:32 +02:00
Nils Adermann
f616c4e7a0 Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympus 
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
  [ticket/10790] Remove a (kind of) dead code section from submit_pm().
 2012-05-31 15:50:19 +02:00
Nils Adermann
b16f3834a3 Merge branch 'develop-olympus' into develop 
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.

Conflicts:
	phpBB/includes/acp/acp_styles.php
 2012-05-31 15:46:23 +02:00