1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-12 03:34:15 +01:00

21284 Commits

Author SHA1 Message Date
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Joas Schilling
a2cd9c2464 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-05-18 18:58:30 +02:00
Joas Schilling
785c56ab56 Merge pull request #2471 from bantu/task/sami-ascraeus
[task/sami-ascraeus] Add Sami to composer dependencies and build script

* bantu/task/sami-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:27 +02:00
Joas Schilling
ac3e0e53b2 Merge pull request #2470 from bantu/task/sami
[task/sami] Add Sami to composer dependencies and build script

* bantu/task/sami:
  [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:56:52 +02:00
Andreas Fischer
e44acf4084 Merge branch 'task/sami' into task/sami-ascraeus
* task/sami:
  [task/sami] Establish alphabetical order.
  [task/sami] Also ignore ext/ directory.
2014-05-17 13:07:00 +02:00
Andreas Fischer
223058c8c6 [task/sami] Establish alphabetical order.
PHPBB3-12495
2014-05-17 13:05:52 +02:00
Andreas Fischer
6a97d9f855 [task/sami] Also ignore ext/ directory.
PHPBB3-12495
2014-05-17 13:04:25 +02:00
Cesar G
8b5b318f0a Merge remote-tracking branch 'n-aleha/ticket/12547' into develop-ascraeus
* n-aleha/ticket/12547:
  [ticket/12547] Rename jquery.js to jquery.min.js in assets directory
2014-05-16 22:04:52 -07:00
Cesar G
747eb198ef Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeus
* n-aleha/ticket/12525:
  [ticket/12525] Add string argument to contact and email user language variables
2014-05-16 20:04:34 -07:00
n-aleha
a114333209 [ticket/12525] Add string argument to contact and email user language variables
In language/en/common.php:
* Introduce a new language variable 'CONTACT' => 'Contact'
* Add a string argument to lang var 'CONTACT_USER' to avoid an appended
 '{USERNAME}' in template.
* Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended
 '{USERNAME}' in template.

Also fix typos.

PHPBB3-12525
2014-05-17 04:50:57 +03:00
Cesar G
5dc0605b6b Merge remote-tracking branch 'brunoais/ticket/PHPBB3-12533' into develop-ascraeus
* brunoais/ticket/PHPBB3-12533:
  [ticket/12533] Make <a> use all the "see all" "button"
  [ticket/12533] Make <a> use all the notification item size
2014-05-16 17:00:40 -07:00
Andreas Fischer
9cea96ad4e Merge branch 'task/sami' into task/sami-ascraeus
* task/sami:
  [task/sami] Replace phpdoctor with sami.
  [task/sami] Add sami/sami as a composer development dependency.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
2014-05-16 18:13:45 +02:00
Andreas Fischer
f08f283143 [task/sami] Replace phpdoctor with sami.
PHPBB3-12495
2014-05-16 17:56:03 +02:00
Andreas Fischer
b32f91b9c6 [task/sami] Add sami/sami as a composer development dependency.
PHPBB3-12495
2014-05-16 17:55:41 +02:00
Joas Schilling
0ad2e22ec0 [ticket/12555] Add canonical URL for viewtopic
Avoids duplicate content of:
* viewtopic.php?t=topic_id
* viewtopic.php?f=forum_id&t=topic_id
* viewtopic.php?f=forum_id&t=topic_id&hilit=highlight_string
* viewtopic.php?f=forum_id&t=topic_id&view=unread
* viewtopic.php?f=forum_id&p=post_id
* viewtopic.php?f=forum_id&t=topic_id&start=0

PHPBB3-12555
2014-05-16 11:38:37 +02:00
Joas Schilling
08b5d052c6 [ticket/12555] Add canonical URL for viewforum
Avoids duplicate content of:
* viewforum.php?f=forum_id
* viewforum.php?f=forum_id&start=0

PHPBB3-12555
2014-05-16 11:34:04 +02:00
Joas Schilling
199854af1b [ticket/12555] Add canonical URl for memberlist mode=viewprofile
Avoids duplicate content of:
* memberlist.php?mode=viewprofile&u=user_id
* memberlist.php?mode=viewprofile&un=username

PHPBB3-12555
2014-05-16 11:32:33 +02:00
Joas Schilling
613f4f7525 [ticket/12555] Allow to set canonical URLs to avoid duplicate content
PHPBB3-12555
2014-05-16 11:32:01 +02:00