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

27248 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cesar G
9ec8faff32 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13684] Prevent horizontal resize of attach comment textarea
 2015-10-14 04:29:50 -07:00
Cesar G
50bf3411d4 Merge pull request #3959 from marc1706/ticket/13684 
[ticket/13684] Prevent horizontal resize of attach comment textarea
 2015-10-14 04:28:34 -07:00
Richard McGirr
a49a3091f9 [ticket/13851] Fix ignore flood limit check 
PHPBB3-13851
 2015-10-14 07:25:35 -04:00
Cesar G
fb3073029f [ticket/9153] Allow users without u_sendpm permission to delete existing PM's. 
The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the
error message within the UCP template. Otherwise it could be removed as
compose_pm() will check the appropriate permission pertaining to the attempted
action.

PHPBB3-9153
 2015-10-14 03:09:06 -07:00
Marc Alexander
57a2e63300 Merge branch '3.1.x' 
Conflicts:
	.travis.yml
 2015-10-14 12:04:58 +02:00
Marc Alexander
3367f0036a Merge pull request #3977 from Nicofuma/ticket/14236 
[ticket/14236] Don't dump Opcache config in Travis
 2015-10-14 12:04:12 +02:00
Tristan Darricau
69b57eab5e [ticket/14236] Don't dump Opcache config in Travis 
PHPBB3-14236
 2015-10-14 11:46:47 +02:00
Marc Alexander
6bcec956ba [ticket/13684] Prevent horizontal resize of attach comment textarea 
PHPBB3-13684
 2015-10-14 11:13:15 +02:00
Marc Alexander
fd0ddd6b76 Merge pull request #3974 from Nicofuma/ticket/14238 
[ticket/14238] Updates Symfony
 2015-10-14 10:57:00 +02:00
Marc Alexander
9ebbf2099b Merge branch '3.1.x' 
Conflicts:
	.travis.yml
 2015-10-14 10:42:57 +02:00
Marc Alexander
ccb3d0ac78 Merge pull request #3973 from Nicofuma/ticket/14236 
[ticket/14236] Disable Opcache on Travis when running the tests
 2015-10-14 10:41:06 +02:00
Tristan Darricau
83969053c0 [ticket/14238] Updates Symfony 
PHPBB3-14238
 2015-10-14 10:25:52 +02:00
Tristan Darricau
e0fb680dbb Merge branch '3.1.x' 
* 3.1.x:
  [ticket/10572] Unguarded includes in acp files
 2015-10-14 10:17:04 +02:00
Tristan Darricau
6572164754 Merge pull request #3542 from RMcGirr83/ticket/10572 
[ticket/10572] Unguarded includes in acp files

* RMcGirr83/ticket/10572:
  [ticket/10572] Unguarded includes in acp files
 2015-10-14 10:09:36 +02:00
Tristan Darricau
345e8ad822 [ticket/14236] Disable Opcache on Travis when running the tests 
PHPBB3-14236
 2015-10-14 09:45:11 +02:00
Tristan Darricau
1d6e173259 Merge pull request #3965 from marc1706/ticket/14234 
[ticket/14234] Use replacement variables instead of references in events

* marc1706/ticket/14234:
  [ticket/14234] Fix event doc blocks
  [ticket/14234] Get rid of undefined variables
  [ticket/14234] Fix change version and remove more references
  [ticket/14234] Replace more references with variables
  [ticket/14234] Use replacement variables instead of references in events
 2015-10-14 08:59:17 +02:00
Tristan Darricau
cac090b659 Merge pull request #3913 from marc1706/ticket/14168 
[ticket/14168] Refactor attachment management functions into classes

* marc1706/ticket/14168: (36 commits)
  [ticket/14168] Correctly state return type of upload and upload_attachment
  [ticket/14168] Use attachment manager instead of separate classes
  [ticket/14168] Fix docblock in manager
  [ticket/14168] Add more test cases for attachment manager
  [ticket/14168] Add new test method and more tests
  [ticket/14168] Fix tabs in manager and add test file
  [ticket/14168] Fix tests after rebase
  [ticket/14168] Add attachment manager service
  [ticket/14168] Use correct docblock
  [ticket/14168] Add services_attachment.yml to services.yml
  [ticket/14168] Minor coding style fixes
  [ticket/14168] Move attachment service definitions to services_attachment
  [ticket/14168] Improve code coverage in upload class
  [ticket/14168] Move image check and don't use trigger_error()
  [ticket/14168] Add tests for init_error() during upload
  [ticket/14168] Add basic test file for attachments upload
  [ticket/14168] Fix CS issue
  [ticket/14168] No longer use deprecated functions in core files
  [ticket/14168] Move phpbb_unlink() into attachment delete class
  [ticket/14168] Reset sequence before tests in delete tests
  ...
 2015-10-14 08:40:01 +02:00
Tristan Darricau
359ef56e35 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13835] Normalize filename for attachments uploaded in chunks.
 2015-10-14 08:38:32 +02:00
Tristan Darricau
bdf69817be Merge pull request #3968 from prototech/ticket/13835 
[ticket/13835] Normalize filename for attachments uploaded in chunks.

* prototech/ticket/13835:
  [ticket/13835] Normalize filename for attachments uploaded in chunks.
 2015-10-14 08:38:15 +02:00
Andreas Fischer
a0f1365953 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14114] Update 3.0.x version references in INSTALL.html.
 2015-10-14 08:33:36 +02:00
Andreas Fischer
9ebc369d74 Merge pull request #3969 from prototech/ticket/14114 
[ticket/14114] Update 3.0.x version references in INSTALL.html.

* prototech/ticket/14114:
  [ticket/14114] Update 3.0.x version references in INSTALL.html.
 2015-10-14 08:33:35 +02:00
Cesar G
14966a2962 [ticket/14114] Update 3.0.x version references in INSTALL.html. 
PHPBB3-14114
 2015-10-13 21:05:04 -07:00
Cesar G
655f244c4f [ticket/13835] Normalize filename for attachments uploaded in chunks. 
PHPBB3-13835
 2015-10-13 20:17:26 -07:00
Richard McGirr
d003b53922 [ticket/10572] Unguarded includes in acp files 
PHPBB3-10572
 2015-10-13 11:52:52 -04:00
Marc Alexander
102d737d81 [ticket/14234] Fix event doc blocks 
PHPBB3-14234
 2015-10-12 22:20:52 +02:00
Marc Alexander
75e5e2471e [ticket/14234] Get rid of undefined variables 
PHPBB3-14234
 2015-10-12 21:56:09 +02:00
Marc Alexander
578ee077c1 [ticket/14234] Fix change version and remove more references 
PHPBB3-14234
 2015-10-12 19:41:17 +02:00
Marc Alexander
f3e2bd9273 [ticket/14234] Replace more references with variables 
PHPBB3-14234
 2015-10-12 18:50:14 +02:00
Marc Alexander
f90b16df0d [ticket/14234] Use replacement variables instead of references in events 
PHPBB3-14234
 2015-10-12 18:39:29 +02:00
Zoddo
c5752be50c [ticket/10343] Add a distinction for inactive users on memberlist 
PHPBB3-10343
 2015-10-12 17:11:22 +02:00
Jakub Senko
66ee80c9e2 [ticket/14192] Add core.memberlist_memberrow_before event 
PHPBB3-14192
 2015-10-12 16:40:45 +02:00
Tristan Darricau
a5ab2eb564 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14098] Add core events to the search backends
 2015-10-12 13:38:42 +02:00
Tristan Darricau
1164cc38a2 Merge pull request #3830 from rxu/ticket/14098 
[ticket/14098] Add core events to the search backends

* rxu/ticket/14098:
  [ticket/14098] Add core events to the search backends
 2015-10-12 13:38:42 +02:00
Marc Alexander
bb2634b5e5 [ticket/14168] Correctly state return type of upload and upload_attachment 
PHPBB3-14168
 2015-10-12 12:11:26 +02:00
Tristan Darricau
b7fe324ed7 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14144] Add quickreply_editor_subject_before event
 2015-10-12 12:05:07 +02:00
Tristan Darricau
e87209742b Merge pull request #3887 from Senky/ticket/14144 
[ticket/14144] Add quickreply_editor_subject_before event

* Senky/ticket/14144:
  [ticket/14144] Add quickreply_editor_subject_before event
 2015-10-12 12:03:17 +02:00
Tristan Darricau
7bbce946de Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14163] Properly fix select all for code tag in Edge
 2015-10-12 11:52:18 +02:00
Tristan Darricau
d92baaa2f7 Merge pull request #3908 from marc1706/ticket/14163 
[ticket/14163] Properly fix select all for code tag in Edge

* marc1706/ticket/14163:
  [ticket/14163] Properly fix select all for code tag in Edge
 2015-10-12 11:52:18 +02:00
Tristan Darricau
17dbe4c17a Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14164] Add instructions to use the CLI for database updates
 2015-10-12 11:45:37 +02:00
Tristan Darricau
bc34217c14 Merge pull request #3906 from Zoddo/ticket/14164 
[ticket/14164] Add instructions to use the CLI for database updates

* Zoddo/ticket/14164:
  [ticket/14164] Add instructions to use the CLI for database updates
 2015-10-12 11:45:36 +02:00
Marc Alexander
49312f05f8 [ticket/14168] Use attachment manager instead of separate classes 
PHPBB3-14168
 2015-10-12 11:34:11 +02:00
Tristan Darricau
af1597ae25 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14191] Add core.get_gravatar_url_after event
 2015-10-12 11:32:05 +02:00
Tristan Darricau
65b13938db Merge pull request #3925 from Senky/ticket/14191 
[ticket/14191] Add core.get_gravatar_url_after event

* Senky/ticket/14191:
  [ticket/14191] Add core.get_gravatar_url_after event
 2015-10-12 11:32:05 +02:00
Tristan Darricau
93b88393f6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14187] Add acp_styles_list_before event
 2015-10-12 11:23:10 +02:00
Tristan Darricau
8c3aa1458c Merge pull request #3921 from Senky/ticket/14187 
[ticket/14187] Add acp_styles_list_before event

* Senky/ticket/14187:
  [ticket/14187] Add acp_styles_list_before event
 2015-10-12 11:23:10 +02:00
Tristan Darricau
16e731d735 Merge remote-tracking branch 'upstream/3.1.x' 
* upstream/3.1.x:
  [ticket/14188] Add core.acp_styles_action_before event
 2015-10-12 11:18:14 +02:00
Tristan Darricau
d9a4146113 Merge pull request #3922 from Senky/ticket/14188 
[ticket/14188] Add core.acp_styles_action_before event

* Senky/ticket/14188:
  [ticket/14188] Add core.acp_styles_action_before event
 2015-10-12 11:06:46 +02:00
Tristan Darricau
1baa8adfe3 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14212] Fix version number
  [ticket/14212] Adding event after users have been removed to a group
 2015-10-12 10:27:13 +02:00
Tristan Darricau
e603fa56db Merge pull request #3944 from Wardormeur/ticket/14212 
[ticket/14212] Adding event after users have been removed to a group

* Wardormeur/ticket/14212:
  [ticket/14212] Fix version number
  [ticket/14212] Adding event after users have been removed to a group
 2015-10-12 10:27:13 +02:00
Tristan Darricau
ce45813e2c Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13591] Change SQL query into array to allow
 2015-10-12 10:20:32 +02:00