mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 05:55:15 +02:00
Code Issues Releases Wiki Activity
24,796 Commits 18 Branches 192 Tags
Commit Graph

2887 Commits

Author SHA1 Message Date
Nils Adermann
d08a47d857 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13203] Fix passwords manager tests
  [ticket/13203] Use string_compare method in passwords drivers
  [ticket/13203] Add method for byte by byte comparison to drivers helper
 2014-10-22 16:58:50 -04:00
Marc Alexander
cf9d1fbd1a [ticket/13203] Fix passwords manager tests 
PHPBB3-13203
 2014-10-22 15:09:58 -05:00
Marc Alexander
0bc04a4df0 [ticket/13203] Use string_compare method in passwords drivers 
PHPBB3-13203
 2014-10-22 14:54:55 -05:00
Marc Alexander
2b47ef1266 [ticket/13203] Add method for byte by byte comparison to drivers helper 
PHPBB3-13203
 2014-10-22 14:54:22 -05:00
Nils Adermann
b7386c0c82 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13189] Do not use confirm box for marking all notifications read
 2014-10-21 09:49:42 -04:00
Marc Alexander
293d64e122 [ticket/13189] Do not use confirm box for marking all notifications read 
We already use a token for preventing CSRF when marking notifications read.
Making a user confirm the marking read action serves no real purpose. No
information will be lost by just marking the notifications read but it will
prevent users from always having to confirm this action.

PHPBB3-13189
 2014-10-20 21:55:36 -05:00
Joas Schilling
7c2ed57a99 Merge branch 'develop-ascraeus' into develop 2014-10-20 22:19:43 +02:00
Oliver Schramm
0ba3bd9aed [ticket/11863] Add functional test 
PHPBB3-11863
 2014-10-17 23:33:28 +02:00
Joas Schilling
dec6c7ea8c [ticket/13138] Type hint the variables for IDE usage 
PHPBB3-13138
 2014-10-17 14:53:56 +02:00
Joas Schilling
f847a1a567 [ticket/13138] Fix the session key tests 
PHPBB3-13138
 2014-10-17 14:50:14 +02:00
Joas Schilling
7de0e17711 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:31:55 +02:00
Joas Schilling
90771c1762 Merge pull request #3024 from marc1706/ticket/13124 
[ticket/13124] Also trim spaces in front of comments except for first line
 2014-10-15 18:31:46 +02:00
Tristan Darricau
1941328629 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13161] Check whether the schema exists, before deleting it
  [ticket/13161] Avoid problems when running tests with different migrations
 2014-10-10 15:56:31 +02:00
Joas Schilling
1a04d15d4d [ticket/13161] Check whether the schema exists, before deleting it 
PHPBB3-13161
 2014-10-10 15:26:29 +02:00
Joas Schilling
f6fc8c08a4 [ticket/13161] Avoid problems when running tests with different migrations 
PHPBB3-13161
 2014-10-10 15:26:28 +02:00
Tristan Darricau
d285363700 [ticket/13133] Add unit tests 
PHPBB3-13133
 2014-10-09 19:54:56 +02:00
Marc Alexander
a9ed32663a [ticket/13124] Add another test case as requested 
PHPBB3-13124
 2014-10-09 13:30:10 -04:00
Andreas Fischer
10e99b018a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
 2014-10-07 20:30:40 +02:00
Joas Schilling
4fe95d6870 [ticket/13137] Generate the schema when the schema.json file is not available 
PHPBB3-13137
 2014-10-07 14:55:08 +02:00
Joas Schilling
8d9e6653b4 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:21:35 +02:00
Joas Schilling
f3eaf6fe04 Merge pull request #3016 from Nicofuma/ticket/11224-ascraeus 
[ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined
 2014-10-06 23:21:13 +02:00
Marc Alexander
7bcf6a621f [ticket/13124] Fix tests for event exporter 
PHPBB3-13124
 2014-10-06 16:53:41 +02:00
Tristan Darricau
a712d8a3b3 [ticket/13130] Fix tests 
PHPBB3-13130
 2014-10-05 19:18:19 +02:00
Tristan Darricau
5354c46e01 [ticket/11224] Updates tests 
PHPBB3-11224
 2014-10-03 23:51:16 +02:00
Tristan Darricau
8e638dbf6d [ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224" 
This reverts commit 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7.
 2014-10-03 23:50:24 +02:00
Joas Schilling
ea1eff4fa5 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:36:02 +02:00
Joas Schilling
90241ae4e6 Merge pull request #2947 from rxu/ticket/13059 
[ticket/13059] Add core event to generate_page_link()
 2014-10-02 15:35:55 +02:00
rxu
ce4035fdd3 [ticket/13059] Add core event to generate_page_link() 
Add core event to generate_page_link() to allow
overriding/modifying pagination URLs.
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45905

PHPBB3-13059
 2014-10-01 20:55:07 +08:00
Joas Schilling
b9226c6877 Merge branch 'develop-ascraeus' into develop 2014-10-01 11:39:35 +02:00
Joas Schilling
40cd7570e6 [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224" 
This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing
changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292.

PHPBB3-11224
 2014-10-01 11:38:45 +02:00
Joas Schilling
0a58cca031 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:27:56 +02:00
Joas Schilling
d264369441 Merge pull request #2460 from Nicofuma/ticket/11224 
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
 2014-10-01 10:27:47 +02:00
Joas Schilling
b1d35363db Merge branch 'develop-ascraeus' into develop 2014-10-01 10:24:27 +02:00
Joas Schilling
75fcfb1c1d Merge pull request #2545 from ptitlazy/ticket/12657 
[ticket/12657] Add a test file for base case of command cache:purge
 2014-10-01 10:24:19 +02:00
Andreas Fischer
7c8b8877df Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
 2014-10-01 02:15:26 +02:00
Andreas Fischer
8fef959418 Merge pull request #3011 from fredemmott/ticket/13122 
[ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable

* fredemmott/ticket/13122:
  [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
 2014-10-01 02:15:25 +02:00
Fred Emmott
f30c5f730e [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable 
If you're unlucky, calling time() or similar twice in a row will
give you different results. Facebook runs these tests thousands of
times a day, so we occasionally get bogus failures.

PHPBB3-13122
 2014-09-30 15:53:02 -07:00
Andreas Fischer
ec89d11609 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13105] Fix the code logic as described in the comment
 2014-09-30 21:15:27 +02:00
Andreas Fischer
cb8b245639 Merge pull request #3005 from nickvergessen/ticket/13105 
[ticket/13105] Fix the code logic as described in the comment

* nickvergessen/ticket/13105:
  [ticket/13105] Fix the code logic as described in the comment
 2014-09-30 21:15:26 +02:00
Joas Schilling
89fdd1baf2 [ticket/13105] Fix the code logic as described in the comment 
PHPBB3-13105
 2014-09-29 21:39:31 +02:00
Nils Adermann
8de97b8dbe Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13113] Updates the base url only when the front-end isn't app.php
 2014-09-29 16:17:25 +02:00
Tristan Darricau
a159899d02 [ticket/13113] Updates the base url only when the front-end isn't app.php 
PHPBB3-13113
 2014-09-28 23:32:56 +02:00
Andreas Fischer
b703d1e8df Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
 2014-09-25 21:52:53 +02:00
Joas Schilling
459c62b339 [ticket/13105] Add a test for relative dates 
PHPBB3-13105
 2014-09-25 18:09:24 +02:00
Tristan Darricau
74a96bf7c2 [ticket/11224] Adds a test case 
PHPBB3-11224
 2014-09-24 16:16:47 +02:00
Tristan Darricau
834aea70a7 [ticket/12657] Fix unit tests 
PHPBB3-12657
 2014-09-24 15:24:56 +02:00
Joas Schilling
cb92b4668e Merge branch 'develop-ascraeus' into develop 2014-09-24 12:26:21 +02:00
Joas Schilling
f3fef8934e Merge pull request #2954 from rxu/ticket/13055 
[ticket/13055] Fix string profile fields validation to support unicode
 2014-09-24 12:25:57 +02:00
Marc Alexander
397be4d93f Merge branch 'develop-ascraeus' into develop 2014-09-23 11:12:39 +02:00
Marc Alexander
92b096b05b Merge pull request #2984 from nickvergessen/ticket/10729-asc 
[3.1][ticket/10729] Update editor information when user being deleted
 2014-09-23 11:09:29 +02:00