mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-15 05:14:28 +02:00
Code Issues Releases Wiki Activity
28,198 Commits 18 Branches 192 Tags
Commit Graph

28198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Alexander
0a1604a536 [ticket/14315] Apply roles options format for multiple forums too 
PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
4cfba8f3a4 [ticket/14315] Build role options for each permission group 
Previously all role options were put into one array. This required
filtering the options. Instead, these are now passed to the template
via template loops.

PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
eab1b1ad11 [ticket/14315] Correctly set default values and reset values 
The permissions tooltip javascript failed at correctly passing
the default values to the page. The same applied to the
display_mask() method in includes/acp/auth.php.

PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
4973632288 [ticket/14315] Only add role options specified for each group 
PHPBB3-14315
 2016-02-16 18:21:04 +01:00
Marc Alexander
9eedf29021 [ticket/14481] Use port 443 if https is specified in x-forwarded-proto 
PHPBB3-14481
 2016-02-16 16:33:19 +01:00
Tristan Darricau
8d1eee0e01 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14462] Not show timeout messages in convertors
  [ticket/14462] Make timeout error translateable
  [ticket/14462] Update ordering in install db config
  [ticket/14462] Fix comments
  [ticket/14462] Fix tests
  [ticket/14462] Fix CS and typo
  [ticket/14462] Set instance of db driver for database access using global
  [ticket/14462] Fix installation in tests
  [ticket/14462] Refactor tasks to be more modular
  [ticket/14462] Further speed improvements
 2016-02-16 00:11:27 +01:00
Tristan Darricau
d0ce6a18df Merge pull request #4171 from CHItA/ticket/14462 
[ticket/14462] Try to prevent timeouts in the installer

* CHItA/ticket/14462:
  [ticket/14462] Not show timeout messages in convertors
  [ticket/14462] Make timeout error translateable
  [ticket/14462] Update ordering in install db config
  [ticket/14462] Fix comments
  [ticket/14462] Fix tests
  [ticket/14462] Fix CS and typo
  [ticket/14462] Set instance of db driver for database access using global
  [ticket/14462] Fix installation in tests
  [ticket/14462] Refactor tasks to be more modular
  [ticket/14462] Further speed improvements
 2016-02-16 00:06:52 +01:00
Tristan Darricau
1f0b6c8123 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14447] Remove trailing white spaces in Prosilver
 2016-02-15 23:08:18 +01:00
Tristan Darricau
00d71d854c Merge pull request #4157 from VSEphpbb/ticket/14447 
[ticket/14447] Remove trailing white spaces in Prosilver

* VSEphpbb/ticket/14447:
  [ticket/14447] Remove trailing white spaces in Prosilver
 2016-02-15 23:08:08 +01:00
Tristan Darricau
f872af464e Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14477] Update text-formatter dependency
 2016-02-15 22:57:49 +01:00
Tristan Darricau
d4c7f25e04 Merge pull request #4179 from marc1706/ticket/14477 
[ticket/14477] Update text-formatter dependency

* marc1706/ticket/14477:
  [ticket/14477] Update text-formatter dependency
 2016-02-15 22:57:30 +01:00
Tristan Darricau
9a7f2c08f6 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14478] Remove no longer required shell script
  [ticket/14478] Move facebook/webdriver dependency to main composer file
 2016-02-15 22:56:27 +01:00
Tristan Darricau
f983684fdb Merge pull request #4180 from marc1706/ticket/14478 
[ticket/14478] Move facebook/webdriver dependency to main composer file

* marc1706/ticket/14478:
  [ticket/14478] Remove no longer required shell script
  [ticket/14478] Move facebook/webdriver dependency to main composer file
 2016-02-15 22:55:56 +01:00
Marc Alexander
accf8f8625 [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https 
PHPBB3-14481
 2016-02-15 22:06:25 +01:00
Mate Bartus
6debd9a1be [ticket/14462] Not show timeout messages in convertors 
PHPBB3-14462
 2016-02-14 19:27:24 +01:00
Marc Alexander
469f200821 [ticket/14478] Remove no longer required shell script 
PHPBB3-14478
 2016-02-14 16:28:08 +01:00
Marc Alexander
d330ef8c1b [ticket/14478] Move facebook/webdriver dependency to main composer file 
Also updated to latest version and now using proper version in
composer.json.

PHPBB3-14478
 2016-02-14 16:24:00 +01:00
Oliver Schramm
2084404d2a [ticket/14462] Make timeout error translateable 
PHPBB3-14462
 2016-02-14 16:16:33 +01:00
Marc Alexander
b6f9a2e1aa [ticket/14477] Update text-formatter dependency 
PHPBB3-14477
 2016-02-14 15:49:56 +01:00
Joas Schilling
c3370201ba Merge branch '3.2.x' 2016-02-13 18:08:28 +01:00
Joas Schilling
8663edce76 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2016-02-13 18:08:01 +01:00
Joas Schilling
17e21d5140 [3.1.x] Increase dev version for 3.1.9 2016-02-13 18:01:32 +01:00
Joas Schilling
c2ea2a3e18 Merge branch 'prep-release-3.1.8' into 3.1.x 2016-02-13 18:00:20 +01:00
Joas Schilling
cafd165bd0 [prep-release-3.1.8] Update changelog release-3.1.8-RC1 2016-02-13 16:45:51 +01:00
Joas Schilling
9590ff3c18 Merge pull request #4176 from Elsensee/ticket/14409 
[ticket/14409] Update session page info before displaying online list
 2016-02-13 16:45:04 +01:00
Joas Schilling
4f07a0bafb Merge pull request #4177 from marc1706/ticket/14475 
[ticket/14475] Do not log removal of users from newly registered group
 2016-02-13 16:40:16 +01:00
Oliver Schramm
1bd4895d7a [ticket/14409] Update session page info before displaying online list 
PHPBB3-14409
 2016-02-13 15:58:05 +01:00
Marc Alexander
6d57136264 [ticket/14475] Do not log removal of users from newly registered group 
PHPBB3-14475
 2016-02-13 15:36:38 +01:00
Mate Bartus
b9f5c03099 [ticket/14462] Update ordering in install db config 
PHPBB3-14462
 2016-02-13 15:02:33 +01:00
Joas Schilling
e63493115a [prep-release-3.1.8] Add changelog for 3.1.8-RC1 2016-02-13 14:57:53 +01:00