Commit graph

22039 commits

Author SHA1 Message Date
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
Tristan Darricau
91305a43af [ticket/12589] Add test searching in a non absolute directory
PHPBB3-12589
2014-05-26 18:30:04 +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
Tristan Darricau
930c5d85ed [ticket/12589] Fix tests
PHPBB3-12589
2014-05-24 18:58:52 +02:00
Tristan Darricau
f7896f46a5 [ticket/12589] Search directly in $directory if it's an absolute sub-path
PHPBB3-12589
2014-05-24 17:57:01 +02:00
PayBas
05839f8599 [ticket/12561] Added test for "after"
PHPBB3-12561
2014-05-24 14:37:08 +02: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
Andreas Fischer
d01c947132 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12555] Add canonical URL for viewtopic
  [ticket/12555] Add canonical URL for viewforum
  [ticket/12555] Add canonical URl for memberlist mode=viewprofile
  [ticket/12555] Allow to set canonical URLs to avoid duplicate content
2014-05-23 03:06:42 +02:00
Andreas Fischer
3d19776037 Merge pull request #2468 from nickvergessen/ticket/12555
[Ticket/12555] Make use of canonical urls to avoid duplicate content

* nickvergessen/ticket/12555:
  [ticket/12555] Add canonical URL for viewtopic
  [ticket/12555] Add canonical URL for viewforum
  [ticket/12555] Add canonical URl for memberlist mode=viewprofile
  [ticket/12555] Allow to set canonical URLs to avoid duplicate content
2014-05-23 03:06:42 +02:00
Andreas Fischer
fefaf2f68e Merge pull request #2478 from VSEphpbb/ticket/12564
[ticket/12564] Remove version definition from ACP/MCP/UCP module info files

* VSEphpbb/ticket/12564:
  [ticket/12564] Remove version definitions from modules in tests
  [ticket/12564] Remove version definition from ACP/MCP/UCP module info files
2014-05-23 01:14:24 +02:00
Andreas Fischer
7a464a83b5 Merge pull request #2480 from rxu/ticket/12572
[ticket/12572] Fix JS error when alert message title is undefined

* rxu/ticket/12572:
  [ticket/12572] Fix JS error when alert message title is undefined
2014-05-23 00:58:12 +02:00
Andreas Fischer
59ca723174 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12572] Fix JS error when alert message title is undefined
2014-05-23 00:58:12 +02:00
Joas Schilling
0bc73cf9f8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12551] Float breadcrumbs to the right in RTL languages.
2014-05-23 00:46:03 +02:00
Joas Schilling
adf5daa1c7 Merge pull request #2467 from prototech/ticket/12551
[ticket/12551] Float breadcrumbs to the right in RTL languages.

* prototech/ticket/12551:
  [ticket/12551] Float breadcrumbs to the right in RTL languages.
2014-05-23 00:45:35 +02:00
Joas Schilling
69e3b5eda6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12550] Prevent last post column from jumping to second line in RTL.
2014-05-23 00:45:21 +02:00
Joas Schilling
7223339f1e Merge pull request #2466 from prototech/ticket/12550
[ticket/12550] Prevent last post column from jumping to second line in RTL.

* prototech/ticket/12550:
  [ticket/12550] Prevent last post column from jumping to second line in RTL.
2014-05-23 00:45:06 +02:00
Joas Schilling
7f62d8ea21 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.
2014-05-23 00:44:46 +02:00
Joas Schilling
a9cce2e857 Merge pull request #2465 from prototech/ticket/12549
[ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.

* prototech/ticket/12549:
  [ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.
2014-05-23 00:44:20 +02:00
Andreas Fischer
c3639a4d5f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12576] Retrieve the cron_manager in cron.php if needed
  [ticket/12576] Remove cron from common.php
2014-05-23 00:34:28 +02:00
Andreas Fischer
1eef2f2782 Merge pull request #2484 from Nicofuma/ticket/12576
[ticket/12576] Remove cron from common.php

* Nicofuma/ticket/12576:
  [ticket/12576] Retrieve the cron_manager in cron.php if needed
  [ticket/12576] Remove cron from common.php
2014-05-23 00:34:28 +02:00
Andreas Fischer
9b52f17fcc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12586] Limit depth to 2, we require vendor/extension/ext.php
  [ticket/12586] Use dot filter when trying to find available extensions
2014-05-23 00:19:33 +02:00
Andreas Fischer
b0dd144fe3 Merge pull request #2491 from nickvergessen/ticket/12586
Ticket/12586 Filter files and depth when looking for extensions

* nickvergessen/ticket/12586:
  [ticket/12586] Limit depth to 2, we require vendor/extension/ext.php
  [ticket/12586] Use dot filter when trying to find available extensions
2014-05-23 00:19:32 +02:00
Joas Schilling
1572aca7b0 [ticket/12586] Limit depth to 2, we require vendor/extension/ext.php
PHPBB3-12586
2014-05-22 23:43:35 +02:00
Joas Schilling
488904d0bf [ticket/12586] Use dot filter when trying to find available extensions
PHPBB3-12586
2014-05-22 23:42:49 +02:00
Tristan Darricau
c83b568848 [ticket/12585] Don't check the cron on each page load
PHPBB3-12585
2014-05-22 22:34:03 +02:00
rxu
6466002052 [ticket/12572] Fix JS error when alert message title is undefined
JS console reports error in core.js:
TypeError: alert is undefined
alert.hide()
when res.MESSAGE_TITLE is undefined.

PHPBB3-12572
2014-05-22 19:59:33 +08:00
Tristan Darricau
004b317876 [ticket/12576] Retrieve the cron_manager in cron.php if needed
PHPBB3-12576
2014-05-22 13:47:37 +02:00
Tristan Darricau
ff280d3f46 [ticket/12576] Remove cron from common.php
PHPBB3-12576
2014-05-22 12:45:03 +02:00
marcosbc
c47c50a29e [ticket/12270] Fixed tests not working
The success message wasn't output correctly if we were approving
topics.

PHPBB3-12270
2014-05-21 00:52:42 +02:00
Matt Friedman
a18c293739 [ticket/12564] Remove version definitions from modules in tests
PHPBB3-12564
2014-05-20 11:37:42 -07:00
PayBas
9ddf02243e [ticket/12561] Add "after" check to schema_generator for columns_add
PHPBB3-12561
2014-05-19 12:04:47 +02:00
Matt Friedman
6aeb22bfd7 [ticket/12564] Remove version definition from ACP/MCP/UCP module info files
PHPBB3-12564
2014-05-18 17:43:26 -07:00
Joas Schilling
c72e6ceb06 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [task/sami] Establish alphabetical order.
  [task/sami] Also ignore ext/ directory.
  [task/sami] Replace phpdoctor with sami.
  [task/sami] Add sami/sami as a composer development dependency.
2014-05-18 18:58:40 +02:00
Joas Schilling
a2cd9c2464 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-05-18 18:58:30 +02:00