Commit graph

8728 commits

Author SHA1 Message Date
Andreas Fischer
ae35c4b05c [ticket/12673] IMAGETYPE_SWC might be missing when SWC is not supported.
PHPBB3-12673
2014-06-08 16:46:55 +02:00
Andreas Fischer
f9c0a6b96e Merge pull request #2526 from Nicofuma/ticket/12639
[ticket/12639] Delete entry in admin-log leads to mysql-error

* Nicofuma/ticket/12639:
  [ticket/12639] Add a space in the code generated by generate_sql_keyword()
  [ticket/12639] Handle $conditions['keywords'] outside of the loop
  [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
  [ticket/12639] Send a correct IN entry when deleting marked logs
  [ticket/12639] Use assertSame
  [ticket/12639] Remove old commented tests
  [ticket/12639] Order the results correctly in the test
  [ticket/12639] Fix tests on postgres
  [ticket/12639] Update tests to use a dataProvider
  [ticket/12639] Add a test case with an empty keywords list
  [ticket/12639] Delete entry in admin-log leads to mysql-error
2014-06-04 23:59:20 +02:00
Tristan Darricau
3e31764007 [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
PHPBB3-12639
2014-06-02 23:22:36 +02:00
Tristan Darricau
5b5f3a5d0c [ticket/12639] Send a correct IN entry when deleting marked logs
PHPBB3-12639
2014-06-02 23:15:25 +02:00
PayBas
0baf501569 [ticket/12566] Also changed for ucp_pm_viewmessage.php
PHPBB3-12566
2014-06-02 22:12:58 +02:00
Tristan Darricau
36071ded9d [ticket/12639] Delete entry in admin-log leads to mysql-error
PHPBB3-12639
2014-05-31 12:56:44 +02:00
Joas Schilling
40218ba5e6 Merge pull request #2433 from Nicofuma/ticket/10899
[ticket/10899] Using Delete All in log viewer with keyword search

* Nicofuma/ticket/10899:
  [ticket/10899] Update doc block
  [ticket/10899] Use isset($field_value['IN'])
  [ticket/10899] Add event core.delete_log
  [ticket/10899] Remove trailing ;
  [ticket/10899] Fix typo in the class name
  [ticket/10899] Add unit tests
  [ticket/10899] Get $phpbb_log from the container
  [ticket/10899] Remove extra ';'
  [ticket/10899] Typo
  [ticket/10899] Refactoring in \phpbb\log\log_interface
  [ticket/10899] Using Delete All in log viewer with keyword search
2014-05-30 23:13:00 +02:00
Joas Schilling
be52ea882a Merge pull request #2357 from Nicofuma/ticket/11942
[ticket/11942] Delete post/topic reason should be added to logs

* Nicofuma/ticket/11942:
  [ticket/11942] Don't change the reason to '' when hard deleting
  [ticket/11942] Don't show the checkbox if the post is already soft-deleted
  [ticket/11942] Remove useless IF in templates
  [ticket/11942] Apply the modifications to subsilver
  [ticket/11942] Always display delete reason
  [ticket/11942] Edits messages
  [ticket/11942] Change the formulation
  [ticket/11942] Adding the reason to hard deleted topic/post
  [ticket/11942] Delete post/topic reason should be added to logs
2014-05-30 23:04:02 +02:00
Joas Schilling
9f87c497fe Merge pull request #2447 from n-aleha/ticket/11467
[ticket/11467] Add language variables for extension exception messages

* n-aleha/ticket/11467:
  [ticket/11467] Add user object to extension manager for tests
  [ticket/11467] Add language variables to tests
  [ticket/11467] Add language variables for extension exception messages
2014-05-30 23:01:19 +02:00
Joas Schilling
669a6c3e3d Merge pull request #2512 from bantu/ticket/11266
[ticket/11266] Better message for when composer dependencies are missing...

* bantu/ticket/11266:
  [ticket/11266] Better message for when composer dependencies are missing.
2014-05-30 22:57:43 +02:00
Joas Schilling
da48b7df22 [prep-release-3.1.0-b4] Update phpBB Version for b5 development 2014-05-30 17:52:38 +02:00
Joas Schilling
b6135d3d02 [prep-release-3.1.0-b4] Update version to 3.1.0-b4 2014-05-30 16:23:44 +02:00
Andreas Fischer
505b26ed86 [ticket/11266] Better message for when composer dependencies are missing.
PHPBB3-11266
2014-05-29 16:13:29 +02:00
Tristan Darricau
70f313eb4f [ticket/11942] Don't change the reason to '' when hard deleting
PHPBB3-11942
2014-05-29 00:49:12 +02:00
Joas Schilling
cae8448fe4 Merge pull request #2432 from Nicofuma/ticket/11226
[ticket/11226] filespec::move_file() should error correctly

* Nicofuma/ticket/11226:
  [ticket/11226] Explicity set file_moved to false
  [ticket/11226] Add tests
  [ticket/11226] Use $user->lang()
  [ticket/11226] filespec::move_file() should error correctly
2014-05-29 00:15:10 +02:00
n-aleha
031273de72 [ticket/11467] Add language variables for extension exception messages
Remove hard-coded messages and add language variables for extension
exception messages.

PHPBB3-11467
2014-05-29 01:07:44 +03:00
Tristan Darricau
b75fb96bab [ticket/11226] Explicity set file_moved to false
PHPBB3-11226
2014-05-28 22:34:10 +02:00
Tristan Darricau
8dc10d6971 [ticket/11366] Add $config['extension_force_unstable']
PHPBB3-11366
2014-05-28 22:19:03 +02:00
Tristan Darricau
f4d598559f [ticket/11366] Use force_cache on the list page
PHPBB3-11366
2014-05-28 22:19:02 +02:00
Tristan Darricau
13ecddf85b [ticket/11366] Add recheck-all link
PHPBB3-11366
2014-05-28 22:19:00 +02:00
Tristan Darricau
521fe2b8e2 [ticket/11366] Force the use of the cache on the list page
PHPBB3-11366
2014-05-28 22:18:54 +02:00
Tristan Darricau
64467f50db [ticket/11366] Update FILE_NOT_FOUND language string
PHPBB3-11366
2014-05-28 22:17:00 +02:00
Tristan Darricau
537d8b3c16 [ticket/11366] Fix whitespaces
PHPBB3-11366
2014-05-28 22:16:59 +02:00
Tristan Darricau
492c1952c1 [ticket/11366] Update var names
PHPBB3-11366
2014-05-28 22:16:55 +02:00
Tristan Darricau
bee6c6baea [ticket/11366] Fix detailed view
PHPBB3-11366
2014-05-28 22:16:51 +02:00
Tristan Darricau
29244c29d1 [ticket/11366] Remove the double spaces
PHPBB3-11366
2014-05-28 22:16:50 +02:00
Tristan Darricau
5e29ea77d8 [ticket/11366] Coding style
PHPBB3-11366
2014-05-28 22:16:48 +02:00
Nicofuma
f5da195a03 [ticket/11366] Adding a missing commit
PHPBB3-11366
2014-05-28 22:16:41 +02:00
Nicofuma
2552a0fef2 [ticket/11366] Bug Fix: Extensions removed but still registred in DB
Fix the bug with the Extensions removed but still registred in DB

PHPBB3-11366
2014-05-28 22:16:39 +02:00
Nicofuma
44752c0dbf [ticket/11366] Moving to \phpbb\version_helper
+ bug fix (missing exception)
+ Using \phpbb\version_helper
So, now, the version file have a new format :

	{
		"stable": {
			"<branch>": {
				"current": "<version>",
				[ "announcement": "<announcement link>", ]
				[ "download": "<download link>", ]
			},
			"<branch>": {
				...
			}
		},
		"unstable": {
		}
	}

PHPBB3-11366
2014-05-28 22:16:37 +02:00
Nicofuma
e0b2ceef83 [ticket/11366] Extension's version's check
Add a feature to check automatically the version of the installed
extensions. The informations are cached for 24 hours (like for the
global update check on the main page of the acp).

The informations about the versions are display both on the global list
and on the detailled page.

To do this the developper has to to let the composer.json of the latest
version available and add some informations into it :

    "extra": {
		"version-check": {
			"host": "<the host>",
			"directory": "<the directory containing the file>",
			"filename": "<the composer.json of the latest version>"
		}
    }

He can also add two extra informations which will be displayed if a new
version is available :

	"extra": {
		"download": "<download link>",
		"annoucement": "<announcement link>",
    }

Currently a notice is displayed when the "extra.version-check"
informations are
missing.

Ticket: https://tracker.phpbb.com/browse/PHPBB3-11366

Signed-off-by: Nicofuma <github@nicofuma.fr>

PHPBB3-11366
2014-05-28 22:15:47 +02:00
Yuriy Rusko
55e1f02151 [ticket/12594] Replace phpBB Group with phpBB Limited
PHPBB3-12594
2014-05-28 01:07:56 +02:00
Yuriy Rusko
2a42aee8ac Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 2014-05-28 01:02:39 +02:00
Joas Schilling
08c01b7cee Merge pull request #2455 from Nicofuma/ticket/12509
[ticket/12509] Add an option to set the path of custom style directory (ie: email templates) for extensions

* Nicofuma/ticket/12509:
  [ticket/12509] Add example in doc block
  [ticket/12509] Add missing ',' in arrays
  [ticket/12509] Update calls to set_custom_style in forgotten places
  [ticket/12509] Fix path in adm/index.php
  [ticket/12509] Fix typo in adm/index.php
  [ticket/12509] Fix doc block
  [ticket/12509] Fix the call to set_custom_file in adm/index and messenger
  [ticket/12509] Update acp custom_style setter
  [ticket/12509] Add an option to set the path of custom file for extensions
2014-05-28 00:23:37 +02:00
Yuriy Rusko
1d61bcedfd Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Conflicts:
	phpBB/docs/hook_system.html
2014-05-27 21:55:40 +02:00
Yuriy Rusko
27f787e5e4 [ticket/12594] Update footer credit lines
PHPBB3-12594
2014-05-27 21:39:30 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Tristan Darricau
ac1eb2d789 [ticket/10899] Get $phpbb_log from the container
PHPBB3-10899
2014-05-27 19:57:25 +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
Tristan Darricau
9a846e447b [ticket/12509] Add missing ',' in arrays
PHPBB3-12509
2014-05-26 23:44:30 +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
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
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
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