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

9082 Commits

Author SHA1 Message Date
Tristan Darricau
e7e6d45789 [ticket/12957] Update the constructions of the template engine 
PHPBB3-12957
 2014-08-10 03:32:27 +02:00
Tristan Darricau
59b5ab4866 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
 2014-08-10 01:02:38 +02:00
Tristan Darricau
b000d10ef8 Merge pull request #2849 from bantu/ticket/12941 
[ticket/12941] Check for Sami parse errors on Travis CI.

* bantu/ticket/12941:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
 2014-08-10 01:02:27 +02:00
Andreas Fischer
076d4ddd7f [ticket/12941] Fix remaining Sami complaints. 
PHPBB3-12941
 2014-08-09 18:08:49 +02:00
Tristan Darricau
04c084ead8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
 2014-08-09 17:50:54 +02:00
Tristan Darricau
86f94f922c Merge pull request #2624 from dhruvgoel92/ticket/12718 
[ticket/12718] Use remove_topic_from_statistic() for delete_topic

* dhruvgoel92/ticket/12718:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
 2014-08-09 17:33:44 +02:00
Marc Alexander
4840584cd6 Merge branch 'develop-ascraeus' into develop 2014-08-09 13:06:01 +02:00
Marc Alexander
20b8ea947c Merge pull request #2833 from Geolim4/ticket/11520 
[ticket/11520] Re-adjust userpost count on topic fork
 2014-08-09 13:00:34 +02:00
Joas Schilling
d497104671 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
 2014-08-09 11:44:18 +02:00
Joas Schilling
7a016572bd Merge pull request #2724 from VSEphpbb/ticket/12841 
[ticket/12841] Allow extensions to position new config vars

* VSEphpbb/ticket/12841:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
 2014-08-09 11:43:56 +02:00
Geolim4
3825aee130 [ticket/11520] Re-adjust userpost count on topic fork 
PHPBB3-11520
 2014-08-08 17:07:29 +02:00
Geolim4
af67bd3ea5 [ticket/11520] Coding guideline compliance 
PHPBB3-11520
 2014-08-08 17:07:16 +02:00
Geolim4
fc1e420a7c [ticket/11520] Re-adjust userpost count on topic fork 
PHPBB3-11520
 2014-08-08 17:05:40 +02:00
Andreas Fischer
eeb80d2ec5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
 2014-08-08 16:03:25 +02:00
Andreas Fischer
42c26cd781 Merge pull request #2832 from marc1706/ticket/10404 
[ticket/10404] Use anonymous function instead of create_function in acp/auth

* marc1706/ticket/10404:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
 2014-08-08 16:03:24 +02:00
Joas Schilling
55c21834ad Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
 2014-08-08 14:52:55 +02:00
Joas Schilling
96e9d728b9 Merge pull request #2824 from brunoais/ticket/12927 
[ticket/12927] core.mcp_queue_get_posts2_query_before

* brunoais/ticket/12927:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
 2014-08-08 14:52:35 +02:00
Joas Schilling
4e66d7bdd9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
 2014-08-08 14:36:10 +02:00
Joas Schilling
53247573c2 Merge pull request #2764 from brunoais/ticket/12880 
[ticket/12880] core.mcp_queue_!is_topics_query_before

* brunoais/ticket/12880:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
 2014-08-08 14:35:53 +02:00
Joas Schilling
b7f4d98cf2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
 2014-08-08 14:33:11 +02:00
Joas Schilling
bef9d64179 Merge pull request #2762 from brunoais/ticket/12876 
[ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after

* brunoais/ticket/12876:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
 2014-08-08 14:32:55 +02:00
Marc Alexander
27f769e461 [ticket/10404] Fix codesniffer complaint about anonymous function 
PHPBB3-10404
 2014-08-08 14:01:04 +02:00
Marc Alexander
c5d72c94f1 [ticket/10404] Use anonymous function instead of create_function in acp/auth 
PHPBB3-10404
 2014-08-08 12:19:36 +02:00
brunoais
0679f76287 [ticket/12927] core.mcp_queue_get_posts2_query_before 
Adding the core.mcp_queue_get_posts2_query_before
event to mcp backend.

PHPBB3-12927
 2014-08-08 10:52:08 +01:00
brunoais
1f5f2327e8 [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after 
Adding the core.mcp_mcp_front.mcp_front_view_queue_topicid_list_after
event to mcp backend.

PHPBB3-12876
 2014-08-07 18:37:07 +01:00
brunoais
50cc81afa3 [ticket/12880] core.mcp_queue_!is_topics_query_before 
Adding core.mcp_queue_is_topics_query_before

PHPBB3-12880
 2014-08-07 18:33:37 +01:00
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
Dhruv
17e360225d [ticket/12718] Use remove_topic_from_statistic() for delete_topic 
PHPBB3-12718
 2014-08-07 17:19:14 +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