| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
| |
PHPBB3-10411
|
| |
|
|
|
|
|
| |
We left join the group table because we want to check that the group
does exist there aswell.
PHPBB3-10411
|
| |
|
|
| |
PHPBB3-10411
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 'develop' of https://github.com/phpbb/phpbb3: (204 commits)
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
[ticket/11247] Fix wrong property reference in flock class.
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
[ticket/10716] Collect standard error from executed php process.
[ticket/10716] Skip test if php is not in PATH.
[ticket/10716] Exclude our dependencies from linting.
[ticket/10103] New and improved wording.
[ticket/10716] Only lint on php 5.3+.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
[ticket/10103] Inline assignment is bad?
[ticket/10103] $rv had too few characters.
[ticket/10103] Correct flock class documentation.
...
Conflicts:
phpBB/config/services.yml
phpBB/includes/groupposition/legend.php
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
Conflicts:
phpBB/includes/ucp/ucp_prefs.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
|
| | | |
| | |
| | |
| | | |
PHPBB3-10841
|
| | | |
| | |
| | |
| | | |
PHPBB3-10841
|
| | | |
| | |
| | |
| | | |
PHPBB3-10841
|
| | | |
| | |
| | |
| | | |
PHPBB3-10841
|
| | | |
| | |
| | |
| | |
| | |
| | | |
this sould reduce load and be faster. Also freeresult functions added
PHPBB3-10841
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html
PHPBB3-10841
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
Conflicts:
phpBB/includes/functions_messenger.php
|
| | | |
| | |
| | |
| | | |
PHPBB3-10602
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We keep the last queue run time around, therefore for determining
whether enough time has passed since the last run we can simply
use this config variable.
When there is no queue file we consider a queue run successful.
Previously queue.php ("cache file") modification time would be used
for determining whether enough time has passed since last queue run.
The problem was that modification time would be updated whenever
anything was added to the queue, creating a situation where if
queue is processed less frequently than it is added to that email
would not be sent.
PHPBB3-10602
|
| | | |
| | |
| | |
| | | |
PHPBB3-11238
|
| | | |
| | |
| | |
| | | |
PHPBB3-11247
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* p/ticket/10103:
[ticket/10103] New and improved wording.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
[ticket/10103] Inline assignment is bad?
[ticket/10103] $rv had too few characters.
[ticket/10103] Correct flock class documentation.
[ticket/10103] Try a longer sleep for travis.
[ticket/10103] Convert the rest of the tree to flock class.
[ticket/10103] Test for flock lock class, with concurrency no less.
[ticket/10103] Use flock lock class in messenger.
[ticket/10103] Factor out flock lock class.
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10103
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10103
|
| | |/ /
| | |
| | |
| | | |
PHPBB3-10091
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* p/ticket/9983:
[ticket/9983] Also check generic APC enable/disable.
[ticket/9983] Use APC instead of apc in error messages.
[ticket/9983] Skip tests if APC is not enabled for CLI.
[ticket/9983] Test for apc cache driver.
[ticket/9983] Add phpbb prefix to global variables.
[ticket/9983] Empty line by request.
[ticket/9983] Indeed, it is <?php.
[ticket/9983] Add a test for destroy.
[ticket/9983] Exercise exists also.
[ticket/9983] Add a purge test.
[ticket/9983] Rename test methods.
[ticket/9983] get/put cache test moved to a base class.
[ticket/9983] Create driver in setup in null driver test.
[ticket/9983] Split cache test into per-driver files.
[ticket/9983] Add redis cache driver tests.
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-9983
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In order to not overwrite data in default redis store, at least
one of redis host or post must be explicitly specified.
Redis cache driver constructor has been modified to accept
host and port as parameters. This was not added to public API
as there are more parameters being passed via global constants.
PHPBB3-9983
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11238
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* dhruvgoel92/ticket/10771:
[ticket/10771] fix remember me language
[ticket/10771] use remember me in ucp
[ticket/10771] use remember me in acp
[ticket/10771] changed value in help_faq.php
[ticket/10771] Using Remember Me instead of autologin or persistent keys
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10771
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10771
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10771
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10771
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Changed language variable LOG_ME_IN's value to
"Remember me"
PHPBB3-10771
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* brunoais/ticket/10601:
[ticket/10601] The ORDER BY is only taking space there
[ticket/10601] New approach in the update algorithm
[ticket/10601] Comment to help understanding the code
[ticket/10601] Requested code changes
[ticket/10601] Cosmetic code changes
[ticket/10601] Database updating code v2
[ticket/10601] Database updating code
[ticket/10601] Comment explaning the basename applied to categories
[ticket/10601] Correctly access class property
[ticket/10601]Move Inbox the default in private messages module
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- New approach in the database update algorithm
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- Renamed the comment to PHPBB3-10601
- Removed backslashes
- Traded double quotes into single quotes inside.
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- Removed the double line before the addition
- Moved the condition of the WHERE so that both are in the same line
- Removed TABs from the black lines
- Used double quotes instead of escaped single quotes.
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Added the space after the (int) as requested
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is what is needed to update the database to comply with these code changes
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Explain in the code where
if (isset($this->module_categories_basenames[$cat_name]))
and
if (isset($this->module_categories_basenames[$level2_name]))
exists, what does it do.
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-10601
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Did exactly as the answer here asked:
http://area51.phpbb.com/phpBB/viewtopic.php?p=234111
PHPBB3-10601
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* nickvergessen/ticket/11209:
[ticket/11209] Clone disable moving images to allow multiple per page
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The disable images need to be clone rather then moved, in order to allow
multiple disable images per page. We do not have such a case at the moment
but it will be required for the new teampage/legend ACP section.
PHPBB3-11209
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* p/ticket/11227:
[ticket/11227] @return void -> @return null in code sniffer.
[ticket/11227] @return void -> @return null, per coding guidelines.
|
| | | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | | |
PHPBB3-11227
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | /
| | | |_|_|/
| | |/| | |
| | | | | | |
* develop-olympus:
[ticket/10184] Query bots table to get the user_ids of the bots
[ticket/10184] Disable receiving pms for bots by default
|