mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-12 10:35:20 +02:00
Code Issues Releases Wiki Activity
27,976 Commits 18 Branches 192 Tags
c5ef29a6f1
Commit Graph

27976 Commits

Author SHA1 Message Date
Marc Alexander
c5ef29a6f1 [ticket/14530] Add accidentally removed sig_parsed flag 
This was removed by accident previously while moving from the use of the
old bbcode class to the generate_test_for_display function.

PHPBB3-14530
 2016-03-24 10:41:43 +01:00
Marc Alexander
1e0cda3e8a Merge pull request from Nicofuma/ticket/14550 
[ticket/14550] Fix the number of characters returned by unique_id()
 2016-03-23 14:47:01 +01:00
Tristan Darricau
dc097221d8 [ticket/14550] Fix the number of characters returned by unique_id() 
PHPBB3-14450
 2016-03-23 10:18:22 +01:00
Tristan Darricau
eca4726f3c Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
 2016-03-16 19:10:34 +01:00
Tristan Darricau
0194c78d19 Merge pull request from rxu/ticket/14540 
[ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance

* rxu/ticket/14540:
  [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
 2016-03-16 19:10:06 +01:00
rxu
e610b23916 [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance 
Swapping conditions in the function accept() of the class
\phpbb\recursive_dot_prefix_filter_iterator saves a lot of isDir() calls which
is more expensive than $filename[0] checks.

PHPBB3-14540
 2016-03-17 00:50:08 +07:00
Tristan Darricau
d8e7f865d8 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
 2016-03-15 20:20:28 +01:00
Tristan Darricau
a03470ac75 Merge pull request from marc1706/ticket/14538-3.2.x 
[ticket/14538] Update composer dependencies

* marc1706/ticket/14538-3.2.x:
  [ticket/14538] Update dependencies for 3.2.x
  [ticket/14538] Update composer dependencies
 2016-03-15 19:55:44 +01:00
Tristan Darricau
f1874ec416 Merge pull request from marc1706/ticket/14538 
[ticket/14538] Update composer dependencies

* marc1706/ticket/14538:
  [ticket/14538] Update composer dependencies
 2016-03-15 19:53:15 +01:00
Marc Alexander
a92ce812e7 [ticket/14538] Update dependencies for 3.2.x 
PHPBB3-14538
 2016-03-15 13:37:26 +01:00
Marc Alexander
67d58aa7b8 Merge branch 'ticket/14538' into ticket/14538-3.2.x 2016-03-15 13:30:50 +01:00
Marc Alexander
681836a84d [ticket/14538] Update composer dependencies 
PHPBB3-14538
 2016-03-15 09:53:57 +01:00
Tristan Darricau
5c2ef741a6 Merge pull request from marc1706/ticket/14528 
[ticket/14528] Update navbar_header.html for valid microdata

* marc1706/ticket/14528:
  [ticket/14528] Add back itemprop definitions to breadcrumbs
  [ticket/14528] Update navbar_header.html for valid microdata
 2016-03-14 06:53:40 +01:00
Marc Alexander
04fbbbe1ed [ticket/14528] Add back itemprop definitions to breadcrumbs 
PHPBB3-14528
 2016-03-13 22:50:15 +01:00
C1n
36d2ed3121 [ticket/14528] Update navbar_header.html for valid microdata 
PHPBB3-14528
 2016-03-13 22:50:01 +01:00
Marc Alexander
186c5f4f83 Merge branch '3.1.x' into 3.2.x 2016-03-13 20:24:41 +01:00
Marc Alexander
48bdab88de Merge pull request from phpbb-fr-com/ticket/14533 
[ticket/14533] U_NOTIFICATION_SETTINGS doesn't return the correct URL
 2016-03-13 20:24:38 +01:00
Skouat
3e278bcf0a [ticket/14533] U_NOTIFICATION_SETTINGS doesn't return the correct URL 
PHPBB3-14533
 2016-03-12 20:53:42 +01:00
Máté Bartus
b0fe454163 Merge pull request from marc1706/ticket/14523 
[ticket/14523] Replace prototype definition with shared services
 2016-03-11 23:12:25 +01:00
Tristan Darricau
eef7a4dbf4 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14529] Stop using --prefer-source for composer
 2016-03-11 18:53:36 +01:00
Tristan Darricau
d142bebdd6 Merge pull request from marc1706/ticket/14529 
[ticket/14529] Stop using --prefer-source for composer

* marc1706/ticket/14529:
  [ticket/14529] Stop using --prefer-source for composer
 2016-03-11 18:53:13 +01:00
Marc Alexander
2337d9dd27 [ticket/14529] Stop using --prefer-source for composer 
The api rate limit has been removed by github. Therefore,
we no longer need --prefer-source

PHPBB3-14529
 2016-03-11 17:51:02 +01:00
Marc Alexander
18fea1b286 Merge branch '3.1.x' into 3.2.x 2016-03-10 22:11:07 +01:00
Marc Alexander
9288a50bcf Merge pull request from marc1706/ticket/14422 
[ticket/14422] Support cmd+enter & ctrl+enter for submitting message
 2016-03-10 22:09:19 +01:00
Marc Alexander
ad8363ae57 Merge pull request from RMcGirr83/TICKET_13972 
[ticket/13972] Remove hard coded flood check from posting
 2016-03-10 18:43:47 +01:00
Marc Alexander
1f25f710ea [ticket/14422] Submit when pressing ctrl or cmd + enter 
PHPBB3-14422
 2016-03-10 15:08:12 +01:00
Richard McGirr
b0bedce662 [ticket/13972] Remove hard coded flood check from posting 
PHPBB3-13972
 2016-03-10 06:48:36 -05:00
Callum Macrae
8058967e7f [ticket/14422] Support cmd+enter for submitting message 
PHPBB3-14422
 2016-03-10 12:31:04 +01:00
Marc Alexander
0e84856a45 Merge branch '3.1.x' into 3.2.x 2016-03-10 12:19:10 +01:00
Marc Alexander
9bcf8df5d0 Merge pull request from lavigor/ticket/14486 
[ticket/14486] Add an event and fix an event in login_box()
 2016-03-10 12:18:47 +01:00
Marc Alexander
b758c098d3 [ticket/14523] Replace prototype definition with shared services 
PHPBB3-14523
 2016-03-10 10:41:00 +01:00
Tristan Darricau
2c813e6e5e Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14496] Destroy update_list_time cache variable on intro
  [ticket/14496] Cache last update of update list instead of using filemtime
 2016-03-09 21:53:45 +01:00
Tristan Darricau
61e0247f22 Merge pull request from marc1706/ticket/14496 
[ticket/14496] Cache last update of update list instead of using filemtime

* marc1706/ticket/14496:
  [ticket/14496] Destroy update_list_time cache variable on intro
  [ticket/14496] Cache last update of update list instead of using filemtime
 2016-03-09 21:53:14 +01:00
Marc Alexander
5d0f02ce7f Merge pull request from CHItA/ticket/13264 
[ticket/13264]  Don't force approved state if post visibility is known (3.2)
 2016-03-09 20:59:57 +01:00
Máté Bartus
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
Máté Bartus
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
Máté Bartus
5e84d47a03 Merge pull request from marc1706/ticket/13264 
[ticket/13264] Do not force approved state if post visibility is known
 2016-03-09 19:39:29 +01:00
Máté Bartus
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
Máté Bartus
7c45ed0733 Merge pull request from marc1706/ticket/14519 
[ticket/14519] Skip query if all unread notifications are retrieved
 2016-03-08 22:09:02 +01:00
Máté Bartus
a0fa396901 Merge pull request from marc1706/ticket/14132 
[ticket/14132] Use transaction for adding notifications to type table
 2016-03-08 22:07:33 +01:00
Máté Bartus
05ccbc512d Merge pull request from marc1706/ticket/14483 
[ticket/14483] Do not send headers by default on access via controller
 2016-03-08 22:07:11 +01:00
Marc Alexander
dd115d1896 [ticket/13264] Link to post if user can view it 
PHPBB3-13264
 2016-03-08 15:25:45 +01:00
Marc Alexander
10004c4032 [ticket/14132] Use transaction for adding notifications to type table 
This will prevent a race condition that might occur by two posts being
submitted at the same time with the notification type IDs not being
cached.

PHPBB3-14132
 2016-03-08 12:36:29 +01:00
Marc Alexander
9fcd0b116b [ticket/14519] Skip query if all unread notifications are retrieved 
PHPBB3-14519
 2016-03-08 12:15:21 +01:00
Marc Alexander
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
Tristan Darricau
9d7b6260bd [release-3.2.0-b2] Update versions to 3.2.0-3-dev 2016-03-07 17:36:16 +01:00
Marc Alexander
c00e45d30e Merge branch '3.1.x' into 3.2.x 2016-03-07 09:52:30 +01:00
Marc Alexander
f55a61d067 Merge pull request from Elsensee/ticket/14514 
[ticket/14514] Don't skip users when converting passwords
 2016-03-07 09:51:31 +01:00
Marc Alexander
62a2619300 [ticket/14483] Do not send headers by default on access via controller 
PHPBB3-14483
 2016-03-06 21:10:42 +01:00
Oliver Schramm
b77856a903 [ticket/14514] Don't skip users when converting passwords 
PHPBB3-14514
 2016-03-06 16:11:29 +01:00