makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
11563 commits 18 branches 192 tags 207 MiB
Commit graph

11563 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Pudeyev
68641aab93 Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus 
* bantu/ticket/11069:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
 2012-10-10 00:22:17 -04:00
Oleg Pudeyev
a7893ab299 Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympus 
* bantu/ticket/11131:
  [ticket/11131] Correctly use indefinite article for "warning".
 2012-10-09 17:42:23 -04:00
Andreas Fischer
281afb8bd6 Merge remote-tracking branch 'mvinny/ticket/11135' into develop-olympus 
* mvinny/ticket/11135:
  [ticket/11135] Full replacement of credit link to https
 2012-10-06 06:12:45 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https 
PHPBB3-11135
 2012-10-05 21:18:59 -03:00
Andreas Fischer
8428b53087 Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympus 
* Senky/ticket/11112:
  [ticket/11112] updating links to phpbb.com to use SSL
 2012-10-02 17:01:21 +02:00
Andreas Fischer
dbeace22c8 [ticket/11131] Correctly use indefinite article for "warning". 
PHPBB3-11131
 2012-10-02 14:58:20 +02:00
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL 
PHPBB3-11112
 2012-10-01 15:38:16 +02:00
Andreas Fischer
27bef015d6 Merge remote-tracking branch 'nickvergessen/ticket/11122' into develop-olympus 
* nickvergessen/ticket/11122:
  [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
 2012-09-29 00:25:00 +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
Andreas Fischer
888aa47b0e Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympus 
* Fyorl/ticket/11045:
  [ticket/11045] Removed file conflict tests for compress class
  [ticket/11045] Replaced __DIR__ with dirname(__FILE__)
  [ticket/11045] Opening brace on its own line
  [ticket/11045] Explicitely check for zlib and bz2
  [ticket/11045] Added tests for file conflicts
  [ticket/11045] Added unit tests for the compress class
 2012-09-14 00:46:04 +02:00
Fyorl
ce7cffcf9e [ticket/11045] Removed file conflict tests for compress class 
PHPBB3-11045
 2012-09-11 09:42:29 +01:00
Nils Adermann
3bd19077dc Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus 
* github-imkingdavid/task/functional:
  [task/functional] Fixed DEBUG_TEST related issues
  [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
  [task/functional] Added posting tests (reply and new topic)
 2012-09-01 17:06:41 +02:00
David King
4dd1bbc587 [task/functional] Fixed DEBUG_TEST related issues 
PHPBB3-10758
 2012-09-01 10:53:01 -04:00
David King
7dfe26dd78 [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST 
PHPBB3-10758
 2012-09-01 10:37:44 -04:00
David King
7cffebbd49 [task/functional] Added posting tests (reply and new topic) 
PHPBB-10758
 2012-09-01 10:37:03 -04:00
Nils Adermann
0ba2bfffe2 Merge remote-tracking branch 'github-imkingdavid/ticket/10873' into develop-olympus 
* github-imkingdavid/ticket/10873:
  [ticket/10873] Change language for notice about undelivered, deleted PM.
 2012-09-01 16:11:42 +02:00
Fyorl
1520130b27 [ticket/11045] Replaced __DIR__ with dirname(__FILE__) 
PHPBB3-11045
 2012-09-01 09:45:11 +08:00
Fyorl
94c9d70298 [ticket/11045] Opening brace on its own line 
PHPBB3-11045
 2012-08-28 09:34:01 +01:00
Fyorl
83a5326077 [ticket/11045] Explicitely check for zlib and bz2 
PHPBB3-11045
 2012-08-28 09:33:40 +01:00
Fyorl
570502e4a3 [ticket/11045] Added tests for file conflicts 
PHPBB3-11045
 2012-08-28 09:33:31 +01:00
Fyorl
012c281743 [ticket/11045] Added unit tests for the compress class 
PHPBB3-11045
 2012-08-28 09:33:19 +01:00
Andreas Fischer
c83ca457a0 [ticket/11069] Add closing span back to credit line in subsilver2 simple footer 
Regression from 0ceb77fb99.

PHPBB3-11069
 2012-08-26 17:20:45 +02:00
Nils Adermann
4db4731fff Merge remote-tracking branch 'github-bantu/ticket/11066' into develop-olympus 
* github-bantu/ticket/11066:
  [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
 2012-08-26 15:22:04 +02:00
Nils Adermann
a3d87a1443 Merge remote-tracking branch 'github-bantu/ticket/11060' into develop-olympus 
* github-bantu/ticket/11060:
  [ticket/11060] Backport ca4cee86af to olympus.
 2012-08-26 15:16:08 +02:00
Andreas Fischer
5407f9b00d [ticket/11060] Backport ca4cee86af to olympus. 
PHPBB3-11060
 2012-08-26 15:09:00 +02:00
Jordan Rogers
73cd044f5c [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php 
For some reason, all errors are just flipped on before connecting to the
database, despite the system as a whole having a different setting for
displayable errors. Had to add & ~E_STRICT in PHP 5.4.5 to suppress Strict
Standards messages, but I would assume that the db piece shouldn't be involved
with setting error_reporting at all.

PHPBB3-11066
 2012-08-23 15:41:57 +02:00
David King
92761e1f2b [ticket/10873] Change language for notice about undelivered, deleted PM. 
See the ticket for my reasoning.

PHPBB3-10873
 2012-08-21 11:59:44 -04:00
Andreas Fischer
446607ef53 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2012-08-20 16:40:50 +02:00
Andreas Fischer
6da03913bf [prep-release-3.0.11] Bumping version number for 3.0.11 final. 2012-08-20 16:32:34 +02:00
Andreas Fischer
ac81611b90 Merge remote-tracking branch 'igorw/ticket/11059' into develop-olympus 
* igorw/ticket/11059:
  [ticket/11059] Use https for the README logo
 2012-08-19 23:44:31 +02:00
Oleg Pudeyev
97020399fa Merge PR #950 branch 'dhruvgoel92/ticket/10943' into develop-olympus 
* dhruvgoel92/ticket/10943:
  [ticket/10943] displays searched query in search result
  [ticket/10943] use keywords variable to display in search box
 2012-08-18 22:38:25 -04:00
Igor Wiedler
0ae4b20160 [ticket/11059] Use https for the README logo 
It's causing troubles since we moved the site to HTTPS

PHPBB3-11059
 2012-08-19 02:20:58 +02:00
Dhruv Goel
2ba1cef5b0 [ticket/10943] displays searched query in search result 
Search backend displays an additional normalized search query just above
the ignored words.

PHPBB3-10943
 2012-08-11 02:26:46 +05:30
Dhruv Goel
83a4d9abb5 [ticket/10943] use keywords variable to display in search box 
$keywords which contains the string as entered by the user should be used
to display in search box instead of search_query.

PHPBB3-10943
 2012-08-11 02:21:14 +05:30
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
Senky
d0a1c7bf0a [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm 
PHPBB3-10568
 2012-08-02 20:08:49 +02:00
Andreas Fischer
cb007acc76 Merge remote-tracking branch 'Fyorl/ticket/11034' into develop-olympus 
* Fyorl/ticket/11034:
  [ticket/11034] Re-arranged install order to emulate real install
 2012-07-30 19:00:17 +02:00
Fyorl
647d395908 [ticket/11034] Re-arranged install order to emulate real install 
PHPBB3-11034
 2012-07-30 14:13:28 +01:00
Andreas Fischer
49a53755e6 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [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/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2012-07-23 23:45:17 +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
Andreas Fischer
9f073e4c75 [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. 2012-07-23 23:41:47 +02:00
Andreas Fischer
60acd63c70 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
 2012-07-23 23:39:58 +02:00
Andreas Fischer
9279c8f5ee Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11 
* naderman/ticket/10965:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
 2012-07-23 23:39:42 +02:00
Nils Adermann
296fadfca4 [ticket/10965] Profile data is only grabbed when show_novalue is enabled 
PHPBB3-10965
 2012-07-23 23:35:48 +02:00
Andreas Fischer
27d9e3133b Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
 2012-07-23 22:56:47 +02:00
Andreas Fischer
3c64cccecc Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11 
* naderman/ticket/10965:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
 2012-07-23 22:56:36 +02:00
Nils Adermann
2f5692d4bb [ticket/10965] Make sure all profile fields are always grabbed on viewtopic 
PHPBB3-10965
 2012-07-23 22:38:38 +02:00
Andreas Fischer
7b98e75ec3 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
 2012-07-23 15:48:53 +02:00
Andreas Fischer
3da72e9864 Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11 
* naderman/ticket/10965:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
 2012-07-23 15:48:40 +02:00
Nils Adermann
19237f5613 [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 
PHPBB3-10965
 2012-07-23 15:46:04 +02:00