Commit graph

21580 commits

Author SHA1 Message Date
Andreas Fischer
29b957eea4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12603] Remove hook system documentation.
2014-05-27 18:33:56 +02:00
Andreas Fischer
2a1925a783 Merge pull request #2503 from prototech/ticket/12603
[ticket/12603] Remove hook system documentation.

* prototech/ticket/12603:
  [ticket/12603] Remove hook system documentation.
2014-05-27 18:33:56 +02:00
Cesar G
4c4227589f [ticket/12603] Remove hook system documentation.
The code for hooks still exists in Ascraeus for compatibility reasons, however,
it is no longer recommended that they be used. The events system should be
used instead.

PHPBB3-12603
2014-05-27 09:28:23 -07:00
Andreas Fischer
e74628ee8d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12527] Fix "board’s language" vs "boards language"
  [ticket/12527] Use a proper language string on confirm screen
  [ticket/12527] Remove unnecessary language strings
  [ticket/12527] Check whether the language exists
  [ticket/12527] Restore missing files and variables check
  [ticket/12527] Remove editor from template
  [ticket/12527] Remove language file editor form ACP
2014-05-27 17:34:50 +02:00
Andreas Fischer
edf81cd534 Merge pull request #2440 from nickvergessen/ticket/12527
[ticket/12527] Remove translation editor from ACP

* nickvergessen/ticket/12527:
  [ticket/12527] Fix "board’s language" vs "boards language"
  [ticket/12527] Use a proper language string on confirm screen
  [ticket/12527] Remove unnecessary language strings
  [ticket/12527] Check whether the language exists
  [ticket/12527] Restore missing files and variables check
  [ticket/12527] Remove editor from template
  [ticket/12527] Remove language file editor form ACP
2014-05-27 17:34:50 +02:00
Andreas Fischer
b3fd9211ed Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12600] Add @log to the dependencies of extension:show
2014-05-27 16:59:09 +02:00
Andreas Fischer
31b5e749c1 Merge pull request #2500 from Nicofuma/ticket/12600
[ticket/12600] Add @log to the dependencies of extension:show

* Nicofuma/ticket/12600:
  [ticket/12600] Add @log to the dependencies of extension:show
2014-05-27 16:59:09 +02:00
Cesar G
dd2c1164d2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12580] Remove :link pseudo from a tag
2014-05-27 07:14:08 -07:00
Cesar G
bca34bd3bb Merge remote-tracking branch 'hanakin/ticket/12580' into develop-ascraeus
* hanakin/ticket/12580:
  [ticket/12580] Remove :link pseudo from a tag
2014-05-27 07:13:46 -07:00
Tristan Darricau
0a2e0ee964 [ticket/12600] Add @log to the dependencies of extension:show
PHPBB3-12600
2014-05-27 15:35:10 +02:00
Andreas Fischer
311dda277c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12592] Make hhvm run MySQL again.
2014-05-27 13:43:41 +02:00
Andreas Fischer
b3ba11024b Merge pull request #2497 from bantu/ticket/12592
[ticket/12592] Make hhvm run MySQL again.

* bantu/ticket/12592:
  [ticket/12592] Make hhvm run MySQL again.
2014-05-27 13:43:41 +02:00
Andreas Fischer
ef96f8aa2c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12570] Keep MySQLi procedural
  [ticket/12570] Remove test for affected rows after SELECT
  [ticket/12570] Add a test for set_array() and updating with the same value
  [ticket/12570] Fix MySQL affectedrows
  [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS
  [ticket/12570] Add a unit test to show broken sql_affectedrows()
  [ticket/12570] Add test for updating a config with the same value
2014-05-26 23:09:51 +02:00
Andreas Fischer
d646354b0e Merge pull request #2492 from nickvergessen/ticket/12570
[ticket/12570] Fix updating a config with the same value

* nickvergessen/ticket/12570:
  [ticket/12570] Keep MySQLi procedural
  [ticket/12570] Remove test for affected rows after SELECT
  [ticket/12570] Add a test for set_array() and updating with the same value
  [ticket/12570] Fix MySQL affectedrows
  [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS
  [ticket/12570] Add a unit test to show broken sql_affectedrows()
  [ticket/12570] Add test for updating a config with the same value
2014-05-26 23:09:51 +02:00
Andreas Fischer
ea17a7cc5b [ticket/12592] Make hhvm run MySQL again.
PHPBB3-12592
2014-05-26 21:55:44 +02:00
Joas Schilling
fcdf1101cb [ticket/12570] Keep MySQLi procedural
PHPBB3-12570
2014-05-26 21:43:40 +02:00
Joas Schilling
275e56ce70 [ticket/12570] Remove test for affected rows after SELECT
It's not supposed to work

PHPBB3-12570
2014-05-26 21:43:40 +02:00
Joas Schilling
adc62684f0 [ticket/12570] Add a test for set_array() and updating with the same value
PHPBB3-12570
2014-05-26 21:43:39 +02:00
Joas Schilling
d87dba3b05 [ticket/12570] Fix MySQL affectedrows
We always want the number of matched rows instead of changed rows,
when running an update. So when mysql_info() returns the number of
matched rows we return that one instead of mysql_affected_rows()

PHPBB3-12570
2014-05-26 21:43:38 +02:00
Joas Schilling
b92eac71e4 [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS
PHPBB3-12570
2014-05-26 21:43:38 +02:00
Joas Schilling
15516bd078 [ticket/12570] Add a unit test to show broken sql_affectedrows()
PHPBB3-12570
2014-05-26 21:43:37 +02:00
Joas Schilling
ce5258d801 [ticket/12570] Add test for updating a config with the same value
PHPBB3-12570
2014-05-26 21:43:36 +02:00
Joas Schilling
cfa9d23988 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12592] Add PHP 5.4 environment using mysql driver.
  [ticket/12592] Rename mysql environment to mysqli.
2014-05-26 21:38:07 +02:00
Joas Schilling
502cbad5a7 Merge pull request #2496 from bantu/ticket/12592
[ticket/12592] Run mysql driver on Travis CI.

* bantu/ticket/12592:
  [ticket/12592] Add PHP 5.4 environment using mysql driver.
  [ticket/12592] Rename mysql environment to mysqli.
2014-05-26 21:36:17 +02:00
Andreas Fischer
d90da12afc [ticket/12592] Add PHP 5.4 environment using mysql driver.
PHPBB3-12592
2014-05-26 19:07:40 +02:00
Joas Schilling
5e3ce27e13 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12074] Update the visibility of the constructor
  [ticket/12074] Don't log errors
  [ticket/12074] Managing extensions doesn't produce any log entry
2014-05-26 19:00:40 +02:00
Joas Schilling
a6782801e7 Merge pull request #2429 from Nicofuma/ticket/12074
[ticket/12074] Managing extensions doesn't produce any log entry

* Nicofuma/ticket/12074:
  [ticket/12074] Update the visibility of the constructor
  [ticket/12074] Don't log errors
  [ticket/12074] Managing extensions doesn't produce any log entry
2014-05-26 18:55:19 +02:00
Andreas Fischer
c0dc0fc09b [ticket/12592] Rename mysql environment to mysqli.
PHPBB3-12592
2014-05-26 18:49:29 +02:00
Joas Schilling
e2cb2ec66b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12583] Redirect only on non-empty $message
  [ticket/12583] Add event core.mcp_warn_post_before/after
2014-05-26 18:39:51 +02:00
Joas Schilling
26674bff39 Merge pull request #2487 from n-aleha/ticket/12583
[ticket/12583] Add event core.mcp_warn_post_before/after

* n-aleha/ticket/12583:
  [ticket/12583] Redirect only on non-empty $message
  [ticket/12583] Add event core.mcp_warn_post_before/after
2014-05-26 18:39:44 +02:00
Joas Schilling
d29ca3d4f3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12584] Redirect only on non-empty $message
  [ticket/12584] Add event core.mcp_warn_user_before/after
2014-05-26 18:36:59 +02:00
Joas Schilling
85fb2bf203 Merge pull request #2488 from n-aleha/ticket/12584
[ticket/12584] Add event core.mcp_warn_user_before/after

* n-aleha/ticket/12584:
  [ticket/12584] Redirect only on non-empty $message
  [ticket/12584] Add event core.mcp_warn_user_before/after
2014-05-26 18:36:53 +02:00
Joas Schilling
0a01b6a4cb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12270] Fixed topic counting bug and tests
  [ticket/12270] Fixed tests not working
  [ticket/12270] No quote notif and double poster notification fix
  [ticket/12270] Fixed tests
  [ticket/12270] Fixed rebase conflicts
  [ticket/12270] Correct confirm approval message for topics
  [ticket/12270] Correcting to follow phpBB coding standards
  [ticket/12270] Better structured code and no debug error message
  [ticket/12270] Correct notifications for posts/topics now working
  [ticket/12270] Reverted templates
  [ticket/12270] Correct post&topic approval msg, no template changes
  [ticket/12270] Corrent post and topic approval notification message
2014-05-26 18:18:37 +02:00
Joas Schilling
172b7cfe35 Merge pull request #2134 from marcosbc/ticket/12270
[ticket/12270] Current post and topic approval notification message

* marcosbc/ticket/12270:
  [ticket/12270] Fixed topic counting bug and tests
  [ticket/12270] Fixed tests not working
  [ticket/12270] No quote notif and double poster notification fix
  [ticket/12270] Fixed tests
  [ticket/12270] Fixed rebase conflicts
  [ticket/12270] Correct confirm approval message for topics
  [ticket/12270] Correcting to follow phpBB coding standards
  [ticket/12270] Better structured code and no debug error message
  [ticket/12270] Correct notifications for posts/topics now working
  [ticket/12270] Reverted templates
  [ticket/12270] Correct post&topic approval msg, no template changes
  [ticket/12270] Corrent post and topic approval notification message
2014-05-26 18:09:54 +02:00
n-aleha
62cb7e0c10 [ticket/12584] Redirect only on non-empty $message
PHPBB3-12584
2014-05-25 22:40:20 +03:00
n-aleha
fdb53b23fb [ticket/12584] Add event core.mcp_warn_user_before/after
Event for when warning a user from MCP.

PHPBB3-12584
2014-05-25 22:40:15 +03:00
n-aleha
589ad564cc [ticket/12583] Redirect only on non-empty $message
PHPBB3-12583
2014-05-25 22:00:37 +03:00
Joas Schilling
55aa5c8296 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
2014-05-24 14:30:28 +02:00
Joas Schilling
1b73c217f0 Merge pull request #2458 from prototech/ticket/12543
[ticket/12543] Only take over ENTER and ESC keys when alert box is active.

* prototech/ticket/12543:
  [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
2014-05-24 14:28:38 +02:00
Joas Schilling
4ef9334dba Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12275] Change if (empty) to if (!isset)
  [ticket/12275] Fix a bug on the event "core.modify_username_string"
2014-05-24 14:20:51 +02:00
Joas Schilling
c7f51ca1a7 Merge pull request #2199 from Zoddo/ticket/12275
[ticket/12275] Fix a bug on the event "core.modify_username_string"

* Zoddo/ticket/12275:
  [ticket/12275] Change if (empty) to if (!isset)
  [ticket/12275] Fix a bug on the event "core.modify_username_string"
2014-05-24 14:18:43 +02:00
marcosbc
36dfb95816 [ticket/12270] Fixed topic counting bug and tests
Topics was not correctly counted (the counter didn't count topics
that were re-approved, for example, but only the ones that were
unapproved.
This should also fix the test that wasn't working correctly.

PHPBB3-12270
2014-05-24 14:06:23 +02:00
Joas Schilling
2d3f486c91 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12531] Add some line breaks to really long lines
  [ticket/12531] Restore default topic link functionality in subsilver2
2014-05-24 14:03:40 +02:00
Joas Schilling
2aeb795494 Merge pull request #2444 from VSEphpbb/ticket/12531
[ticket/12531] Restore default topic link behavior to subsilver2

* VSEphpbb/ticket/12531:
  [ticket/12531] Add some line breaks to really long lines
  [ticket/12531] Restore default topic link functionality in subsilver2
2014-05-24 14:03:16 +02:00
Andreas Fischer
219d8a41dc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12585] Use a 5 minutes interval instead of 10 minutes
  [ticket/12585] Don't check the cron on each page load
2014-05-24 11:55:34 +02:00
Andreas Fischer
42bc2612c4 Merge pull request #2490 from Nicofuma/ticket/12585
[ticket/12585] Don't check the cron on each page load

* Nicofuma/ticket/12585:
  [ticket/12585] Use a 5 minutes interval instead of 10 minutes
  [ticket/12585] Don't check the cron on each page load
2014-05-24 11:55:32 +02:00
Tristan Darricau
0ae4b82c30 [ticket/12585] Use a 5 minutes interval instead of 10 minutes
PHPBB3-12585
2014-05-23 23:02:31 +02:00
Matt Friedman
3913ee9607 [ticket/12531] Add some line breaks to really long lines
PHPBB3-12531
2014-05-23 10:47:25 -07:00
hanakin
9a130e31a2 [ticket/12580] Remove :link pseudo from a tag
removed the :link pseudo from a tag as due to specificity it prevents
classes from altering any properties set to it.

PHPBB3-12580
2014-05-23 15:46:39 +02:00
n-aleha
7a6867d54e [ticket/12583] Add event core.mcp_warn_post_before/after
Event for when warning a user for a post.

PHPBB3-12583
2014-05-23 16:30:41 +03:00