1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 05:36:30 +02:00
Commit Graph

13542 Commits

Author SHA1 Message Date
2fdd039e52 Merge remote-tracking branch 'p/ticket/10103' into develop
* 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.
2012-12-04 20:26:43 +01:00
3e093c282a [ticket/10103] New and improved wording.
PHPBB3-10103
2012-12-04 14:05:49 -05:00
3924676f2b [ticket/10103] $rv had too few characters.
PHPBB3-10103
2012-12-04 13:45:02 -05:00
4cc81f1ffa [ticket/10103] Correct flock class documentation.
PHPBB3-10103
2012-12-04 13:44:22 -05:00
b67f112e03 [ticket/10091] Bump minimum supported postgresql version to 8.3.
PHPBB3-10091
2012-12-04 02:52:18 -05:00
318140b4d6 [ticket/10103] Convert the rest of the tree to flock class.
PHPBB3-10103
2012-12-04 02:26:55 -05:00
4010f4085a [ticket/10103] Use flock lock class in messenger.
PHPBB3-10103
2012-12-04 02:00:27 -05:00
f08c28c77a [ticket/10103] Factor out flock lock class.
PHPBB3-10103
2012-12-04 02:00:10 -05:00
49f2925900 Merge remote-tracking branch 'p/ticket/9983' into develop
* 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.
2012-12-03 17:17:50 +01:00
5f9133c213 [ticket/9983] Empty line by request.
PHPBB3-9983
2012-12-02 23:55:42 -05:00
9d5fc4ae33 [ticket/11238] Set goutte to 0.1.0 in develop.
PHPBB3-11238
2012-12-02 13:16:11 -05:00
1823674514 Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into develop
* 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
2012-12-02 11:47:15 -05:00
37f2841af2 [ticket/10771] fix remember me language
PHPBB3-10771
2012-12-02 15:40:25 +05:30
619e15378d [ticket/10771] use remember me in ucp
PHPBB3-10771
2012-12-02 14:51:31 +05:30
a97401a180 [ticket/10771] use remember me in acp
PHPBB3-10771
2012-12-02 14:51:29 +05:30
a17c1a29f8 [ticket/10771] changed value in help_faq.php
PHPBB3-10771
2012-12-02 14:51:28 +05:30
dacacbbd52 [ticket/10771] Using Remember Me instead of autologin or persistent keys
Changed language variable LOG_ME_IN's value to
"Remember me"

PHPBB3-10771
2012-12-02 14:51:27 +05:30
21caf6db6f Merge PR #545 branch 'brunoais/ticket/10601' into develop
* 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
2012-12-01 15:09:38 -05:00
ab6c284ddd Merge PR #1095 branch 'nickvergessen/ticket/11209' into develop
* nickvergessen/ticket/11209:
  [ticket/11209] Clone disable moving images to allow multiple per page
2012-12-01 06:21:09 -05:00
1ceb1f759d Merge remote-tracking branch 'p/ticket/11227' into develop
* p/ticket/11227:
  [ticket/11227] @return void -> @return null in code sniffer.
  [ticket/11227] @return void -> @return null, per coding guidelines.
2012-12-01 12:21:29 +01:00
1ce0671181 [ticket/10601] The ORDER BY is only taking space there
PHPBB3-10601
2012-12-01 10:05:20 +00:00
7a77edf25e Merge PR #893 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10184] Query bots table to get the user_ids of the bots
  [ticket/10184] Disable receiving pms for bots by default
2012-12-01 04:55:48 -05:00
ae14ac7ba9 Merge PR #893 branch 'nickvergessen/ticket/10184' into develop-olympus
* nickvergessen/ticket/10184:
  [ticket/10184] Query bots table to get the user_ids of the bots
  [ticket/10184] Disable receiving pms for bots by default
2012-12-01 04:55:00 -05:00
ad2d560f3f [ticket/10184] Query bots table to get the user_ids of the bots
PHPBB3-10184
2012-12-01 10:54:26 +01:00
314462d835 [ticket/10184] Disable receiving pms for bots by default
PHPBB3-10184
2012-12-01 10:54:16 +01:00
a0d5c52eb6 [ticket/10601] New approach in the update algorithm
- New approach in the database update algorithm

PHPBB3-10601
2012-12-01 09:44:51 +00:00
c852044d6e [ticket/9983] Add redis cache driver tests.
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
2012-12-01 00:48:21 -05:00
ec4343c744 [ticket/11227] @return void -> @return null, per coding guidelines.
PHPBB3-11227
2012-11-30 23:03:06 -05:00
3a702084e4 Merge PR #974 branch 'bantu/ticket/10875' into develop
* bantu/ticket/10875:
  [ticket/10875] tests/cache/cache_test.php: Use single quotes where possible.
  [ticket/10875] Test for null cache driver and sql cache.
  [ticket/10875] Revise sql cache test.
  [ticket/10875] Must return query result on failure.
  [ticket/10875] More documentation.
  [ticket/10875] Spelling fix.
  [ticket/10875] Add docblocks for phpbb_cache_driver_interface
  [ticket/10875] Add comment about cache's sql_load() method.
  [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save().
  [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result.
  [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save().
  [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.
2012-11-30 20:44:51 -05:00
1ebc6eb68b [ticket/10875] Must return query result on failure.
PHPBB3-10875
2012-11-30 12:11:52 -05:00
3eb15ab59e [ticket/10875] More documentation.
PHPBB3-10875
2012-11-30 12:04:05 -05:00
ee16ed7b76 [ticket/10875] Spelling fix.
PHPBB3-10875
2012-11-30 11:55:13 -05:00
5d78346453 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11227] @return void -> @return null in develop-olympus.
2012-11-29 23:17:58 +01:00
65253a3023 [ticket/11227] @return void -> @return null in develop-olympus.
PHPBB3-11227
2012-11-29 15:37:12 -05:00
1d98915881 [ticket/10601] Comment to help understanding the code
PHPBB3-10601
2012-11-28 19:37:16 +00:00
a4cc076177 [ticket/10601] Requested code changes
- Renamed the comment to PHPBB3-10601
- Removed backslashes
- Traded double quotes into single quotes inside.

PHPBB3-10601
2012-11-28 19:36:13 +00:00
c725b02df8 [ticket/11174] include utf_tools in postgres search backend
PHPBB3-11174
2012-11-27 08:49:06 -05:00
6e8f142d39 [ticket/11174] removes unnecessary space from word
PHPBB3-11174
2012-11-27 08:48:15 -05:00
764da97772 [ticket/11174] include utf_tools in mysql backend
when running tests include utf_tools file in the mysql search backend

PHPBB3-11174
2012-11-27 08:48:06 -05:00
1f9eaa1c56 [ticket/10601] Cosmetic code changes
- 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
2012-11-26 17:45:46 +00:00
85ebbbaec4 [ticket/10601] Database updating code v2
Added the space after the (int) as requested

PHPBB3-10601
2012-11-26 17:45:31 +00:00
80da19ca7c [ticket/10601] Database updating code
This is what is needed to update the database to comply with these code changes

PHPBB3-10601
2012-11-26 17:45:18 +00:00
81547ba980 [ticket/10601] Comment explaning the basename applied to categories
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
2012-11-26 17:45:06 +00:00
61842c317a [ticket/10601] Correctly access class property
PHPBB3-10601
2012-11-26 17:44:54 +00:00
24939c8225 [ticket/10601]Move Inbox the default in private messages module
Did exactly as the answer here asked:
http://area51.phpbb.com/phpBB/viewtopic.php?p=234111

PHPBB3-10601
2012-11-26 17:44:41 +00:00
b453f359ff Merge remote-tracking branch 'imkingdavid/feature/controller-new' into develop
* imkingdavid/feature/controller-new: (67 commits)
  [feature/controller] Fix misnamed route for functional test
  [feature/controller] Fix comments, check against more general HttpException
  [feature/controller] Check for proper status codes from controllers
  [feature/controller] Correctly create Symfony object from globals
  [feature/controller] Add documentation about input being HTML-escaped
  [feature/controller] Create Symfony Request in new function
  [feature/controller] Remove unused language strings
  [feature/controller] Don't use $user->lang() before container compilation
  [feature/controller] Update routing documentation for using query string
  [feature/controller] Remove now-unused code
  [feature/controller] Remove url rewriting until we use pathinfo in controllers
  [feature/controller] Fix functional tests to use query string for controllers
  [feature/controller] Allow injecting Symfony Request into controllers
  [feature/controller] Use query string, not path info, for controller access
  [feature/controller] Fix line endings and permissions, and check responses
  [feature/controller] Remove URL rewriting by default
  [feature/controller] Add controller functional test with template
  [feature/controller] Use warning instead of echo for copy() and unlink()
  [feature/controller] Flip method parameters, require $message
  [feature/controller] Rename $root_path class property to $phpbb_root_path
  ...
2012-11-19 22:28:12 +01:00
01ec608593 [feature/controller] Fix comments, check against more general HttpException
PHPBB3-10864
2012-11-19 12:55:15 -05:00
f8614bfc84 [feature/controller] Check for proper status codes from controllers
PHPBB3-10864
2012-11-19 12:37:20 -05:00
3004350281 [feature/controller] Correctly create Symfony object from globals
PHPBB3-10864
2012-11-19 11:47:42 -05:00
e2bf66d065 [feature/controller] Add documentation about input being HTML-escaped
PHPBB3-10864
2012-11-18 15:58:47 -05:00