makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 01:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
18570 commits 18 branches 192 tags 207 MiB
Commit graph

18570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Ais
4ed322b5b8 [ticket/11638] Updated: bitwise $parse_flags use optionset() 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-24 11:59:28 +01:00
Bruno Ais
13fa346e8f [ticket/11656] Made the check for the bitfield just like other PR's 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
 2013-07-24 11:38:04 +01:00
Bruno Ais
1372b4f208 [ticket/11639] Removed a non-needed unset 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
 2013-07-24 10:33:06 +01:00
Joseph Warner
38d4eb073e [feature/oauth] Fix last typo. Authentication works for accounts in db 
PHPBB3-11673
 2013-07-23 22:35:54 -04:00
Joseph Warner
5fa08b92a2 [feature/oauth] Fix typo in token storage 
PHPBB3-11673
 2013-07-23 22:33:11 -04:00
Joseph Warner
4369cc8876 [feature/oauth] Fix more errors related to sql changes 
PHPBB3-11673
 2013-07-23 22:29:27 -04:00
Joseph Warner
da6a8787f8 [feature/oauth] Fix SQL error found in install 
PHPBB3-11673
 2013-07-23 22:26:34 -04:00
Joseph Warner
dc050e7ece [feature/oauth] Fix OAuth after schema changes 
PHPBB3-11673
 2013-07-23 22:20:38 -04:00
Joseph Warner
b1c62793c6 [feature/oauth] Fix token storage after sql changes 
PHPBB3-11673
 2013-07-23 22:20:04 -04:00
Joseph Warner
2483efe9a3 [feature/oauth] Actual final schema changes 
PHPBB3-11673
 2013-07-23 22:18:56 -04:00
Joseph Warner
e60f4bc88b [feature/oauth] Finalize schema changes 
PHPBB3-11673
 2013-07-23 22:16:09 -04:00
Joseph Warner
8d568dae71 [feature/oauth] Fix SQL error in token storage 
PHPBB3-11673
 2013-07-23 21:23:07 -04:00
Joseph Warner
fe9c97cfb4 [feature/oauth] Fix errors in OAuth 
PHPBB3-11673
 2013-07-23 21:17:05 -04:00
Joseph Warner
c166801fe3 [feature/oauth] Remove temporary google testing code 
PHPBB3-11673
 2013-07-23 21:07:18 -04:00
Joseph Warner
b1938576f1 [feature/oauth] Fix outstanding issues with OAuth 
Includes a temporary change that allows me to test against google.
This will be removed shortly.

PHPBB3-11673
 2013-07-23 21:04:29 -04:00
Andreas Fischer
f0516b7d2a Merge remote-tracking branch 'EXreaction/ticket/11667' into develop 
* EXreaction/ticket/11667:
  [ticket/11667] Use @inheritdoc
  [ticket/11734] Readd accidently removed language strings of forum permissions
  [ticket/11667] Make functions abstract in includeasset
  [ticket/11667] includeasset should be abstract
 2013-07-24 02:45:35 +02:00
Joseph Warner
c26b68cc54 [feature/oauth] Update error message with actual error 
PHPBB3-11673
 2013-07-23 19:27:55 -04:00
Joseph Warner
9805927fac [feature/oauth] OAuth init method to minimally validate entered data 
PHPBB3-11673
 2013-07-23 15:26:57 -04:00
Joseph Warner
77c3264543 [feature/oauth] OAuth acp() method to return config field names 
PHPBB3-11673
 2013-07-23 14:53:02 -04:00
Joseph Warner
0857d14030 [feature/oauth] Update auth provider interface docs for block vars in ACP 
PHPBB3-11673
 2013-07-23 14:41:46 -04:00
Joseph Warner
af6a4b2161 [feature/oauth] Clean up the OAuth ACP template 
PHPBB3-11673
 2013-07-23 14:30:06 -04:00
Joseph Warner
2fc4be1a31 [feature/oauth] Fix language bug with new ACP OAuth template 
PHPBB3-11673
 2013-07-23 14:24:50 -04:00
Joseph Warner
32678f63ed [feature/oauth] Finish the template so it "works" 
PHPBB3-11673
 2013-07-23 14:14:09 -04:00
Joseph Warner
93cbdc37b5 [feature/oauth] ACP options for OAuth, needs some work 
PHPBB3-11673
 2013-07-23 14:06:24 -04:00
Nathan Guse
bf04bfcced [ticket/11667] Use @inheritdoc 
PHPBB3-11667
 2013-07-23 11:16:23 -05:00
Nathan Guse
485c6ab355 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667 
# By Joas Schilling (224) and others
# Via Andreas Fischer (23) and others
* 'develop' of github.com:phpbb/phpbb3: (385 commits)
  [ticket/11734] Readd accidently removed language strings of forum permissions
  [ticket/11620] Whitespace and combine function into test_case
  [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
  [ticket/11620] Changed incorrect global variable
  [ticket/11620] Minor indentation changes and comment clarity
  [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
  [ticket/11733] Add browse test for feed.php
  [ticket/11731] Remove static calls to captcha garbage collector
  [ticket/11728] Replace topic_approved with topic_visibility
  [ticket/11620] Expected and actual test conditions wrongly swapped
  [ticket/11620] Space between . in directory import concatenation
  [ticket/11620] Changes to match merge
  [ticket/11620] Changes for code guidelines consistency
  [ticket/11620] Fix a static calls to non-static for session captcha
  [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
  [ticket/11620] Update auth_provider for new interface
  [ticket/11620] Added garbage_collection_test
  [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
  [ticket/11620] Fixed a typo on check_ban_test
  [ticket/11620]  Refactored check_isvalid_test to use session_test_case
  ...
 2013-07-23 11:13:25 -05:00
Nathan Guse
be59885d5f Merge pull request #1601 from nickvergessen/ticket/11734 
[ticket/11734] Readd accidently removed language strings of forum permissions
 2013-07-23 07:31:10 -07:00
Nathaniel Guse
0f83d7fd6c [ticket/11701] New line at EOF 
PHPBB3-11701
 2013-07-23 09:28:24 -05:00
Nathaniel Guse
30bfd7fb61 [ticket/11701] Test events in loops 
PHPBB3-11701
 2013-07-23 09:28:24 -05:00
Nathaniel Guse
ea250a5ef5 [ticket/11701] Refix regex for appending |length 
PHPBB3-11701
 2013-07-23 09:28:23 -05:00
Nathaniel Guse
2d764ef7d5 [ticket/11701] Fix regex for appending |length 
PHPBB3-11701
 2013-07-23 09:27:32 -05:00
Nathaniel Guse
c0b9db1c62 [ticket/11701] Fix loops var check 
PHPBB3-11701
 2013-07-23 09:26:50 -05:00
Joas Schilling
1d2d3032d3 [ticket/11734] Readd accidently removed language strings of forum permissions 
PHPBB3-11734
 2013-07-23 16:26:01 +02:00
Nathaniel Guse
0d31420ae0 [ticket/11701] Remove useless str_replace 
PHPBB3-11701
 2013-07-23 09:25:58 -05:00
Nathaniel Guse
6b0b0f2a9f [ticket/11701] Loop variables are not passed correctly to events 
PHPBB3-11701
 2013-07-23 09:25:57 -05:00
Bruno Ais
c366998112 [ticket/11654] Moved some code to reduce line width. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
 2013-07-23 12:47:18 +01:00
Andreas Fischer
7d8e80241c Merge remote-tracking branch 'EXreaction/ticket/11718' into develop 
* EXreaction/ticket/11718:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Conflicts:
	tests/template/template_test.php
 2013-07-23 04:24:05 +02:00
Andreas Fischer
1004aaf787 Merge remote-tracking branch 'asperous/ticket/11620' into develop 
* asperous/ticket/11620: (46 commits)
  [ticket/11620] Whitespace and combine function into test_case
  [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
  [ticket/11620] Changed incorrect global variable
  [ticket/11620] Minor indentation changes and comment clarity
  [ticket/11620] Expected and actual test conditions wrongly swapped
  [ticket/11620] Space between . in directory import concatenation
  [ticket/11620] Changes to match merge
  [ticket/11620] Changes for code guidelines consistency
  [ticket/11620] Fix a static calls to non-static for session captcha
  [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
  [ticket/11620] Update auth_provider for new interface
  [ticket/11620] Added garbage_collection_test
  [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
  [ticket/11620] Fixed a typo on check_ban_test
  [ticket/11620]  Refactored check_isvalid_test to use session_test_case
  [ticket/11615] Refactored isvalid test to be more imperative
  [ticket/11615]  Rename continue -> check_isvalid for clarity
  [ticket/11620] Added a test for checking if users are banned
  [ticket/11620] Remove typo in beginning of session_key_test
  [ticket/11620] Typo in file name session_key_tests -> test
  ...
 2013-07-23 03:12:33 +02:00
Andy Chase
2fe2724e68 [ticket/11620] Whitespace and combine function into test_case 
PHPBB3-11620
 2013-07-22 17:39:45 -07:00
Andy Chase
0c54fb034b [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity 
PHPBB3-11620
 2013-07-22 17:39:14 -07:00
Andy Chase
568de3b8ce [ticket/11620] Changed incorrect global variable 
PHPBB3-11620
 2013-07-22 16:27:22 -07:00
Andy Chase
cc6147f876 [ticket/11620] Minor indentation changes and comment clarity 
PHPBB3-11620
 2013-07-22 16:27:18 -07:00
Andy Chase
be16459b89 Merge branch 'develop' into ticket/11620 2013-07-22 16:27:07 -07:00
Andreas Fischer
017d809e74 Merge remote-tracking branch 'nickvergessen/ticket/11733' into develop 
* nickvergessen/ticket/11733:
  [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
  [ticket/11733] Add browse test for feed.php
 2013-07-23 01:17:13 +02:00
Joas Schilling
10ba1e73da [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed 
PHPBB3-11733
 2013-07-23 00:59:51 +02:00
Joas Schilling
8dc8ee205a [ticket/11733] Add browse test for feed.php 
PHPBB3-11733
 2013-07-23 00:58:03 +02:00
Andreas Fischer
7c8e71845f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11726] Don't run lint tests on Travis on postgres
 2013-07-23 00:33:07 +02:00
Andreas Fischer
c0795cc4da Merge remote-tracking branch 'EXreaction/ticket/11726' into develop-olympus 
* EXreaction/ticket/11726:
  [ticket/11726] Don't run lint tests on Travis on postgres
 2013-07-23 00:32:58 +02:00
Andreas Fischer
c2d919f12d Merge remote-tracking branch 'asperous/ticket/11731' into develop 
* asperous/ticket/11731:
  [ticket/11731] Remove static calls to captcha garbage collector
 2013-07-23 00:07:38 +02:00
Andy Chase
80f81dd0d2 [ticket/11731] Remove static calls to captcha garbage collector 
PHPBB3-11731
 2013-07-22 15:04:30 -07:00