makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
24352 commits 18 branches 192 tags 207 MiB
Commit graph

24352 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
b99ba4d416 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:03:16 +02:00
Joas Schilling
b6acc1b9db Merge pull request #2978 from blitze/ticket/13071 
[ticket/13071] Only use total_match_count after event dispatcher
 2014-10-01 10:01:09 +02:00
Joas Schilling
48dd87bd34 Merge branch 'develop-ascraeus' into develop 2014-10-01 09:56:51 +02:00
Joas Schilling
1b393b1d0b Merge pull request #2979 from blitze/ticket/13072 
[ticket/13072] Add total_match_count to core.search_get_topic_data event
 2014-10-01 09:56:39 +02:00
Joas Schilling
d3ee8d24bc Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
 2014-10-01 09:53:08 +02:00
Joas Schilling
effb5d95d0 Merge pull request #2998 from rxu/ticket/13107 
[ticket/13107] Add template events to forum row in forumlist_body.html
 2014-10-01 09:50:38 +02:00
Cesar G
d644de5217 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
 2014-10-01 00:44:16 -07:00
Cesar G
8ab7f6b595 Merge remote-tracking branch 'nickvergessen/ticket/13119' into develop-ascraeus 
* nickvergessen/ticket/13119:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
 2014-10-01 00:43:41 -07:00
Matt Friedman
1ee4894271 [ticket/13121] Fix migration file 
PHPBB3-13121
 2014-10-01 00:29:45 -07:00
Matt Friedman
65539df39a [ticket/13121] Remove cache mode from style management module 
https://tracker.phpbb.com/browse/PHPBB3-13121

PHPBB3-13121
 2014-10-01 00:03:54 -07:00
Andreas Fischer
7c8b8877df Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
 2014-10-01 02:15:26 +02:00
Andreas Fischer
8fef959418 Merge pull request #3011 from fredemmott/ticket/13122 
[ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable

* fredemmott/ticket/13122:
  [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
 2014-10-01 02:15:25 +02:00
Fred Emmott
f30c5f730e [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable 
If you're unlucky, calling time() or similar twice in a row will
give you different results. Facebook runs these tests thousands of
times a day, so we occasionally get bogus failures.

PHPBB3-13122
 2014-09-30 15:53:02 -07:00
Andreas Fischer
236f75c6cb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
 2014-10-01 00:26:39 +02:00
Andreas Fischer
a8e74fff9b Merge pull request #3010 from Nicofuma/ticket/13120 
[ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders

* Nicofuma/ticket/13120:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
 2014-10-01 00:26:39 +02:00
Joas Schilling
cb49a0c4cc [ticket/13123] Add events to allow modifying post data 
PHPBB3-13123
 2014-10-01 00:13:37 +02:00
Tristan Darricau
3a413cbf30 [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders 
PHPBB3-13120
 2014-09-30 21:20:42 +02:00
Andreas Fischer
ec89d11609 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13105] Fix the code logic as described in the comment
 2014-09-30 21:15:27 +02:00
Andreas Fischer
cb8b245639 Merge pull request #3005 from nickvergessen/ticket/13105 
[ticket/13105] Fix the code logic as described in the comment

* nickvergessen/ticket/13105:
  [ticket/13105] Fix the code logic as described in the comment
 2014-09-30 21:15:26 +02:00
Andreas Fischer
7694623cd2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13111] Dropdown options are already an array in the field data
 2014-09-30 21:04:25 +02:00
Andreas Fischer
8fb9f19aae Merge pull request #3008 from nickvergessen/ticket/13111 
[ticket/13111] Dropdown options are already an array in the field data

* nickvergessen/ticket/13111:
  [ticket/13111] Dropdown options are already an array in the field data
 2014-09-30 21:04:25 +02:00
Andreas Fischer
be5638c110 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13118] Correctly use the provided datetime class
 2014-09-30 21:00:06 +02:00
Andreas Fischer
a0db23bd0e Merge pull request #3007 from nickvergessen/ticket/13118 
[ticket/13118] Correctly use the provided datetime class

* nickvergessen/ticket/13118:
  [ticket/13118] Correctly use the provided datetime class
 2014-09-30 21:00:05 +02:00
Joas Schilling
6f66423de9 [ticket/13119] Remove unused globals and use the request class 
PHPBB3-13119
 2014-09-30 18:22:06 +02:00
Joas Schilling
7efc624b0a [ticket/13119] Add events to ACP's ban module 
PHPBB3-13119
 2014-09-30 18:22:05 +02:00
Joas Schilling
9c3126add0 [ticket/13119] Add events to MCP's ban module 
PHPBB3-13119
 2014-09-30 18:22:04 +02:00
Nils Adermann
e64c1b463e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
 2014-09-30 14:00:25 +02:00
Nils Adermann
f1ab6f31a1 Merge pull request #3003 from nickvergessen/ticket/13117 
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
 2014-09-30 14:00:02 +02:00
Joas Schilling
f64a937a57 [ticket/13111] Dropdown options are already an array in the field data 
PHPBB3-13111
 2014-09-30 12:27:14 +02:00
Joas Schilling
526329e697 [ticket/13118] Correctly use the provided datetime class 
PHPBB3-13118
 2014-09-30 11:58:02 +02:00
Joas Schilling
89fdd1baf2 [ticket/13105] Fix the code logic as described in the comment 
PHPBB3-13105
 2014-09-29 21:39:31 +02:00
Jakub Senko
e132cdd325 [ticket/13116] Interchange post and topic approval notification 
PHPBB3-13116
 2014-09-29 21:13:53 +02:00
Joas Schilling
bc24c78e06 [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql 
Unintended change from 95ab4b3e93

PHPBB3-13117
 2014-09-29 20:48:47 +02:00
Nils Adermann
8de97b8dbe Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13113] Updates the base url only when the front-end isn't app.php
 2014-09-29 16:17:25 +02:00
Nils Adermann
6f093ade8a Merge pull request #3001 from Nicofuma/ticket/13113 
[ticket/13113] Updates the base url only when the front-end isn't app.php
 2014-09-29 16:16:30 +02:00
Tristan Darricau
a159899d02 [ticket/13113] Updates the base url only when the front-end isn't app.php 
PHPBB3-13113
 2014-09-28 23:32:56 +02:00
rxu
eb2aa1f83a [ticket/13110] Add core event to the page_footer() function 
Add core event to the page_footer() in includes/functions.php to allow
extensions handling overall page output before its displaying.

PHPBB3-13110
 2014-09-28 15:39:06 +08:00
rxu
cee8ac9dbe [ticket/13107] Add template events to forum row in forumlist_body.html 
PHPBB3-13107
 2014-09-27 09:26:35 +08:00
Joas Schilling
573c2af336 Merge branch 'develop-ascraeus' into develop 2014-09-25 22:03:01 +02:00
Joas Schilling
71ac6ab2b8 Merge pull request #2996 from Senky/ticket/13104 
[ticket/13104] Responsive tabs display bug in IE11
 2014-09-25 22:02:23 +02:00
Andreas Fischer
b703d1e8df Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
 2014-09-25 21:52:53 +02:00
Andreas Fischer
be769d4ca6 Merge pull request #2995 from nickvergessen/ticket/13105 
[ticket/13105] Future relative dates are always displayed as "Tomorrow"

* nickvergessen/ticket/13105:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
 2014-09-25 21:52:53 +02:00
Andreas Fischer
a3e910f23f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
 2014-09-25 21:47:28 +02:00
Andreas Fischer
e802c5f082 Merge pull request #2997 from Senky/ticket/13106 
[ticket/13106] Remove the \phpbb\di\pass\kernel_pass class

* Senky/ticket/13106:
  [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
 2014-09-25 21:47:28 +02:00
Jakub Senko
f64373a29f [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php 
PHPBB3-13106
 2014-09-25 20:12:33 +02:00
Jakub Senko
a1683dfb67 [ticket/13104] inline-block -> block 
PHPBB3-13104
 2014-09-25 20:07:06 +02:00
Joas Schilling
e803efc6fc [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow" 
PHPBB3-13105
 2014-09-25 18:09:32 +02:00
Joas Schilling
459c62b339 [ticket/13105] Add a test for relative dates 
PHPBB3-13105
 2014-09-25 18:09:24 +02:00
Andreas Fischer
c55a666347 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13086] String replaces 50 with 20
 2014-09-24 21:24:42 +02:00
Andreas Fischer
1b3109d650 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php
 2014-09-24 21:24:29 +02:00