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
14724 commits 18 branches 192 tags 207 MiB
Commit graph

14724 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
d951cef32b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11238] Set goutte version to 0.1.0.

Conflicts:
	phpBB/composer.lock
 2012-12-03 13:43:45 +01:00
Andreas Fischer
cf64007ab6 Merge remote-tracking branch 'p/ticket/11238-olympus' into develop-olympus 
* p/ticket/11238-olympus:
  [ticket/11238] Set goutte version to 0.1.0.
 2012-12-03 13:39:16 +01:00
Oleg Pudeyev
6f7e39996c [ticket/11238] Set goutte version to 0.1.0. 
PHPBB3-11238
 2012-12-02 23:44:49 -05:00
Oleg Pudeyev
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
Dhruv
37f2841af2 [ticket/10771] fix remember me language 
PHPBB3-10771
 2012-12-02 15:40:25 +05:30
Dhruv
619e15378d [ticket/10771] use remember me in ucp 
PHPBB3-10771
 2012-12-02 14:51:31 +05:30
Dhruv
a97401a180 [ticket/10771] use remember me in acp 
PHPBB3-10771
 2012-12-02 14:51:29 +05:30
Hari Sankar R
a17c1a29f8 [ticket/10771] changed value in help_faq.php 
PHPBB3-10771
 2012-12-02 14:51:28 +05:30
Hari Sankar R
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Andreas Fischer
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
Bruno Ais
1ce0671181 [ticket/10601] The ORDER BY is only taking space there 
PHPBB3-10601
 2012-12-01 10:05:20 +00:00
Oleg Pudeyev
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
Oleg Pudeyev
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
Joas Schilling
ad2d560f3f [ticket/10184] Query bots table to get the user_ids of the bots 
PHPBB3-10184
 2012-12-01 10:54:26 +01:00
Joas Schilling
314462d835 [ticket/10184] Disable receiving pms for bots by default 
PHPBB3-10184
 2012-12-01 10:54:16 +01:00
Bruno Ais
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
Oleg Pudeyev
e5e8087beb [ticket/11227] @return void -> @return null in code sniffer. 
PHPBB3-11227
 2012-11-30 23:03:48 -05:00
Oleg Pudeyev
ec4343c744 [ticket/11227] @return void -> @return null, per coding guidelines. 
PHPBB3-11227
 2012-11-30 23:03:06 -05:00
Oleg Pudeyev
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
Andreas Fischer
e4d2ad6b27 [ticket/10875] tests/cache/cache_test.php: Use single quotes where possible. 
PHPBB3-10875
 2012-12-01 00:36:34 +01:00
Andreas Fischer
b5fe1242e9 Merge remote-tracking branch 'p/ticket/10875' into ticket/10875 
* p/ticket/10875:
  [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.
 2012-12-01 00:35:16 +01:00
Oleg Pudeyev
0c06ac466f [ticket/10875] Test for null cache driver and sql cache. 
PHPBB3-10875
 2012-11-30 12:28:13 -05:00
Oleg Pudeyev
7bba09811c [ticket/10875] Revise sql cache test. 
Delete data from database before retrieving it from cache,
ensuring results come from cache.

PHPBB3-10875
 2012-11-30 12:18:33 -05:00
Oleg Pudeyev
1ebc6eb68b [ticket/10875] Must return query result on failure. 
PHPBB3-10875
 2012-11-30 12:11:52 -05:00
Oleg Pudeyev
3eb15ab59e [ticket/10875] More documentation. 
PHPBB3-10875
 2012-11-30 12:04:05 -05:00
Oleg Pudeyev
ee16ed7b76 [ticket/10875] Spelling fix. 
PHPBB3-10875
 2012-11-30 11:55:13 -05:00
Andreas Fischer
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
Andreas Fischer
b2a252d274 Merge remote-tracking branch 'p/ticket/11227' into develop-olympus 
* p/ticket/11227:
  [ticket/11227] @return void -> @return null in develop-olympus.
 2012-11-29 23:17:48 +01:00
Andreas Fischer
3c4a0c8577 Merge remote-tracking branch 'igorw/ticket/10875' into ticket/10875 
* igorw/ticket/10875:
  [ticket/10875] Add docblocks for phpbb_cache_driver_interface
 2012-11-29 22:50:45 +01:00
Oleg Pudeyev
65253a3023 [ticket/11227] @return void -> @return null in develop-olympus. 
PHPBB3-11227
 2012-11-29 15:37:12 -05:00
Andreas Fischer
aa9aa28fa2 Merge remote-tracking branch 'p/ticket/11202' into develop 
* p/ticket/11202:
  [ticket/11202] Fix comment char, use more descriptive comment.
  [ticket/11202] Add response assertions to file upload functional test.
 2012-11-29 20:01:44 +01:00
Andreas Fischer
aaacfae428 Merge remote-tracking branch 'p/ticket/11174' into develop 
* p/ticket/11174:
  [ticket/11174] Global $cache is a cache service instance.
  [ticket/11174] Delete more copy pasting.
  [ticket/11174] Drop needless teardown functions.
  [ticket/11174] These tests do not need posts fixtures.
  [ticket/11174] Empty fixture for when we don't need any data.
  [ticket/11174] Eliminate search wrapper copy pasting.
  [ticket/11174] Extract phpbb_search_test_case.
  [ticket/11174] Delete copy pasting.
  [ticket/11174] Move assertion definition to base class.
  [ticket/11174] add unit tests for postgres search backend
  [ticket/11174] include utf_tools in postgres search backend
  [ticket/11174] negation queries do not return false
  [ticket/11174] set config values
  [ticket/11174] add test case for native test
  [ticket/11174] rename native wrapper class
  [ticket/11174] add mysql unit tests
  [ticket/11174] removes unnecessary space from word
  [ticket/11174] include utf_tools in mysql backend
 2012-11-29 18:55:56 +01:00
Bruno Ais
1d98915881 [ticket/10601] Comment to help understanding the code 
PHPBB3-10601
 2012-11-28 19:37:16 +00:00
Bruno Ais
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
Oleg Pudeyev
79237b60b6 [ticket/11174] Global $cache is a cache service instance. 
PHPBB3-11174
 2012-11-27 10:24:31 -05:00
Oleg Pudeyev
7dcb03faf1 [ticket/11174] Delete more copy pasting. 
PHPBB3-11174
 2012-11-27 09:06:56 -05:00
Oleg Pudeyev
cb2d029abf [ticket/11174] Drop needless teardown functions. 
PHPBB3-11174
 2012-11-27 08:56:32 -05:00
Oleg Pudeyev
0c430a1f93 [ticket/11174] These tests do not need posts fixtures. 
PHPBB3-11174
 2012-11-27 08:49:07 -05:00
Oleg Pudeyev
4b5e90a2bd [ticket/11174] Empty fixture for when we don't need any data. 
PHPBB3-11174
 2012-11-27 08:49:07 -05:00
Oleg Pudeyev
4d1486b08c [ticket/11174] Eliminate search wrapper copy pasting. 
PHPBB3-11174
 2012-11-27 08:49:06 -05:00
Oleg Pudeyev
a5900a6b11 [ticket/11174] Extract phpbb_search_test_case. 
PHPBB3-11174
 2012-11-27 08:49:06 -05:00
Oleg Pudeyev
04480ec4ae [ticket/11174] Delete copy pasting. 
PHPBB3-11174
 2012-11-27 08:49:06 -05:00
Oleg Pudeyev
3ed4fc437e [ticket/11174] Move assertion definition to base class. 
PHPBB3-11174
 2012-11-27 08:49:06 -05:00
Dhruv
d308ee8a25 [ticket/11174] add unit tests for postgres search backend 
PHPBB3-11174
 2012-11-27 08:49:06 -05:00
Dhruv
c725b02df8 [ticket/11174] include utf_tools in postgres search backend 
PHPBB3-11174
 2012-11-27 08:49:06 -05:00
Dhruv
db2297827d [ticket/11174] negation queries do not return false 
negation queries are split into words too and returns false in mysql search
backend

PHPBB3-11174
 2012-11-27 08:49:06 -05:00
Dhruv
9d597dc2ee [ticket/11174] set config values 
set config values and use min length as 4 for wordss in test cases

PHPBB3-11174
 2012-11-27 08:49:06 -05:00
Dhruv
2d1ac34de6 [ticket/11174] add test case for native test 
PHPBB3-11174
 2012-11-27 08:48:59 -05:00