dc097221d8
[ticket/14550] Fix the number of characters returned by unique_id()
...
PHPBB3-14450
2016-03-23 10:18:22 +01:00
0e84856a45
Merge branch '3.1.x' into 3.2.x
2016-03-10 12:19:10 +01:00
9bcf8df5d0
Merge pull request #4184 from lavigor/ticket/14486
...
[ticket/14486] Add an event and fix an event in login_box()
2016-03-10 12:18:47 +01:00
0e49dc4409
[ticket/13264] Don't force approved state if post visibility is known (3.2)
...
The previous PR broke 3.2 because of different variable names
PHPBB3-13264
2016-03-09 20:25:27 +01:00
0251a02896
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/13264] Link to post if user can view it
[ticket/13264] Do not force approved state if post visibility is known
2016-03-09 19:42:57 +01:00
5e84d47a03
Merge pull request #4205 from marc1706/ticket/13264
...
[ticket/13264] Do not force approved state if post visibility is known
2016-03-09 19:39:29 +01:00
a01e3a0ffa
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14132] Use transaction for adding notifications to type table
[ticket/14519] Skip query if all unread notifications are retrieved
[ticket/14483] Do not send headers by default on access via controller
Conflicts:
phpBB/phpbb/notification/manager.php
2016-03-08 22:18:42 +01:00
dd115d1896
[ticket/13264] Link to post if user can view it
...
PHPBB3-13264
2016-03-08 15:25:45 +01:00
d461ee4f5c
[ticket/13264] Do not force approved state if post visibility is known
...
Post visibility is used if it is set to a valid value.
PHPBB3-13264
2016-03-07 22:18:26 +01:00
9d7b6260bd
[release-3.2.0-b2] Update versions to 3.2.0-3-dev
2016-03-07 17:36:16 +01:00
62a2619300
[ticket/14483] Do not send headers by default on access via controller
...
PHPBB3-14483
2016-03-06 21:10:42 +01:00
b490be1f81
Merge branch '3.1.x' into 3.2.x
2016-02-28 10:15:47 +01:00
a4040e53b7
Merge pull request #4153 from gn36/ticket/14443
...
[ticket/14443] Introduce additional parameter to messenger
2016-02-28 10:15:41 +01:00
40bd4c8b72
[ticket/14486] Use empty() and move error check.
...
PHPBB3-14486
2016-02-27 20:05:59 +03:00
5d579631d7
[ticket/14443] substr($var, 0, 1) -> $var[0]
...
PHPBB3-14443
2016-02-27 15:17:17 +01:00
cb6ae863f5
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/includes/functions_content.php
2016-02-27 12:44:28 +01:00
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
7c41be4f51
Merge branch '3.1.x' into 3.2.x
2016-02-27 11:04:55 +01:00
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
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
2076280947
[ticket/14365] Fix a typo in the docblock.
...
PHPBB3-14365
2016-02-27 11:55:41 +07:00
30db51a86e
Merge branch '3.1.x' into 3.2.x
2016-02-26 23:11:16 +01:00
ec70ec96e7
[ticket/14189] Add core.gen_sort_selects_after event
...
PHPBB3-14189
2016-02-26 23:10:18 +01:00
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
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
bd12427fd4
[ticket/13681] Invalidate and reset opcache where necessary
...
PHPBB3-13681
2016-02-18 19:03:56 +01:00
58359b1587
[ticket/14457] Replaces unique_id implementation by random_bytes()
...
PHPBB3-14457
2016-02-18 17:30:31 +01:00
4b4584bcd4
[ticket/14486] Add an event and fix an event in login_box()
...
PHPBB3-14486
2016-02-18 19:22:11 +03:00
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
0a1604a536
[ticket/14315] Apply roles options format for multiple forums too
...
PHPBB3-14315
2016-02-16 18:21:04 +01:00
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
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
4973632288
[ticket/14315] Only add role options specified for each group
...
PHPBB3-14315
2016-02-16 18:21:04 +01:00
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
17e21d5140
[3.1.x] Increase dev version for 3.1.9
2016-02-13 18:01:32 +01:00
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
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
1bd4895d7a
[ticket/14409] Update session page info before displaying online list
...
PHPBB3-14409
2016-02-13 15:58:05 +01:00
6d57136264
[ticket/14475] Do not log removal of users from newly registered group
...
PHPBB3-14475
2016-02-13 15:36:38 +01:00
3e8a62f309
[prep-release-3.1.8] Update version to 3.1.8-RC1
2016-02-13 14:52:57 +01:00
c9e5d308f2
Merge pull request #4159 from marc1706/ticket/14448
...
[ticket/14448] Use guzzle for remote files uploading
* marc1706/ticket/14448:
[ticket/14448] Correctly pass verify setting if available
[ticket/14448] Let user decide if remote upload certs should be checked
[ticket/14448] Add new vendor files and dirs to clean task
[ticket/14448] Do not try to test remote upload timeout
[ticket/14448] Remove no longer needed guzzle 3.9.3
[ticket/14448] Use GuzzleHttp and try to verify certs
[ticket/14448] Update composer.json and lock file for guzzlehttp
[ticket/14431] Remote avatar uploading
[ticket/14431] Remote avatar uploading
2016-02-11 22:16:10 +01:00
dab282e664
[release-3.2.0-b1] Update version to 3.2.0-b2-dev
2016-02-05 17:12:39 +01:00
fd9c05309d
[ticket/14448] Let user decide if remote upload certs should be checked
...
Also fixed some minor issues like coding style.
PHPBB3-14448
2016-02-04 17:14:48 +01:00
f80ec7e786
[prep-release-3.2.0-b1] Update version to 3.2.0-b1
2016-02-03 21:41:22 +01:00
f2f9ce544f
Merge pull request #4141 from exussum12/ticket/14431-3.1
...
[ticket/14431] Remote avatar uploading
2016-02-03 10:29:39 +01:00
366a92c36a
[ticket/14430] Remote avatar uploading
...
Remove support for redirects
PHPBB3-14431
2016-02-03 05:33:45 +00:00
a35314c6ea
[ticket/14443] Avoid duplicate slashes
...
PHPBB3-14443
2016-02-02 20:30:57 +01:00
60c9ee068e
[ticket/14444] Fix fatal error in functions_messenger.php
...
PHPBB3-14444
2016-02-02 15:45:03 +01:00
fdd5a18763
[ticket/14443] Introduce additional parameter to messenger
...
PHPBB3-14443
2016-02-01 23:11:39 +01:00
0d93af8324
Merge branch '3.1.x'
2016-01-31 20:05:07 +01:00
