1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

23230 Commits

Author SHA1 Message Date
Joas Schilling
2ee13bbc24 Merge pull request #3004 from Senky/ticket/13116
[ticket/13116] Topic and post approval notifications got interchanged
2014-10-02 15:18:23 +02:00
Tristan Darricau
c123c93ca0 Merge pull request #3012 from nickvergessen/ticket/13123
[ticket/13123] Add events to allow modifying post data

* nickvergessen/ticket/13123:
  [ticket/13123] Add events to allow modifying post data
2014-10-01 16:09:04 +02:00
Marc Alexander
0e27b10b8f Merge pull request #3015 from nickvergessen/ticket/13119
[ticket/13119] Add another event which is triggered independent from actions
2014-10-01 15:59:00 +02:00
Joas Schilling
95c0d81ba1 [ticket/13119] Add another event which is triggered independent from actions
PHPBB3-13119
2014-10-01 14:54:26 +02:00
Joas Schilling
40cd7570e6 [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224"
This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing
changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292.

PHPBB3-11224
2014-10-01 11:38:45 +02:00
Joas Schilling
b003019958 Merge pull request #3013 from VSEphpbb/ticket/13121
[ticket/13121] Remove cache mode from style management module
2014-10-01 10:34:08 +02:00
Joas Schilling
d264369441 Merge pull request #2460 from Nicofuma/ticket/11224
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
2014-10-01 10:27:47 +02:00
Joas Schilling
75fcfb1c1d Merge pull request #2545 from ptitlazy/ticket/12657
[ticket/12657] Add a test file for base case of command cache:purge
2014-10-01 10:24:19 +02:00
Joas Schilling
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993
[ticket/12993] Improve get_user_ranks
2014-10-01 10:19:24 +02:00
Joas Schilling
994a0dcd4c Merge branch 'ticket/12985' into develop-ascraeus 2014-10-01 10:09:29 +02:00
david63
5314c2bddf [ticket/12985] Add core.login_box_redirect
Add core.login_box_redirect core event to allow extensions to redirect a
user to a specific page when logging in.

PHPBB3-12985
2014-10-01 10:09:10 +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
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
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
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
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
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
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
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
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
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 95ab4b3e931521ce3c56068478311f0c04f713cc

PHPBB3-13117
2014-09-29 20:48:47 +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
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
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
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
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
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
Andreas Fischer
ce0c33f62a Merge pull request #2994 from Skouat/ticket/13086-olympus
[ticket/13086] Update ACP_MASS_EMAIL_EXPLAIN language key

* Skouat/ticket/13086-olympus:
  [ticket/13086] String replaces 50 with 20
2014-09-24 21:21:53 +02:00
Mario Skouat
077db77259 [ticket/13086] String replaces 50 with 20
PHPBB3-13086
2014-09-24 19:03:33 +02:00
Marc Alexander
30e1d29f58 Merge pull request #2993 from nickvergessen/ticket/13087
[ticket/13087] Correctly link to user profile when contact field has no URL
2014-09-24 18:27:37 +02:00
blitze
04e9789e7f [ticket/13072] Added '@changed 3.1.0-RC5 Added total_match_count'
PHPBB3-13072
2014-09-24 16:15:38 +00:00
Joas Schilling
b51b4c92e2 [ticket/13087] Correctly link to user profile when contact field has no URL
Broken by 975c5655f0e9b65b7de3f2b832f1ef660a473832

PHPBB3-13087
2014-09-24 17:33:54 +02:00