Commit graph

1849 commits

Author SHA1 Message Date
Matt Friedman
f41638ebbf [ticket/12060] Fix typo in core.acp_bbcodes_edit_add doc block
PHPBB3-12060
2013-12-05 13:52:20 -08:00
Matt Friedman
d93200c973 [ticket/12060] Add bbcode tokens array to core.acp_bbcodes_edit_add
PHPBB3-12060
2013-12-05 13:49:47 -08:00
Matt Friedman
8f309a70db [ticket/12060] Add $phpbb_dispatcher to acp_bbcodes.php for events
PHPBB3-12060
2013-12-04 16:43:26 -08:00
Matt Friedman
2e33095177 [ticket/12060] Add acp event core.acp_bbcodes_display_bbcodes
Modify display of bbcodes in the form

PHPBB3-12060
2013-12-04 16:42:55 -08:00
Matt Friedman
79b8ecad4d [ticket/12060] Add acp event core.acp_bbcodes_display_form
Modify bbcode template data before we display the form

PHPBB3-12060
2013-12-04 16:42:07 -08:00
Matt Friedman
226376c573 [ticket/12060] Add acp event core.acp_bbcodes_modify_create
Modify bbcode data before modify/create

PHPBB3-12060
2013-12-04 16:40:41 -08:00
Matt Friedman
a4d20d988b [ticket/12060] Add acp event core.acp_bbcodes_edit_add
Modify bbcode template before we display the add/edit form

PHPBB3-12060
2013-12-04 16:39:10 -08:00
Joas Schilling
b474917ba3 Merge remote-tracking branch 'Marc/ticket/11842' into develop
* Marc/ticket/11842:
  [ticket/11842] Add functional test for creating group
  [ticket/11842] Use avatar_data for obtaining driver that should be deleted
  [ticket/11842] Use type map for updating avatar types in database
  [ticket/11842] Add missing prefix for group id in avatar data
  [ticket/11842] Use only new avatar type in user_delete function
  [ticket/11842] Add migration file for updating avatar type in database
  [ticket/11842] Replace outdated occurences of user and group avatar_type
  [ticket/11842] Use group_id 0 and correct avatar name after creating group
2013-12-04 17:20:20 +01:00
Marc Alexander
abb2def48d [ticket/11842] Use avatar_data for obtaining driver that should be deleted
PHPBB3-11842
2013-12-04 15:42:17 +01:00
Joas Schilling
5d69eddcf5 [ticket/12045] Only display group selection if there are groups
Also fixed the empty option which is not allowed.

PHPBB3-12045
2013-11-28 13:22:25 +01:00
Cesar G
7da4490402 [ticket/11507] Handle empty sets correctly.
Using the last parameter in $db->sql_in_set() does not give the correct
behaviour expected here. The query should not be negated if the set is empty.

PHPBB3-11507
2013-11-27 21:26:23 -08:00
Cesar G
ef2e5ca966 [ticket/11507] Allow group & unapproved post count options to be used alone.
PHPBB3-11507
2013-11-27 21:26:22 -08:00
Cesar G
c5656747d8 [ticket/11507] Fix the unapproved posts count query.
Only unapproved posts should be counted.

PHPBB3-11507
2013-11-27 21:26:22 -08:00
Cesar G
b41e2d335a [ticket/11507] Allow the posts awaiting approval value to be 0.
PHPBB3-11507
2013-11-27 21:26:18 -08:00
Marc Alexander
33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842
Conflicts:
	phpBB/includes/acp/acp_groups.php
2013-11-27 14:55:24 +01:00
Marc Alexander
b5e6d107ae [ticket/11842] Add missing prefix for group id in avatar data
PHPBB3-11842
2013-11-23 01:05:39 +01:00
Nathan Guse
df7fa8e499 Merge pull request #1854 from Pico88/ticket/12005
[ticket/12005] Remove code responsible for PM popup completely
2013-11-21 14:01:23 -08:00
Nathan Guse
6f419b0049 Merge pull request #1869 from prototech/ticket/10810
[ticket/10810] Move color swatches from popup windows to inline blocks.
2013-11-21 13:41:03 -08:00
Nils Adermann
52845b22f2 Merge pull request #1815 from marc1706/ticket/11525
[ticket/11525] Only remove group or user prefix from given avatar data
2013-11-13 09:52:21 -08:00
Cesar G
97915b467e [ticket/10810] Remove obsolete swatch code.
PHPBB3-10810
2013-11-13 01:27:24 -08:00
Lukasz
57ec9ee49e [ticket/12005] Remove PM popup setting from user preferences
PHPBB3-12005
2013-11-08 21:57:03 +01:00
Joas Schilling
a6c73ea0c8 [ticket/12002] Add link hash to extension manager links
PHPBB3-12002
2013-11-08 14:08:02 +01:00
Joas Schilling
bb0ff715f8 [ticket/11994] Change error level for missing .json file
PHPBB3-11994
2013-11-08 01:20:02 +01:00
Joas Schilling
f8e92efc3f [ticket/11994] Rename "uninstall" to "delete data"
PHPBB3-11994
2013-11-08 01:20:00 +01:00
Joas Schilling
7e1a02b3a1 [ticket/11994] Make install/enable just one UI thing
PHPBB3-11994
2013-11-08 01:19:59 +01:00
Joas Schilling
473402c77b [ticket/11994] Use display name on confirmation screen
PHPBB3-11994
2013-11-08 01:19:58 +01:00
Joas Schilling
8d5fcc8d4c [ticket/11994] Make extension manager UI less misleading
Enable and Install were split into two different expressions.
Purge was renamed to uninstall to make clearer what is going to happen.

PHPBB3-11994
2013-11-08 01:19:54 +01:00
Dhruv
efe94e9c73 Merge remote-tracking branch 'nickvergessen/ticket/11973' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11973:
  [ticket/11973] Remove logic from tokens language array
2013-11-04 00:11:23 +05:30
Patrick Webster
ad44407b19 [ticket/11990] Remove result_mssqlnative usage in acp_database.php
The class result_mssqlnative was removed in ticket 11980. This removes
the dependency on that class from the database backup utility. It is
possible to use the sqlsrv functions to retrieve the field information,
but they must be then mapped back to type names. That mapping was removed
in 11980 and it is easier to just look it up in the information schema
table.

PHPBB3-11990
2013-11-03 00:37:18 -05:00
Nathan Guse
0a3bb18e93 Merge pull request #1812 from prototech/ticket/11746
[ticket/11746] Add "admin activation required" notification.
2013-11-02 11:55:16 -07:00
Nils Adermann
e118b4f4c0 Merge pull request #1839 from bantu/task/code-sniffer
More PHP Code Sniffer rules
2013-11-01 07:58:18 -07:00
Cesar G
05dd4d55d2 [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.
PHPBB3-11987
2013-10-30 15:43:07 -07:00
Andreas Fischer
ef1f991837 [task/code-sniffer] Replace spaces with tabs.
PHPBB3-11980
2013-10-30 13:37:29 +01:00
Andreas Fischer
59e3c2d16e Merge remote-tracking branch 'marc1706/ticket/11981' into develop
* marc1706/ticket/11981:
  [ticket/11981] Fix code sniffer complaints
2013-10-29 00:00:00 +01:00
Marc Alexander
7f58a4572e [ticket/11981] Fix code sniffer complaints
PHPBB3-11981
2013-10-28 23:05:46 +01:00
Joas Schilling
6a87388e69 [ticket/11973] Remove logic from tokens language array
Previously if a translator did no translate a token, it would not be
displayed. On the other hand, the translator could add additional tokens
which have no functionality.  Functionality is already hardcoded into
bbcode.php so we can that in the ACP aswell, in order to prevent namend
issues.

PHPBB3-11973
2013-10-26 23:55:19 +02:00
Cesar G
c5fc8c43cb [ticket/11746] Delete the notification after user is approved & fix language.
PHPBB3-11746
2013-10-26 01:01:08 -07:00
Marc Alexander
9d4d212e0f [ticket/11525] Only remove group or user prefix from given avatar data
Until now, the user data had both user_id and group_id keys in the avatar
data. As both group_ and user_ prefixes were removed the group_id was
collapsed onto the user_id and therefore all users in the same group had
the same prefix for their uploaded avatars. This patch will make sure
that the correct id is used depending on whether it's a group's or user's
avatar data.

PHPBB3-11525
2013-10-24 13:55:23 +02:00
Marc Alexander
3c632fa8e4 [ticket/11842] Use group_id 0 and correct avatar name after creating group
It seems like the function group_correct_avatar() was forgotten while adding
the new avatar system. We now pass the group_id 0 to the upload avatar and
let the function group_correct_avatar() fix the avatar filename after creating
the group like it was done previously.

PHPBB3-11842
2013-10-24 13:14:51 +02:00
Cesar G
d607f1c927 [ticket/11746] Add "admin activation required" notification.
PHPBB3-11746
2013-10-24 02:37:20 -07:00
Joas Schilling
3c9a8a3788 [ticket/11924] Fix some minor issues with the php event docs
PHPBB3-11924
2013-10-16 16:32:40 +02:00
Marc Alexander
61f60d395a [feature/passwords] Use passwords manager service instead of functions
The old functions phpbb_hash() and phpbb_check_hash() have been replaced with
the passwords manager service in all front-end related files. The phpBB2
converter and the release_3_0_5_rc1 migration file have not been changed.
The same applies to the security/hash_test that still tests the function
phpbb_check_hash(). This will however make sure that the old function
still works.

PHPBB3-11610
2013-10-13 16:32:37 +02:00
Andreas Fischer
94b49d8a92 [ticket/11703] Make jQuery CDN switch more generic.
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
2013-10-10 23:26:03 +02:00
Joas Schilling
e0adb15074 [ticket/11871] Allow backslash in classnames for Modules
PHPBB3-11871
2013-09-27 18:14:58 +02:00
Andreas Fischer
56ee5973bc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11864] Do not call exit after display_progress_bar in acp_forums
2013-09-26 16:01:01 +02:00
Marc Alexander
c654e9d247 [ticket/11864] Do not call exit after display_progress_bar in acp_forums
The progress bar is called with the method display_progress_bar() in the
acp_forums files. This method then call adm_page_footer() which also calls
exit_handler(). Therefore, the exit; in acp_forums after
$this->display_progress_bar() is obsolete and shouldn't exist in the first
place.

PHPBB3-11864
2013-09-25 13:35:08 +02:00
Nils Adermann
c4b53490ad [ticket/11700] Correctly load extensions with nonprefixed namespaces
PHPBB3-11700
2013-09-17 16:15:44 +02:00
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-16 01:24:05 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Joas Schilling
958f3e9503 Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00