mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 14:18:24 +01:00
Code Issues Releases Wiki Activity
22,661 Commits 17 Branches 190 Tags
Commit Graph

22661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Callum Macrae
7df97601a3 [ticket/12951] Made editorconfig file comments better 
PHPBB3-12951
 2014-08-10 15:55:02 +02:00
Callum Macrae
07f8edcc26 [ticket/12951] Added editorconfig 
PHPBB3-12951
 2014-08-09 17:33:23 +02:00
Marc Alexander
e4e7a8f849 Merge pull request #2829 from nickvergessen/ticket/12853 
[ticket/12853] Hide moderator link if it is really necessary
 2014-08-07 23:37:35 +02:00
Joas Schilling
9ed71d523a [ticket/12853] Hide moderator link if it is really necessary 
PHPBB3-12853
 2014-08-07 23:27:56 +02:00
Andreas Fischer
8d8d54aac7 Merge pull request #2816 from n-aleha/ticket/12922 
[ticket/12922] Posts per page in MCP should have a min value of zero

* n-aleha/ticket/12922:
  [ticket/12922] Subsilver2 fix
  [ticket/12922] Posts per page in MCP should have a min value of zero
 2014-08-07 18:23:46 +02:00
Dhruv Goel
ba2c40cde9 Merge pull request #2821 from bantu/ticket/12903 
[ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version
 2014-08-07 18:01:11 +02:00
jeroendedauw
f6f6657842 [ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version 
PHPBB3-12903
 2014-08-07 17:52:59 +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
Joas Schilling
9b36b5283c Merge pull request #2761 from Nicofuma/ticket/12873 
[ticket/12873] Test the correct identifier in \phpbb\db\tools

* Nicofuma/ticket/12873:
  [ticket/12873] Add migration to rename the index
  [ticket/12873] Don not touch the existing migrations
  [ticket/12873] Test the good identifier in \phpbb\db\tools
 2014-08-07 16:49:37 +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
Nils Adermann
778483d070 Merge remote-tracking branch 'github-nickvergessen/ticket/12776' into develop-ascraeus 
* github-nickvergessen/ticket/12776:
  [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.html
 2014-08-07 16:25:53 +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
Cesar G
3b7ab23e29 Merge remote-tracking branch 'PayBas/ticket/12832' into develop-ascraeus 
* PayBas/ticket/12832:
  [ticket/12832] Remove old .quick-links icon reference
  [ticket/12832] Remove unnecessary attr and classes
  [ticket/12832] Add footer links to quick-links
  [ticket/12832] Make .small-icon styling uniform
 2014-08-07 16:20:37 +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
n-aleha
035f84d2da [ticket/12922] Subsilver2 fix 
PHPBB3-12922
 2014-08-07 17:10:32 +03:00
Joas Schilling
6bb71e2ca9 Merge pull request #2813 from naderman/ticket/12920 
[ticket/12920] Add composer.json to phpBB/phpbb and fix the one in phpBB/

* naderman/ticket/12920:
  [ticket/12920] Add missing comma
  [ticket/12920] Update composer.lock file after update nothing
  [ticket/12920] Fix sh syntax error in post-update-cmd script
  [ticket/12920] Remove incorrect @ from self.version reference in composer.json
  [ticket/12920] Output warning message about vendor cleaning target
  [ticket/12920] Turn phpBB composer.json into publishable full version
  [ticket/12920] Add require for minimum php version
  [ticket/12920] Add composer.json for phpbb/phpbb-core library
 2014-08-07 16:09:51 +02:00
n-aleha
98155a945f [ticket/12922] Posts per page in MCP should have a min value of zero 
In order to allow displaying the whole topic in MCP=>Main=>View topic,
the min value in the html input field must be 0.

PHPBB3-12922
 2014-08-07 17:08:33 +03:00
Joas Schilling
f1d3d87d47 [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.html 
PHPBB3-12776
 2014-08-07 16:06:44 +02:00
Nils Adermann
be04b6c136 [ticket/12920] Add missing comma 
PHPBB3-12920
 2014-08-07 15:44:36 +02:00
Nils Adermann
b9fb4e3050 [ticket/12920] Update composer.lock file after update nothing 
PHPBB3-12920
 2014-08-07 15:43:44 +02:00
Nils Adermann
9f3e678117 [ticket/12920] Fix sh syntax error in post-update-cmd script 
PHPBB3-12920
 2014-08-07 15:40:57 +02:00
Nils Adermann
9e282b8d4d [ticket/12920] Remove incorrect @ from self.version reference in composer.json 
PHPBB3-12920
 2014-08-07 15:38:04 +02:00
Nils Adermann
e0b7a3e9ff [ticket/12920] Output warning message about vendor cleaning target 
PHPBB3-12920
 2014-08-07 15:37:13 +02:00
Joas Schilling
ef26a6fd64 Merge pull request #2811 from bantu/ticket/12918 
[ticket/12918] Load class fileupload in fileupload_remote_test.php.

* bantu/ticket/12918:
  [ticket/12918] Load class fileupload in fileupload_remote_test.php.
 2014-08-07 15:29:40 +02:00
Nils Adermann
c863136a69 [ticket/12920] Turn phpBB composer.json into publishable full version 
PHPBB3-12920
 2014-08-07 15:26:02 +02:00
Nils Adermann
200c6f2d32 [ticket/12920] Add require for minimum php version 
PHPBB3-12920
 2014-08-07 15:25:47 +02:00
Nils Adermann
3b3da3938d [ticket/12920] Add composer.json for phpbb/phpbb-core library 
PHPBB3-12920
 2014-08-07 15:16:58 +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
aa88d48b37 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
 2014-08-07 14:30:53 +02:00
Andreas Fischer
f8d2dd720f Merge pull request #2809 from nickvergessen/ticket/12917-asc 
Ticket/12917 asc

* nickvergessen/ticket/12917-asc:
  [ticket/12917] Check commit message and image ICC profile on 5.3.3
 2014-08-07 14:30:48 +02:00
Andreas Fischer
f01b602e9f Merge pull request #2808 from nickvergessen/ticket/12917 
[ticket/12917] Check commit message and image ICC profile on 5.3.3

* nickvergessen/ticket/12917:
  [ticket/12917] Check commit message and image ICC profile on 5.3.3
 2014-08-07 14:30:41 +02:00
Tristan Darricau
2b3e15cf64 [ticket/12873] Add migration to rename the index 
PHPBB3-12873
 2014-08-07 14:27:12 +02:00
Andreas Fischer
e523711ec2 [ticket/12826] Add optional root namespace indicator for consistency. 
PHPBB3-12826
 2014-08-07 14:25:53 +02:00
Andreas Fischer
cc1a713fd8 [ticket/12826] Add mandatory root namespace indicator to exception catching. 
PHPBB3-12826
 2014-08-07 14:24:38 +02:00
PayBas
d8d09e0df2 [ticket/12838] Simplify normal special rank array creation 
PHPBB3-12838
 2014-08-07 14:24:21 +02:00
Tristan Darricau
27b4ab9241 [ticket/12873] Don not touch the existing migrations 
PHPBB3-12873
 2014-08-07 14:16:57 +02:00
Andreas Fischer
714ac0b039 [ticket/12918] Load class fileupload in fileupload_remote_test.php. 
PHPBB3-12918
 2014-08-07 14:11:22 +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
7cde9a8ec0 Merge branch 'ticket/12917' into ticket/12917-asc 
* ticket/12917:
  [ticket/12917] Check commit message and image ICC profile on 5.3.3

Conflicts:
	.travis.yml
 2014-08-07 13:43:13 +02:00
Joas Schilling
b700e871cf [ticket/12917] Check commit message and image ICC profile on 5.3.3 
PHPBB3-12917
 2014-08-07 13:40:31 +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
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
Joas Schilling
83544992ec Merge pull request #2644 from Nicofuma/ticket/12051 
[ticket/12051] Optimise Composer Autoloader on Build

* Nicofuma/ticket/12051:
  [ticket/12051] Optimise Composer Autoloader on Build
 2014-08-07 12:30:46 +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
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
n-aleha
9133b913ec [ticket/12557] Fix post data description for notifications 
PHPBB3-12557
 2014-08-07 13:03:11 +03: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
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