1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

13672 Commits

Author SHA1 Message Date
Nathan Guse
480e3daede [ticket/11021] Remove unnecessary line spacing in functions.php
PHPBB3-11021
2012-09-15 10:46:03 -05:00
Nathan Guse
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME
Check site home url against !== '', not empty

PHPBB3-11021
2012-09-15 10:44:18 -05:00
Nathan Guse
0c56bd45ef [ticket/11021] Better language strings for site home url/text
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
2012-09-15 10:28:37 -05:00
Nathan Guse
ffe7f76b90 [ticket/11021] subsilver2 support
PHPBB3-11021
2012-07-22 22:58:43 -05:00
Nathan Guse
a5dd64195a [ticket/11021] Add the option to specify a Site home URL and text
PHPBB3-11021
2012-07-22 22:26:38 -05:00
Nils Adermann
147a125f69 Merge pull request #914 from EXreaction/ticket/10990
Ticket/10990
2012-07-22 16:25:17 -07:00
Nathan Guse
577dbf8951 [ticket/10990] Changes for develop
PHPBB3-10990
2012-07-22 14:48:39 -05:00
Nathan Guse
eb5e33a768 [ticket/10990] Do not use comma separator when storing it as a log.
PHPBB3-10990
2012-07-22 14:39:10 -05:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
PHPBB3-10990
2012-07-22 14:32:03 -05:00
Nils Adermann
34d5fa6995 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:56 +02:00
Nils Adermann
da8d610011 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:46 +02:00
Nils Adermann
55aaa596d7 Merge branch 'ticket/10667' into prep-release-3.0.11
* ticket/10667:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:01 +02:00
Igor Wiedler
6ed63088fe [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-22 01:45:30 +02:00
Nils Adermann
691349a502 Merge pull request #909 from igorw/ticket/10667
[ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-21 16:41:20 -07:00
Igor Wiedler
28c3ac2408 [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-21 19:28:55 +02:00
Nils Adermann
cc0aa90c49 Merge remote-tracking branch 'github-igorw/ticket/11012' into develop
* github-igorw/ticket/11012:
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
2012-07-21 16:39:57 +02:00
Nils Adermann
61f05e027d Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into develop
* github-nickvergessen/ticket/11002:
  [ticket/11002] Use translating option to rename the Etc/GMT options
2012-07-21 16:35:24 +02:00
Igor Wiedler
87b278bda7 [ticket/11012] Fix php_ext change in mock_extension_manager
PHPBB3-11012
2012-07-21 16:31:26 +02:00
Igor Wiedler
85bcdbad46 [ticket/11012] Normalize $phpEx member vars to $php_ext
PHPBB3-11012
2012-07-21 16:19:01 +02:00
Nils Adermann
f7f78adeb9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:42 +02:00
Nils Adermann
29bee5b01a Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:32 +02:00
Nils Adermann
3dfcb212dc Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into prep-release-3.0.11
* github-nickvergessen/ticket/10950:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 15:21:26 +02:00
Joas Schilling
656d2c34e0 [ticket/11002] Use translating option to rename the Etc/GMT options
They have the invers offset of their name. So GMT+2 has the offset -7200.
To avoid additional confusion, we simply overwrite their name.

PHPBB3-11002
2012-07-21 15:18:16 +02:00
Nils Adermann
3bc15e8683 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
2012-07-21 00:35:13 +02:00
Nils Adermann
1e87e0dab8 Merge remote-tracking branch 'github-bantu/ticket/11009' into develop-olympus
* github-bantu/ticket/11009:
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
2012-07-21 00:35:03 +02:00
Andreas Fischer
be44f32008 [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
PHPBB3-11009
2012-07-21 00:24:09 +02:00
Nils Adermann
b3212bd7f9 Merge pull request #904 from igorw/ticket/11008
[PHPBB3-11008] Get rid of eval in javascript
2012-07-20 15:16:07 -07:00
Igor Wiedler
61f7f1b8ed [ticket/11008] Change onunload_functions to not use eval()
PHPBB3-11008
2012-07-21 00:12:45 +02:00
Igor Wiedler
ca43a8947a [ticket/11008] Remove eval() calls to get document[id]
PHPBB3-11008
2012-07-21 00:12:37 +02:00
Joas Schilling
3036db481a [ticket/10950] Fix grammar in comments
PHPBB3-10950
2012-07-20 18:03:06 +02:00
Joas Schilling
a3517232f9 [ticket/10950] Delete PMs for users that have not yet read the pm
PHPBB3-10950
2012-07-20 17:11:20 +02:00
Joas Schilling
a9c091fad4 [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
Undelivered PMs should not be delivered to recipients that have not yet received them.

PHPBB3-10950
2012-07-20 17:08:54 +02:00
Nils Adermann
841ea0e494 Merge pull request #898 from bantu/ticket/10993
[ticket/10993] Use composer.phar from our repository in README.md
2012-07-19 09:24:58 -07:00
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
Nils Adermann
9d099eebab Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html
2012-07-19 17:55:43 +02:00
Nils Adermann
a65b432165 Merge remote-tracking branch 'github-noxwizard/ticket/10441' into prep-release-3.0.11
* github-noxwizard/ticket/10441:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html
2012-07-19 17:55:22 +02:00
Nils Adermann
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
2012-07-19 08:46:25 -07:00
Joas Schilling
7df1c84447 [feature/new-tz-handling] Don't use global user but make it a parameter
PHPBB3-9558
2012-07-19 17:41:27 +02:00
Andreas Fischer
c896cd06dd Merge remote-tracking branch 'Fyorl/ticket/10944' into develop
* Fyorl/ticket/10944:
  [ticket/10944] strpos now stricter and removed superfluous ternary
  [ticket/10944] Reverted changes in PHPBB3-10963
2012-07-19 17:16:37 +02:00
Andreas Fischer
415a8c6786 Merge remote-tracking branch 'Fyorl/ticket/10992' into develop
* Fyorl/ticket/10992:
  [ticket/10992] Changed octetstream to octet-stream
  [ticket/10992] test_empty_file() now tries to upload the correct file
  [ticket/10992] Modified upload tests to work with new version
2012-07-19 17:08:38 +02:00
Andreas Fischer
db7b879b82 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php
2012-07-19 16:59:45 +02:00
Andreas Fischer
3bbb882fe8 Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus
* Fyorl/ticket/10981:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer
2012-07-19 16:40:33 +02:00
Andreas Fischer
8b230f59db Merge remote-tracking branch 'mvinny/ticket/10998' into develop
* mvinny/ticket/10998:
  [ticket/10998] Add border-radius to forum rules block - prosilver
2012-07-19 16:35:16 +02:00
Joas Schilling
5b7884907c [feature/new-tz-handling] Fix size of suggestion button in chrome
PHPBB3-9558
2012-07-19 16:13:16 +02:00
Joas Schilling
196e634370 [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
This should avoid problems, when the board files are updated but database isn't.

PHPBB3-9558
2012-07-19 15:46:12 +02:00
Nils Adermann
b773da2c3e Merge pull request #877 from Drae/feature/pagination-as-list
[feature/pagination-as-list] Render pagination within the template
2012-07-19 06:26:30 -07:00
Joas Schilling
6de222065e [feature/new-tz-handling] Add previous selected value to validation if valid
We also add the selected timezone if we can create an object with it.
DateTimeZone::listIdentifiers seems to not add all identifiers to the list,
because some are only kept for backward compatible reasons. If the user has
a deprecated value, we add it here, so it can still be kept. Once the user
changed his value, there is no way back to deprecated values.

PHPBB3-9558
2012-07-19 14:36:20 +02:00
Joas Schilling
d099ef8cad [feature/new-tz-handling] Display suggestion when a different value is selected
PHPBB3-9558
2012-07-19 14:24:59 +02:00
Vinny
5a068867ee [ticket/10998] Add border-radius to forum rules block - prosilver
PHPBB3-10998
2012-07-18 21:42:23 -03:00
Joas Schilling
81627e2888 [feature/new-tz-handling] Remove additional marking of selected items
PHPBB3-9558
2012-07-18 18:59:25 +02:00