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

23775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Senko
51f5c2d094 [ticket/13042] Remove unused variables 
PHPBB3-13042
 2014-09-10 17:38:05 +02:00
Tristan Darricau
a093c28d1a [ticket/12963] Fix the list of migrations in database_update.php 
Without this patch the finder grab all the class available in the ext
folder and not only the migrations. This change is backported for the one
done before to the cli tool db:migrate. (see the commit
3420f8f3201ac337434f73ee00bda6df7b378212)

PHPBB3-12963
 2014-09-10 12:01:01 +02:00
Tristan Darricau
d320897180 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13052] Restore timespan parameter for check_form_key()
 2014-09-10 11:50:28 +02:00
Tristan Darricau
b2a28962bc Merge pull request #2939 from nickvergessen/ticket/13052 
[ticket/13052] Restore timespan parameter for check_form_key()

* nickvergessen/ticket/13052:
  [ticket/13052] Restore timespan parameter for check_form_key()
 2014-09-10 11:50:13 +02:00
Callum Macrae
cb7e1540c6 [ticket/12982] Refactoring: Killed undescriptive variables 
PHPBB3-12982
 2014-09-10 09:58:46 +01:00
Joas Schilling
d87547da66 [ticket/13052] Restore timespan parameter for check_form_key() 
PHPBB3-13052
 2014-09-10 08:07:21 +02:00
Marc Alexander
d1b7408bf0 Merge branch 'develop-ascraeus' into develop 2014-09-09 23:37:54 +02:00
Marc Alexander
6c0a3bb247 Merge pull request #2934 from VSEphpbb/ticket/13051 
[ticket/13051] Fix viewonline event (recently broken) and add a new core event
 2014-09-09 23:37:30 +02:00
Matt Friedman
0fc5a27889 [ticket/13051] Fix core event name 
PHPBB3-13051
 2014-09-09 13:12:29 -07:00
Matt Friedman
0861404121 [ticket/13051] Rename new event core.viewonline_modify_user_row 
PHPBB3-13051
 2014-09-09 12:52:53 -07:00
Joas Schilling
d9f36ae7e1 [ticket/12976] Correctly use plurals for attachment count in UCP navigation 
PHPBB3-12976
 2014-09-09 21:31:34 +02:00
Andreas Fischer
aa6d7a09b8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13052] Use request class instead of $_POST and request_var()
  [ticket/13052] Fix appearances with multiple parameters
  [ticket/13052] Remove additional parameter from check_form_key()
 2014-09-09 21:25:21 +02:00
Andreas Fischer
65026ed1fa Merge pull request #2935 from nickvergessen/ticket/13052 
Ticket/13052 Remove additional parameter from check_form_key()

* nickvergessen/ticket/13052:
  [ticket/13052] Use request class instead of $_POST and request_var()
  [ticket/13052] Fix appearances with multiple parameters
  [ticket/13052] Remove additional parameter from check_form_key()
 2014-09-09 21:25:15 +02:00
Joas Schilling
ef61deb132 [ticket/13052] Use request class instead of $_POST and request_var() 
PHPBB3-13052
 2014-09-09 19:49:17 +02:00
Joas Schilling
ad8d53af27 [ticket/13052] Fix appearances with multiple parameters 
PHPBB3-13052
 2014-09-09 19:47:00 +02:00
Joas Schilling
047728e3d4 [ticket/13052] Remove additional parameter from check_form_key() 
PHPBB3-13052
 2014-09-09 19:46:27 +02:00
Matt Friedman
c56c0fce0d [ticket/13051] Add a new core event to handle the template array 
PHPBB3-13051
 2014-09-09 09:14:32 -07:00
Matt Friedman
c6fc455432 [ticket/13051] Fix viewonline event, remove template data 
PHPBB3-13051
 2014-09-08 15:54:16 -07:00
Jakub Senko
4b4a673d98 [ticket/13022] Language adjustments 
PHPBB3-13022
 2014-09-08 23:14:33 +02:00
Andreas Fischer
33762db175 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13038] Add link to number of posts of user in viewtopic
 2014-09-08 22:12:44 +02:00
Andreas Fischer
e00697f3a1 Merge pull request #2926 from Senky/ticket/13038 
[ticket/13038] Link user post tally to their posts

* Senky/ticket/13038:
  [ticket/13038] Add link to number of posts of user in viewtopic
 2014-09-08 22:12:44 +02:00
Andreas Fischer
869cff6ace Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13050] Allow topic/forum subscription when email/jabber is off
 2014-09-08 21:23:46 +02:00
Andreas Fischer
3458aa2482 Merge pull request #2931 from rxu/ticket/13050 
[ticket/13050] Allow topic/forum subscription when email/jabber is off

* rxu/ticket/13050:
  [ticket/13050] Allow topic/forum subscription when email/jabber is off
 2014-09-08 21:23:46 +02:00
Jakub Senko
aefd96e604 [ticket/13038] Add link to number of posts of user in viewtopic 
PHPBB3-13038
 2014-09-08 17:36:08 +02:00
Marc Alexander
5df5b9c2d5 Merge branch 'develop-ascraeus' into develop 2014-09-08 16:47:43 +02:00
Marc Alexander
bcd4cebd48 Merge pull request #2915 from rxu/ticket/13026 
[ticket/13026] Add template vars array to core.viewonline_overwrite_location
 2014-09-08 16:46:26 +02:00
Marc Alexander
8a568a77f6 Merge branch 'develop-ascraeus' into develop 2014-09-08 16:30:31 +02:00
Marc Alexander
cc96bcff99 Merge pull request #2911 from rxu/ticket/13020 
[ticket/13020] Add variables to core.viewforum_get_topic_data event
 2014-09-08 16:30:05 +02:00
Andreas Fischer
04c073e138 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13035] Remove empty meta tags

Conflicts:
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
 2014-09-08 13:46:16 +02:00
Andreas Fischer
33e5e426d4 Merge pull request #2933 from bantu/ticket/13035 
[ticket/13035] Remove empty meta tags

* bantu/ticket/13035:
  [ticket/13035] Remove empty meta tags
 2014-09-08 13:45:34 +02:00
dcz
85468ce2ec [ticket/13035] Remove empty meta tags 
PHPBB3-13035
 2014-09-08 13:09:38 +02:00
Jakub Senko
dfbc2adc08 [ticket/13022] Remove ternary condition 
PHPBB3-13022
 2014-09-07 22:39:22 +02:00
rxu
de7b100b8a [ticket/13020] Add forum_data variable to core.viewforum_get_topic_data event 
PHPBB3-13020
 2014-09-07 19:48:06 +08:00
rxu
d470d628f5 [ticket/13026] Add template vars array to core.viewonline_overwrite_location 
Add template vars array to core.viewonline_overwrite_location event
to allow modifying/adding template vars for every user row.

PHPBB3-13026
 2014-09-07 19:04:32 +08:00
rxu
40ef561349 [ticket/13050] Allow topic/forum subscription when email/jabber is off 
Currently, there's impossible to subscribe topic/forum if emails and/or jabber
is disabled. This seems to be a 3.0 leftover since 3.1 introduces new
notification system which handles this case and offers email/jabber-free
board notifications.

PHPBB3-13050
 2014-09-07 18:54:34 +08:00
Joas Schilling
54ccea9312 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13048] Only update session_page if request is not ajax
 2014-09-07 12:50:55 +02:00
Joas Schilling
12398d65fd Merge pull request #2930 from Senky/ticket/13048 
[ticket/13048] AJAX requests are being stored to session_page

* Senky/ticket/13048:
  [ticket/13048] Only update session_page if request is not ajax
 2014-09-07 12:50:03 +02:00
Joas Schilling
8ed0f94e31 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
 2014-09-07 12:47:36 +02:00
Joas Schilling
c1d0528d80 Merge pull request #2929 from rxu/ticket/13047 
[ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event

* rxu/ticket/13047:
  [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event
 2014-09-07 12:47:13 +02:00
Joas Schilling
043a66faaa Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
 2014-09-07 12:43:23 +02:00
Joas Schilling
b3a8e92810 Merge pull request #2928 from Nicofuma/ticket/13046 
[ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php

* Nicofuma/ticket/13046:
  [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php
 2014-09-07 12:42:52 +02:00
Marc Alexander
c00e0c55c5 Merge branch 'develop-ascraeus' into develop 2014-09-07 11:58:57 +02:00
Marc Alexander
a0ee6ccdf3 Merge pull request #2925 from nickvergessen/ticket/12983 
Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
 2014-09-07 11:41:44 +02:00
Joas Schilling
d5801333f7 [ticket/12983] Do not test invalid values until Symfony 2.4 
PHPBB3-12983
 2014-09-07 10:40:18 +02:00
Jakub Senko
b218f3ad43 [ticket/13048] Only update session_page if request is not ajax 
PHPBB3-13048
 2014-09-07 10:15:51 +02:00
rxu
a6f1b22eb3 [ticket/13047] Add $post_list array to core.viewtopic_modify_page_title event 
PHPBB3-13047
 2014-09-07 13:36:23 +08:00
Tristan Darricau
088e34dc47 [ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php 
PHPBB3-13046
 2014-09-07 01:41:21 +02:00
Tristan Darricau
af10ca630d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
 2014-09-06 15:47:47 +02:00
Tristan Darricau
297ab5c526 Merge pull request #2919 from Senky/ticket/12852 
[ticket/12852] Make get_url_parts handle get variable with no value

* Senky/ticket/12852:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
 2014-09-06 15:47:30 +02:00
Joas Schilling
647a75249c [ticket/12983] Add functional test for ucp pref module 
PHPBB3-12983
 2014-09-06 15:16:51 +02:00