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

27918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Friedman
a84f77bf25 [ticket/12684] Another little fix 
PHPBB3-12684
 2016-02-29 14:28:02 -08:00
Matt Friedman
fe31060fca [ticket/12684] Fix tests 
PHPBB3-12684
 2016-02-29 14:23:32 -08:00
Matt Friedman
637b02690d [ticket/12684] Update to use non-deprecated methods 
PHPBB3-12684
 2016-02-29 13:28:42 -08:00
Matt Friedman
f32b4c0547 [ticket/12684] Add send email option 
PHPBB3-12684
 2016-02-29 11:42:23 -08:00
Matt Friedman
d373428180 [ticket/12684] Add input validation 
PHPBB3-12684
 2016-02-29 11:41:47 -08:00
Matt Friedman
6fe084a2fd [ticket/12684] Updates for 3.2 API 
PHPBB3-12684
 2016-02-29 11:41:07 -08:00
Matt Friedman
d17a8ab523 [ticket/12684] Fix merge errors 
PHPBB3-12684
 2016-02-29 08:28:37 -08:00
Tristan Darricau
8f7aba6582 [ticket/12684] Fix header file 
PHPBB3-12684
 2016-02-29 08:14:29 -08:00
Tristan Darricau
df4a620ba1 [ticket/12684] Fix tests 
PHPBB3-12684
 2016-02-29 08:14:29 -08:00
LEZY Thomas
50761104ba [ticket/12684] Add doc blocks and test file for user:add 
PHPBB3-12684
 2016-02-29 08:13:42 -08:00
LEZY Thomas
0102fa3f2d [ticket/12684] Add command user:add 
PHPBB3-12684
 2016-02-29 08:13:42 -08:00
Máté Bartus
f0a33dca72 Merge pull request #4197 from marc1706/ticket/14503 
[ticket/14503] Enable superglobals in cli
 2016-02-28 14:45:04 +01:00
Marc Alexander
f65207b935 [ticket/14503] Enable superglobals in cli 
This is for example needed for outputting help on commands.

PHPBB3-14503
 2016-02-28 12:28:21 +01:00
Marc Alexander
b490be1f81 Merge branch '3.1.x' into 3.2.x 2016-02-28 10:15:47 +01:00
Marc Alexander
a4040e53b7 Merge pull request #4153 from gn36/ticket/14443 
[ticket/14443] Introduce additional parameter to messenger
 2016-02-28 10:15:41 +01:00
Martin Beckmann
5d579631d7 [ticket/14443] substr($var, 0, 1) -> $var[0] 
PHPBB3-14443
 2016-02-27 15:17:17 +01:00
Marc Alexander
cb6ae863f5 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/functions_content.php
 2016-02-27 12:44:28 +01:00
Marc Alexander
747a70964e Merge pull request #4086 from rxu/ticket/14366 
[ticket/14366] Add core events to the function decode_message()
 2016-02-27 11:41:50 +01:00
Marc Alexander
7c41be4f51 Merge branch '3.1.x' into 3.2.x 2016-02-27 11:04:55 +01:00
Marc Alexander
ee7cba5df7 Merge pull request #4085 from rxu/ticket/14365 
[ticket/14365] Add core event to the function topic_review()
 2016-02-27 11:04:52 +01:00
Marc Alexander
a937e38bd5 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/memberlist_view.html
 2016-02-27 10:54:48 +01:00
Marc Alexander
34389df1ae Merge pull request #4049 from rxu/ticket/14316 
[ticket/14316] Add events before/after the custom/zebra fields in pfile view
 2016-02-27 10:52:09 +01:00
Marc Alexander
24fd031648 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
 2016-02-27 10:46:45 +01:00
Marc Alexander
3a6e6b997a Merge pull request #4195 from marc1706/ticket/14500 
[ticket/14500] Specify prevversion instead of duplicate newversion
 2016-02-27 10:45:12 +01:00
Marc Alexander
8e6a21955a [ticket/14500] Specify prevversion instead of duplicate newversion 
PHPBB3-14500
 2016-02-27 09:48:29 +01:00
rxu
cd3b93b9e2 [ticket/14366] Add core events to the function decode_message() 
Remove match/replace vars, use alternative var for the message var,
update the target phpBB version.

PHPBB3-14366
 2016-02-27 12:08:58 +07:00
rxu
2076280947 [ticket/14365] Fix a typo in the docblock. 
PHPBB3-14365
 2016-02-27 11:55:41 +07:00
rxu
673acc7313 [ticket/14316] Add events before/after the custom/zebra fields in profile view 
PHPBB3-14316
 2016-02-27 11:53:19 +07:00
Marc Alexander
30db51a86e Merge branch '3.1.x' into 3.2.x 2016-02-26 23:11:16 +01:00
Jakub Senko
ec70ec96e7 [ticket/14189] Add core.gen_sort_selects_after event 
PHPBB3-14189
 2016-02-26 23:10:18 +01:00
Tristan Darricau
49d42e2881 Merge pull request #4188 from marc1706/ticket/13842 
[ticket/13842] Prevent internal server errors without rewrite module on IIS

* marc1706/ticket/13842:
  [ticket/13842] Prevent internal server errors without rewrite module on IIS
 2016-02-22 21:36:46 +01:00
Tristan Darricau
58e3c06a24 Merge pull request #4186 from marc1706/ticket/14488 
[ticket/14488] Delete cookies to get correct session ID during login

* marc1706/ticket/14488:
  [ticket/14488] Delete cookies to get correct session ID during login
 2016-02-22 21:34:04 +01:00
Marc Alexander
43e87e3e63 [ticket/13842] Prevent internal server errors without rewrite module on IIS 
PHPBB3-13842
 2016-02-19 17:01:58 +01:00
Marc Alexander
078116e189 Merge pull request #4187 from markshawtoronto/ticket/14489 
[ticket/14489] Fix bug where extension custom compiler pass cannot be found
 2016-02-19 10:10:52 +01:00
Mark Shaw
632418ad6e [ticket/14489] Fix bug where extension custom compiler pass cannot be found. 
This is returning an extra / on my machine which throws off the next code block, and then the class can't be found.

PHPBB3-14489
 2016-02-18 23:56:53 -05:00
Marc Alexander
ae22160243 [ticket/14488] Delete cookies to get correct session ID during login 
PHPBB3-14488
 2016-02-18 23:53:40 +01:00
Tristan Darricau
b7deef46ac Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13681] Invalidate and reset opcache where necessary
 2016-02-18 22:00:10 +01:00
Tristan Darricau
6e4ab6509b Merge pull request #4185 from marc1706/ticket/13681 
[ticket/13681] Invalidate and reset opcache where necessary

* marc1706/ticket/13681:
  [ticket/13681] Invalidate and reset opcache where necessary
 2016-02-18 21:55:11 +01:00
Marc Alexander
f6fd819764 Merge pull request #4165 from Nicofuma/ticket/14457 
[ticket/14457] Uses a random placeholder to inject css and js
 2016-02-18 21:52:48 +01:00
Tristan Darricau
028191e7c2 Merge pull request #4166 from marc1706/ticket/14315 
[ticket/14315] Correctly set permission roles for multiple groups

* marc1706/ticket/14315:
  [ticket/14315] Properly get sid from cookies and simplify take_screenshot
  [ticket/14315] Use proper ID selectors in ui test
  [ticket/14315] Add logout to ui tests and use in permissions role test
  [ticket/14315] Add functional tests for permission roles and fix non-js
  [ticket/14315] Add tests for setting permission roles using javascript
  [ticket/14315] Add more functionality to ui test cases
  [ticket/14315] Add back roles select for disable javascript
  [ticket/14315] Tweak location of drop-down
  [ticket/14315] Apply roles options format for multiple forums too
  [ticket/14315] Build role options for each permission group
  [ticket/14315] Correctly set default values and reset values
  [ticket/14315] Only add role options specified for each group
 2016-02-18 21:47:02 +01:00
Marc Alexander
bd12427fd4 [ticket/13681] Invalidate and reset opcache where necessary 
PHPBB3-13681
 2016-02-18 19:03:56 +01:00
Joas Schilling
ab6e0bbef9 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
	phpBB/composer.lock
 2016-02-18 18:42:39 +01:00
Joas Schilling
fc66f00236 Merge branch 'prep-release-3.1.8' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2016-02-18 18:38:43 +01:00
Joas Schilling
9745d8d80e Add migration for 3.1.8 release-3.1.8 2016-02-18 18:04:47 +01:00
Joas Schilling
6fc7fc1c75 Update version for final 3.1.8 release 2016-02-18 17:59:26 +01:00
Joas Schilling
6eb6c000c2 Merge pull request #4183 from marc1706/ticket/14485 
[ticket/14485] Update composer.lock
 2016-02-18 17:57:18 +01:00
Tristan Darricau
58359b1587 [ticket/14457] Replaces unique_id implementation by random_bytes() 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
08a11dbe32 [ticket/14457] Set the config values related to the RNG in the installer config 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
97bbf2d2b8 [ticket/14457] Handle the case where there isn't any 'definition' bag 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
99ace63e62 [ticket/14457] Don't set CSS to JS and JS to CSS 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00