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

23481 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
93124cbe58 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12918] Load class fileupload in fileupload_remote_test.php.
 2014-08-07 15:29:46 +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
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
d8338ded47 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12917] Check commit message and image ICC profile on 5.3.3
 2014-08-07 14:31:04 +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
Tristan Darricau
079f1e2f41 [ticket/12693] Fix composer.phar path 
PHPBB3-12693
 2014-08-07 14:00:43 +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
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
Joas Schilling
f8046cc253 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12051] Optimise Composer Autoloader on Build
 2014-08-07 12:30:55 +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
Joas Schilling
58d1dcc7f2 Merge pull request #2637 from Nicofuma/ticket/12387 
[ticket/12387] Cleanup *_free_result call and remove @ on that call

* Nicofuma/ticket/12387:
  [ticket/12387] Fix a call to sql_freeresult in full_text_native
  [ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult
  [ticket/12387] Use the hash as query_id for caching
  [ticket/12387] Remove unnecessary checks
  [ticket/12387] mssql_query return true if a select query returns 0 row
  [ticket/12387] Cleanup *_free_result call and remove @ on that call
 2014-08-07 12:09:01 +02: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
n-aleha
9133b913ec [ticket/12557] Fix post data description for notifications 
PHPBB3-12557
 2014-08-07 13:03:11 +03: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
cadf4dd56a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12912] Undefined index when adding logs from extensions
 2014-08-06 23:36:11 +02:00
Joas Schilling
ca11018760 Merge pull request #2798 from tmbackoff/ticket/12912 
[ticket/12912] Undefined index when adding logs from extensions

* tmbackoff/ticket/12912:
  [ticket/12912] Undefined index when adding logs from extensions
 2014-08-06 23:35:59 +02:00
Joas Schilling
61bc6c4c67 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12910] Set get_name for Google+ fields
 2014-08-06 23:28:10 +02:00
Joas Schilling
0328bc38a4 Merge pull request #2795 from Dragooon/ticket/12910 
[ticket/12910] Set get_name for Google+ fields

* Dragooon/ticket/12910:
  [ticket/12910] Set get_name for Google+ fields
 2014-08-06 23:27:44 +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
243ca3ae82 Merge pull request #2806 from rxu/ticket/12913 
[ticket/12913] Add more parameters to core.submit_post_end event

* rxu/ticket/12913:
  [ticket/12913] Add more parameters to core.submit_post_end event
 2014-08-06 23:14:06 +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
n-aleha
e6d6977750 [ticket/12557] Fix doc block in extension base class 
PHPBB3-12557
 2014-08-06 15:34:42 +03:00