mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
23,178 Commits 17 Branches 190 Tags
Commit Graph

9051 Commits

Author SHA1 Message Date
Marc Alexander
bfae68583a Merge branch 'develop-ascraeus' into develop 2014-08-07 17:36:52 +02:00
Marc Alexander
a8dee3fb65 Merge pull request #2810 from nickvergessen/ticket/12919 
[ticket/12919] Use the modules basename as identifier for extension modules
 2014-08-07 17:36:19 +02:00
Tristan Darricau
8f1be5e741 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
 2014-08-07 16:46:31 +02:00
Tristan Darricau
ab8a197e92 Merge pull request #2623 from dhruvgoel92/ticket/12738 
[ticket/12738] Move related code from functions_posting to function

* dhruvgoel92/ticket/12738:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
 2014-08-07 16:44:49 +02:00
Joas Schilling
9925733350 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
 2014-08-07 16:24:48 +02:00
Joas Schilling
a2b6f4e166 Merge pull request #2812 from bantu/ticket/12826 
[ticket/12826] Add root namespace indicator to exception catching.

* bantu/ticket/12826:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
 2014-08-07 16:24:41 +02:00
Joas Schilling
05b290c6b2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html
 2014-08-07 16:13:46 +02:00
Joas Schilling
0194c261c3 Merge pull request #2720 from PayBas/ticket/12838 
[ticket/12838] Add ACP events to acp_ranks

* PayBas/ticket/12838:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html
 2014-08-07 16:13:35 +02:00
Marc Alexander
d1cd81785e Merge branch 'develop-ascraeus' into develop 2014-08-07 15:09:42 +02:00
Marc Alexander
1304ccc02b Merge pull request #2763 from brunoais/ticket/12877 
[ticket/12877] core.mcp_mcp_front_reports_listing_query_before
 2014-08-07 15:09:18 +02:00
Andreas Fischer
e523711ec2 [ticket/12826] Add optional root namespace indicator for consistency. 
PHPBB3-12826
 2014-08-07 14:25:53 +02:00
Joas Schilling
f1419ab27e [ticket/12919] Use the modules basename as identifier for extension modules 
PHPBB3-12919
 2014-08-07 14:06:45 +02:00
Joas Schilling
3722aac495 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12847] Allow the extensions to say if they can be enabled
 2014-08-07 13:00:21 +02:00
Joas Schilling
f474e33a43 Merge pull request #2729 from Nicofuma/ticket/12847 
[ticket/12847] Allow the extensions to say if they can be enabled

* Nicofuma/ticket/12847:
  [ticket/12847] Allow the extensions to say if they can be enabled
 2014-08-07 13:00:08 +02:00
Joas Schilling
28224bad70 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12557] Fix load active module description
  [ticket/12557] Fix php file description
  [ticket/12557] Fix post data description for notifications
  [ticket/12557] Fix pass by reference doc blocks
  [ticket/12557] Fix doc block in extension base class
  [ticket/12557] Fix doc block in mimetype guesser
  [ticket/12557] Fix var $preserve_cr description
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Template fixes
  [ticket/12557] Search, cron and profilefields fixes
  [ticket/12557] Notification fixes
  [ticket/12557] Fix doc block errors found by Sami pt1
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
 2014-08-07 12:44:10 +02:00
Joas Schilling
2f44a865a0 Merge pull request #2477 from n-aleha/ticket/12557ascraeus 
[ticket/12557] Fix doc block errors found by Sami for ascraeus

* n-aleha/ticket/12557ascraeus:
  [ticket/12557] Fix load active module description
  [ticket/12557] Fix php file description
  [ticket/12557] Fix post data description for notifications
  [ticket/12557] Fix pass by reference doc blocks
  [ticket/12557] Fix doc block in extension base class
  [ticket/12557] Fix doc block in mimetype guesser
  [ticket/12557] Fix var $preserve_cr description
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Template fixes
  [ticket/12557] Search, cron and profilefields fixes
  [ticket/12557] Notification fixes
  [ticket/12557] Fix doc block errors found by Sami pt1
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
 2014-08-07 12:43:45 +02:00
n-aleha
cea0cfa6f8 [ticket/12557] Fix load active module description 
PHPBB3-12557
 2014-08-07 13:22:07 +03:00
n-aleha
8006746780 [ticket/12557] Fix php file description 
PHPBB3-12557
 2014-08-07 13:19:49 +03:00
Nils Adermann
89a6fed91d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11148] Remove unneeded variable mimetype and use type octet-stream
  [ticket/11148] Change expected output with disallowed content in test
  [ticket/11148] Always use the output of the mimetype guesser in get_mimetype
  [ticket/11148] Get rid of extra line in mimetype guesser setter doc block
  [ticket/11148] Add missing parts to docblock of get_mimetype() method
  [ticket/11148] Default to application/octet-stream if no mimetype given
  [ticket/11148] Use mimetype guesser for uploaded avatars
  [ticket/11148] Pass mimetype guesser to upload_attachment() function
  [ticket/11148] Add mimetype guesser to filespec and fileupload class
 2014-08-07 12:06:49 +02:00
Nils Adermann
b203b4afa1 Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus 
* github-marc1706/ticket/11148:
  [ticket/11148] Remove unneeded variable mimetype and use type octet-stream
  [ticket/11148] Change expected output with disallowed content in test
  [ticket/11148] Always use the output of the mimetype guesser in get_mimetype
  [ticket/11148] Get rid of extra line in mimetype guesser setter doc block
  [ticket/11148] Add missing parts to docblock of get_mimetype() method
  [ticket/11148] Default to application/octet-stream if no mimetype given
  [ticket/11148] Use mimetype guesser for uploaded avatars
  [ticket/11148] Pass mimetype guesser to upload_attachment() function
  [ticket/11148] Add mimetype guesser to filespec and fileupload class
 2014-08-07 12:06:33 +02:00
Joas Schilling
57f9a96f4b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12836] Add event core.functions.redirect
 2014-08-07 11:47:44 +02:00
Joas Schilling
a8cb525f77 Merge pull request #2717 from Nicofuma/ticket/12836 
[ticket/12836] Add event core.functions.redirect

* Nicofuma/ticket/12836:
  [ticket/12836] Add event core.functions.redirect
 2014-08-07 11:47:37 +02:00
n-aleha
9d285bdcf5 [ticket/12557] Fix pass by reference doc blocks 
PHPBB3-12557
 2014-08-07 11:39:04 +03:00
Marc Alexander
3e52126446 Merge branch 'develop-ascraeus' into develop 2014-08-06 23:42:35 +02:00
Marc Alexander
decc896bf5 Merge pull request #2799 from nickvergessen/ticket/12901 
Ticket/12901 Wrong type hint in show_available_child_styles() doc block
 2014-08-06 23:42:04 +02:00
Marc Alexander
e49de53115 Merge branch 'develop-ascraeus' into develop 2014-08-06 23:38:28 +02:00
Marc Alexander
964bf0b9f5 Merge pull request #2807 from nickvergessen/ticket/12875 
[ticket/12875] Find language files in the default and english language
 2014-08-06 23:37:55 +02:00
Joas Schilling
ae4069acbd Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12913] Add more parameters to core.submit_post_end event
 2014-08-06 23:15:39 +02:00
Joas Schilling
591d04157e [ticket/12875] Find language files in the default and english language ... 
... when looking for info_xcp_ files.

PHPBB3-12875
 2014-08-06 23:04:33 +02:00
rxu
a9c3c4056c [ticket/12913] Add more parameters to core.submit_post_end event 
As @event core.modify_submit_post_data can modify any of the
function submit_post parameters, they may be needed to perform
actions directly after a post or topic has been submitted in
@event core.submit_post_end (includes/functions_posting.php).

PHPBB3-12913
 2014-08-06 15:48:26 +08:00
Tristan Darricau
f3f54922be [ticket/12836] Add event core.functions.redirect 
PHPBB3-12836
 2014-08-04 10:19:32 +02:00
Joas Schilling
7755f5354f [ticket/12901] Fix another wrong type hint for $level 
PHPBB3-12901
 2014-08-03 22:42:17 +02:00
jeroendedauw
1d923260a6 [ticket/12901] Fix type hinting of style $level 
PHPBB3-12901
 2014-08-03 22:42:16 +02:00
n-aleha
6d7689f581 [ticket/12557] Fix var $preserve_cr description 
PHPBB3-12557
 2014-08-03 07:13:21 +03:00
n-aleha
95ec9590df [ticket/12557] Fix doc block errors found by Sami 
PHPBB3-12557
 2014-08-03 07:13:20 +03:00
n-aleha
6ac8d17af6 [ticket/12557] Fix doc block errors found by Sami 
More corrections.

PHPBB3-12557
 2014-08-03 07:13:20 +03:00
n-aleha
ffcf45abf3 [ticket/12557] Fix doc block errors found by Sami pt1 
PHPBB3-12557
 2014-08-03 07:03:08 +03:00
n-aleha
8ac8c9ec61 [ticket/12557] Fix doc block errors found by Sami 
More corrections.

PHPBB3-12557
 2014-08-03 06:57:05 +03:00
n-aleha
19b9df7e63 [ticket/12557] Fix doc block errors found by Sami 
PHPBB3-12557
 2014-08-03 06:57:05 +03:00
Joas Schilling
dd86615c63 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12895] Rename user style setting to resolve conflict with style param
 2014-08-02 13:56:30 +02:00
Joas Schilling
c991b1d587 Merge pull request #2782 from marc1706/ticket/12895 
[ticket/12895] Rename user style setting to resolve conflict with style param

* marc1706/ticket/12895:
  [ticket/12895] Rename user style setting to resolve conflict with style param
 2014-08-02 13:56:16 +02:00
Joas Schilling
e0f5a37d81 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12902] Remove duplicate entry in switch statement
 2014-08-02 13:46:22 +02:00
Joas Schilling
66f859d109 Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeus 
* ticket/JeroenDeDauw/12902:
  [ticket/12902] Remove duplicate entry in switch statement
 2014-08-02 13:46:13 +02:00
jeroendedauw
626234aece [ticket/12902] Remove duplicate entry in switch statement 
PHPBB3-12902
 2014-08-02 13:44:51 +02:00
Marc Alexander
69682372bb Merge branch 'develop-ascraeus' into develop 2014-08-01 23:31:55 +02:00
Marc Alexander
ce2c31d18a Merge remote-tracking branch 'brunoais/ticket/12801' into develop-ascraeus 2014-08-01 23:31:31 +02:00
Marc Alexander
fab25164a0 Merge branch 'develop-ascraeus' into develop 2014-08-01 23:28:30 +02:00
Marc Alexander
5b2e962934 Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeus 2014-08-01 23:27:55 +02:00
Joas Schilling
76dbe95afc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11480] Header file
  [ticket/11480] Fix unit tests
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
 2014-08-01 22:24:06 +02:00
brunoais
47bfe2999d [ticket/12801] Changed name change @since as requested 
Changed name to core.load_drafts_draft_list_result as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12801
 2014-08-01 11:12:29 +01:00