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

9932 commits

Author SHA1 Message Date
Marc Alexander
a679380f09 [ticket/14222] Use request class instead of request_var in acp_users 
PHPBB3-14222
 2015-10-08 10:52:00 +02:00
Marc Alexander
b13393078c Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/acp/acp_users.php
 2015-10-07 16:55:57 +02:00
Marc Alexander
cf62b303a6 Merge pull request #3440 from CHItA/ticket/13636 
[ticket/13636] Deleting inactive user in acp_users gives unexpected link
 2015-10-07 16:54:50 +02:00
Marc Alexander
f3ea34b311 Merge branch '3.1.x' 2015-10-07 16:50:43 +02:00
Marc Alexander
e5b2dc922f Merge pull request #3615 from rxu/ticket/13846 
[ticket/13846] Fix softdelete feature workflow in viewtopic
 2015-10-07 16:50:35 +02:00
Marc Alexander
3c448f889f Merge pull request #3871 from Zoddo/ticket/10165 
[ticket/10165] Add a "Send test email" feature
 2015-10-07 15:08:08 +02:00
Tristan Darricau
f3dc2a801d [ticket/14205] Bump PHP requirement to PHP 5.4 
PHPBB3-14205
 2015-10-04 16:19:48 +02:00
Andreas Fischer
85718e63f1 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
 2015-09-22 19:14:34 +02:00
Marc Alexander
d62b03e0de [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting() 
PHPBB3-14186
 2015-09-22 09:50:17 +02:00
Michael Miday
956723af0e [ticket/12769] Properly include FA 2015-09-17 18:37:25 +02:00
Marc Alexander
eab8a12fb8 Merge branch '3.1.x' 2015-09-16 22:48:10 +02:00
Marc Alexander
d92a46ef02 Merge pull request #3833 from rxu/ticket/14102 
[ticket/14102] Add core event to the mcp_topic.php
 2015-09-16 22:47:11 +02:00
Tristan Darricau
087e219a09 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14154] Add extension composer name as tooltip
 2015-09-16 11:58:53 +02:00
Tristan Darricau
a562fea230 Merge pull request #3727 from marc1706/ticket/13904 
[ticket/13904] Refactor attachments functions into service

* marc1706/ticket/13904: (66 commits)
  [ticket/13904] Use filespec's get_filesize instead of calling filesize()
  [ticket/13904] Set properties to protected where possible in filespec
  [ticket/13904] Fix tests after changes to factory
  [ticket/13904] Minor coding style fixes
  [ticket/13904] Add language entries for error messages in upload class
  [ticket/13904] Modify files for updated fast-image-size library
  [ticket/13904] Update composer.lock
  [ticket/13904] Improve code coverage
  [ticket/13904] Add unit tests for local upload type
  [ticket/13904] Minor coding style fixes
  [ticket/13904] Improve test coverage of base upload type class
  [ticket/13904] Improve test coverage of remote upload type
  [ticket/13904] Improve test coverage of form upload type
  [ticket/13904] Improve test coverage of filespec class
  [ticket/13904] Add back tests for retrieving floats
  [ticket/13904] Use ini_get() wrapper in file upload types
  [ticket/13904] Modify files for changes in ini wrapper
  [ticket/13904] Add bantu/ini-get-wrapper to composer.json
  [ticket/13904] Switch around constructor arguments
  [ticket/13904] Use \phpbb\php\ini class for ini_get()
  ...
 2015-09-16 11:55:13 +02:00
Zoddo
a4a99f5ea3 [ticket/14154] Add extension composer name as tooltip 
PHPBB3-14154
 2015-09-12 14:52:31 +02:00
Zoddo
57cb7e4111 [ticket/10165] Add a "Send test email" feature 
PHPBB3-10165
 2015-09-09 17:51:14 +02:00
Marc Alexander
40e614f564 [ticket/13904] Fix tests after changes to factory 
PHPBB3-13904
 2015-09-09 12:58:22 +02:00
Tristan Darricau
2c188f22d0 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/7362] Add alt attribute on topic icons
 2015-09-09 11:06:58 +02:00
Tristan Darricau
c9d159257a Merge pull request #3868 from Zoddo/ticket/7362 
[ticket/7362] Add alt attribute on topic icons

* Zoddo/ticket/7362:
  [ticket/7362] Add alt attribute on topic icons
 2015-09-09 11:06:36 +02:00
Tristan Darricau
542d75b3a9 Merge pull request #3870 from Zoddo/ticket/9485 
[ticket/9485] Add a "View post" link in the moderation logs

* Zoddo/ticket/9485:
  [ticket/9485] Fix tests
  [ticket/9485] Add post_id to relevant $phpbb_log->add()
  [ticket/9485] Add a "View post" link in the moderation logs
 2015-09-09 11:04:13 +02:00
Tristan Darricau
b83ce0a702 Merge pull request #3876 from VSEphpbb/ticket/14138 
[ticket/14138] Use span tags instead of abbr

* VSEphpbb/ticket/14138:
  [ticket/14138] Use span tags instead of abbr
 2015-09-09 11:02:22 +02:00
Marc Alexander
adcc901af1 [ticket/13904] Fix minor issues and move local_upload to its own class 
PHPBB3-13904
 2015-09-09 08:27:58 +02:00
Marc Alexander
11b2c938c6 [ticket/13904] Move form_upload to its own class and define type classes 
PHPBB3-13904
 2015-09-09 08:27:56 +02:00
Marc Alexander
25df7f8149 [ticket/13904] Remove functions_fileupload.php 
PHPBB3-13904
 2015-09-09 08:27:47 +02:00
Marc Alexander
0a98fc2561 [ticket/13904] Remove fileupload class 
PHPBB3-13904
 2015-09-09 08:27:41 +02:00
Marc Alexander
a96e7a8ec6 [ticket/13904] Get rid of useless parameters and variables 
PHPBB3-13904
 2015-09-09 08:27:40 +02:00
Marc Alexander
1af6f052d8 [ticket/13904] Load upload class using factory 
PHPBB3-13904
 2015-09-09 08:27:37 +02:00
Marc Alexander
92e49cd0ac [ticket/13904] Turn filespec into prototype and improve init methods 
PHPBB3-13904
 2015-09-09 08:27:36 +02:00
Marc Alexander
0cbb713cc2 [ticket/13904] Fix uploading for use with new filespec class 
PHPBB3-13904
 2015-09-09 08:27:35 +02:00
Marc Alexander
891ffb8ac7 [ticket/13904] Remove filespec class from functions_upload 
PHPBB3-13904
 2015-09-09 08:27:13 +02:00
Tristan Darricau
dccc0877c1 Merge pull request #3891 from marc1706/ticket/14150 
[ticket/14150] Update fast-image-size to newest version

* marc1706/ticket/14150:
  [ticket/14150] Update fast-image-size to newest version
 2015-09-09 00:16:22 +02:00
Marc Alexander
9d18b3d1ee Merge branch '3.1.x' 2015-09-08 13:35:04 +02:00
Marc Alexander
90d5eefccf Merge pull request #3881 from VSEphpbb/ticket/14142 
[ticket/14142] Remove unused ignore_configs from avatar drivers
 2015-09-08 13:34:58 +02:00
Marc Alexander
58286171f1 [ticket/14150] Update fast-image-size to newest version 
PHPBB3-14150
 2015-09-08 12:59:55 +02:00
Marc Alexander
3ddee852fa Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/functions_messenger.php
 2015-09-07 12:16:12 +02:00
Tristan Darricau
0e93efd7cb [ticket/14143] Flush the mail queue when writing it 
PHPBB3-14143
 2015-09-05 17:53:29 +02:00
Matt Friedman
076807c63a [ticket/14142] Remove unused ignore_configs from avatar drivers 
PHPBB3-14142
 2015-09-04 13:38:14 -07:00
Matt Friedman
b4dbb5b249 [ticket/14138] Use span tags instead of abbr 
PHPBB3-14138
 2015-09-01 15:13:12 -07:00
Tristan Darricau
5b8164a1bb Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13950] Hide undefined categories
  [ticket/13950] Hide undefined permissions
 2015-09-01 21:47:19 +02:00
Tristan Darricau
8749c99e34 Merge pull request #3765 from Zoddo/ticket/13950 
[ticket/13950] Hide undefined permissions

* Zoddo/ticket/13950:
  [ticket/13950] Hide undefined categories
  [ticket/13950] Hide undefined permissions
 2015-09-01 21:47:05 +02:00
Tristan Darricau
9faf434d37 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14133] Comment fix for phpbb_get_user_rank()
 2015-09-01 18:51:10 +02:00
lavigor
3fe517f50c [ticket/14133] Comment fix for phpbb_get_user_rank() 
PHPBB3-14133
 2015-08-31 21:49:22 +03:00
Zoddo
51600b8f18 [ticket/9485] Add post_id to relevant $phpbb_log->add() 
PHPBB3-9485
 2015-08-30 22:43:07 +02:00
Zoddo
306fbf23a8 [ticket/9485] Add a "View post" link in the moderation logs 
PHPBB3-9485
 2015-08-30 19:52:00 +02:00
Zoddo
a606b1c480 [ticket/7362] Add alt attribute on topic icons 
PHPBB3-7362
 2015-08-30 14:37:28 +02:00
Zoddo
af246483e2 [ticket/13950] Hide undefined categories 
This hides the categories added by disabled extensions

PHPBB3-13950
 2015-08-28 18:56:10 +02:00
Zoddo
11b2bffa8e [ticket/13950] Hide undefined permissions 
This hides the permissions of the disabled extensions

PHPBB3-13950
 2015-08-28 18:43:59 +02:00
Tristan Darricau
c3ceafb37d Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
 2015-08-28 16:40:41 +02:00
Tristan Darricau
624f5ae921 Merge pull request #3835 from rxu/ticket/14106 
[ticket/14106] Fix topics sorting in MCP for topics merging.

* rxu/ticket/14106:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
 2015-08-28 16:40:33 +02:00
Tristan Darricau
9e0a075be1 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14070] Properly pass whether config should be ignored for avatars
 2015-08-28 16:28:59 +02:00