1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-15 00:44:53 +02:00
Commit Graph

1773 Commits

Author SHA1 Message Date
Dhruv
d1055bdd9e Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and others
* develop-ascraeus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
2014-06-09 13:25:24 +05:30
Dhruv
5e9cb35457 Merge branch 'develop-olympus' into develop-ascraeus
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-olympus:
  [ticket/12660] Improve check for when phpinfo() is disabled.
2014-06-09 13:23:49 +05:30
Andreas Fischer
a0c442d16e [ticket/12660] Improve check for when phpinfo() is disabled.
PHPBB3-12660
2014-06-09 03:28:57 +02:00
Andreas Fischer
f1314741fb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:21 +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
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
51b9ea3e86 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:09 +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
e8af120037 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:57 +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
Joas Schilling
953ca27728 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (29 commits)
  [ticket/11366] Fix headings css in list page
  [ticket/11366] Add config value in schema_data.sql
  [ticket/11366] Fix HTML
  [ticket/11366] Exchange links and settings' form
  [ticket/11366] Remove the extra {S_FORM_TOKEN}
  [ticket/11366] Move the links to the top of the page
  [ticket/11366] Hide the version check settings by default
  [ticket/11366] Versions, options and actions heading should be centered
  [ticket/11366] Better language string for "recheck all"
  [ticket/11366] Move "recheck all" link
  [ticket/11366] Add $config['extension_force_unstable']
  [ticket/11366] Use force_cache on the list page
  [ticket/11366] Add recheck-all link
  [ticket/11366] Force the use of the cache on the list page
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Fix whitespaces
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Update var names
  [ticket/11366] Align language strings
  [ticket/11366] Fix detailed view
  ...
2014-05-28 23:46:15 +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
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
Andreas Fischer
3ab06314f1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12594] Replace phpBB Group with phpBB Limited
  [ticket/12594] Update footer credit lines
  [ticket/12594] Remove @package tags and update file headers
2014-05-28 18:19:20 +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
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
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
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
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
192bb74e3c [ticket/12527] Use a proper language string on confirm screen
PHPBB3-12527
2014-05-11 13:30:13 +02:00
Joas Schilling
ada9fc81a3 [ticket/12527] Check whether the language exists
PHPBB3-12527
2014-05-11 13:29:56 +02:00
Joas Schilling
63e195d7f0 [ticket/12527] Restore missing files and variables check
PHPBB3-12527
2014-05-11 13:29:49 +02:00
Joas Schilling
61bca8ed8a [ticket/12527] Remove language file editor form ACP
PHPBB3-12527
2014-05-11 13:29:17 +02:00
Joas Schilling
6cd7abe255 Merge pull request #2420 from prototech/ticket/9388
[ticket/9388] Only display the settings for the selected method in the auth and search ACP pages.

* prototech/ticket/9388:
  [ticket/9388] Use "togglable" instead of "toggable"
  [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
  [ticket/9388] Reopen <fieldset> after auth templates.
  [ticket/9388] Fix unit tests.
  [ticket/9388] Use the new toggle function for the avatar type <select>.
  [ticket/9388] Display only the settings for the selected search backend.
  [ticket/9388] Display only the settings for the auth method that's selected.
  [ticket/9388] Add support for making <select> options able to toggle settings.
2014-05-11 10:48:10 +02:00
Tristan Darricau
c6d7875b9b [ticket/10899] Refactoring in \phpbb\log\log_interface
PHPBB3-10899
2014-05-10 18:24:07 +02:00
Tristan Darricau
c5a4ad3d31 [ticket/10899] Using Delete All in log viewer with keyword search
https://tracker.phpbb.com/browse/PHPBB3-10899

PHPBB3-10899
2014-05-10 17:03:09 +02:00
n-aleha
f2471878a6 [ticket/12476] Increase assets also from acp_styles and phpbbcli
Increase assets also from "ACP > Styles > Purge Cache" and phpbbcli

PHPBB3-12476
2014-05-09 01:50:51 +03:00
n-aleha
cfc0c9bcf9 [ticket/12476] Increase asset version on cache purge
Increace the asset version when purging the cache from "ACP > General"

PHPBB3-12476
2014-05-09 01:49:41 +03:00
Tristan Darricau
3029f93000 [ticket/12074] Don't log errors
PHPBB3-12074
2014-05-09 00:26:07 +02:00
Tristan Darricau
a640a455f3 [ticket/12074] Managing extensions doesn't produce any log entry
PHPBB3-12074
2014-05-09 00:07:56 +02:00
Cesar G
e378037516 [ticket/9388] Display only the settings for the selected search backend.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Cesar G
d95164e641 [ticket/9388] Display only the settings for the auth method that's selected.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Cesar G
71379c3a0f Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeus
* VSEphpbb/ticket/12332:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names
2014-05-05 16:51:29 -07:00
Joas Schilling
b60108dc78 Merge pull request #2267 from prototech/ticket/10737
[ticket/10737] Add  live member search.

* prototech/ticket/10737:
  [ticket/10737] Remove loading indicator.
  [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
  [ticket/10737] Add config setting to disable live searches.
  [ticket/10737] Add loading indicator and alert box code to simple_footer.html.
  [ticket/10737] Load core.js and ajax.js in simple_footer.html.
  [ticket/10737] Set the username as the input value instead of redirecting.
  [ticket/10737] Drop subsilver2 changes.
  [ticket/10737] Add a more generic live search implementation.
  [ticket/10737] Clean up memberlist.php.
  [ticket/10737] Use dropdown for search results container.
  [ticket/10737] Adding delayed keyup and removing target_blank.
  [ticket/10737] Using UTF-8 aware alternatives in PHP code.
  [ticket/10737] Removing obsolete code.
  [ticket/10737] Avoid hard-coding table row and use case-insensitive search.
  [ticket/10737] Removing unnecessary/obsolete code.
  [ticket/10737] Using JQuery events and JSON response.
  [ticket/10737] Code fixes in AJAX search feature
  [ticket/10737] Improvements over last commit
  [ticket/10737] Adding username suggestions in "Find a member" using AJAX
2014-05-03 16:39:31 +02:00
Joas Schilling
ae3586869a [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries
PHPBB3-9728
2014-05-02 15:45:23 +02:00