Commit graph

30430 commits

Author SHA1 Message Date
Jakub Senko
ec70ec96e7 [ticket/14189] Add core.gen_sort_selects_after event
PHPBB3-14189
2016-02-26 23:10:18 +01:00
Marc Alexander
db1b73a3f4 [ticket/14496] Destroy update_list_time cache variable on intro
PHPBB3-14496
2016-02-26 16:58:04 +01:00
Marc Alexander
b6cf2d7284 [ticket/14496] Cache last update of update list instead of using filemtime
PHPBB3-14496
2016-02-26 12:07:35 +01:00
Tristan Darricau
5bdfc6167b [ticket/14499] Add command to update the board from CLI
PHPBB3-14499
2016-02-25 22:39:42 +01:00
Marc Alexander
37b2791837 [ticket/14497] Support second app.php script in install folder
PHPBB3-14497
2016-02-25 15:34:32 +01:00
Máté Bartus
f249c52af6 Merge pull request #4191 from Nicofuma/ticket/14495
[ticket/14495] Updates the version to 3.3.0-a1-dev
2016-02-25 12:30:04 +01:00
Tristan Darricau
294f926bfc [ticket/14495] Updates the version to 3.3.0-a1-dev
PHPBB3-14495
2016-02-24 22:25:41 +01:00
Tristan Darricau
68996e527e Merge branch '3.2.x'
* 3.2.x:
  [ticket/13842] Prevent internal server errors without rewrite module on IIS
2016-02-22 21:37:21 +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
d17257c346 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14488] Delete cookies to get correct session ID during login
2016-02-22 21:34:36 +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
c5c2f7f7d0 [ticket/14437] Correctly assume index from attachment display order
PHPBB3-14437
2016-02-21 14:10:45 +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
811f1573de Merge branch '3.2.x' 2016-02-19 10:10:55 +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
ec00fc85e0 Merge branch '3.2.x'
* 3.2.x:
  [ticket/13681] Invalidate and reset opcache where necessary
2016-02-18 22:00:29 +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
c485312d38 Merge branch '3.2.x' 2016-02-18 21:52:51 +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
269e958532 Merge branch '3.2.x'
* 3.2.x:
  [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:25 +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
9d1d8813fe Merge branch '3.2.x' 2016-02-18 18:43:03 +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 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
Tristan Darricau
f7c5098c60 [ticket/14457] CS
PHPBB3-14457
2016-02-18 17:30:31 +01:00
Tristan Darricau
f253a853b8 [ticket/14457] Fix twig/twig::assign_display
PHPBB3-14457
2016-02-18 17:30:31 +01:00
Tristan Darricau
d34ffda9c1 [ticket/14457] Uses a random placeholder to inject css and js
PHPBB3-14457
2016-02-18 17:30:31 +01:00
lavigor
4b4584bcd4 [ticket/14486] Add an event and fix an event in login_box()
PHPBB3-14486
2016-02-18 19:22:11 +03:00
Marc Alexander
4364629919 [ticket/14485] Update composer.lock
PHPBB3-14485
2016-02-18 16:28:04 +01:00
Marc Alexander
dcc80f4709 Merge branch '3.2.x' 2016-02-18 16:18:33 +01:00
Marc Alexander
1007dea154 Merge pull request #4127 from RMcGirr83/ticket_14416
[ticket/14416] footer nav links have incorrect tooltip styling applied
2016-02-18 16:18:29 +01:00
Marc Alexander
7d41fe0136 [ticket/14315] Properly get sid from cookies and simplify take_screenshot
PHPBB3-14315
2016-02-18 11:22:02 +01:00
Marc Alexander
7c96d0abcd [ticket/14315] Use proper ID selectors in ui test
PHPBB3-14315
2016-02-17 13:47:51 +01:00
Marc Alexander
a75885bd85 [ticket/14315] Add logout to ui tests and use in permissions role test
PHPBB3-14315
2016-02-17 13:26:35 +01:00
Marc Alexander
620a862266 [ticket/14315] Add functional tests for permission roles and fix non-js
Without JS the settings were not applied due to duplicate input names.

PHPBB3-14315
2016-02-17 12:56:19 +01:00
Marc Alexander
d429fd03bf [ticket/14315] Add tests for setting permission roles using javascript
PHPBB3-14315
2016-02-16 22:46:03 +01:00
Marc Alexander
845639ba37 [ticket/14315] Add more functionality to ui test cases
PHPBB3-14315
2016-02-16 22:45:31 +01:00
Marc Alexander
6f41fcb3d6 [ticket/14315] Add back roles select for disable javascript
The javascript will hide the old select and show the version using
the span and showing the tooltips.

PHPBB3-14315
2016-02-16 18:21:04 +01:00
Marc Alexander
32815faa33 [ticket/14315] Tweak location of drop-down
PHPBB3-14315
2016-02-16 18:21:04 +01:00