Commit graph

1617 commits

Author SHA1 Message Date
Dhruv
db94f80c5b Merge remote-tracking branch 'nickvergessen/ticket/11911' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11911:
  [ticket/11911] Warn admins when there is no search index for the selected engine
2013-12-27 18:01:48 +05:30
Joas Schilling
bef7bc7900 [ticket/11911] Warn admins when there is no search index for the selected engine
PHPBB3-11911
2013-12-27 13:16:38 +01:00
Dhruv
f9c7f0fc19 Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/feature/pagination-class:
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
2013-12-25 00:54:07 +05:30
Joas Schilling
558f3cd21c Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop
* vsephpbb/ticket/12060: (37 commits)
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  [ticket/12060] Rename event in message parser to modify_format_display_text_after
  [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
  [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
  [ticket/12060] Use separate template event for acp user signature posting buttons
  [ticket/12060] Rename event from append to after in acp_bbcodes.html
  [ticket/12060] Correctly label alpha versions in event docblocks
  [ticket/12060] Fix u_action comments in docblocks
  [ticket/12060] Change @since in event docblocks
  [ticket/12060] Update the docblock comments in acp core events
  [ticket/12060] Refactor u_action in the events that use it
  [ticket/12060] Use $sql_ary instead of $sql
  [ticket/12060] Update docblock for core event due to addition of another var
  [ticket/12060] Remove re-tabbing of html from subsilver2 files
  [ticket/12060] Add $update_this_message var to the core event
  [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
  ...
2013-12-20 16:11:02 +01:00
Joas Schilling
cb8b2bab5f [ticket/11849] Fix more function calls
PHPBB3-11849
2013-12-18 18:39:11 +01:00
Joas Schilling
8652589469 [ticket/11849] Update some ACP modules with new pagination
PHPBB3-11849
2013-12-18 18:36:47 +01:00
Matt Friedman
4665e3df21 [ticket/12060] Further clarifying new event docblocks as much as possible
PHPBB3-12060
2013-12-16 23:54:55 -08:00
Matt Friedman
01c4235f00 [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
PHPBB3-12060
2013-12-16 15:33:44 -08:00
Matt Friedman
6b178c758e [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
PHPBB3-12060
2013-12-16 15:31:25 -08:00
Matt Friedman
aa0c463d0f [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
PHPBB3-12060
2013-12-13 16:46:12 -08:00
Matt Friedman
b26e4dd42c [ticket/12060] Correctly label alpha versions in event docblocks
PHPBB3-12060
2013-12-13 10:31:04 -08:00
Cesar G
c42bd28d17 [ticket/12009] Prevent user from enabling invalid extension through direct URL
PHPBB3-12009
2013-12-12 14:40:03 -08:00
Matt Friedman
21e269b9ca [ticket/12060] Fix u_action comments in docblocks
PHPBB3-12060
2013-12-12 14:09:58 -08:00
Matt Friedman
75831dc2d0 [ticket/12060] Change @since in event docblocks
PHPBB3-12060
2013-12-12 14:09:30 -08:00
Matt Friedman
730a05bd30 [ticket/12060] Update the docblock comments in acp core events
PHPBB3-12060
2013-12-12 13:59:30 -08:00
Matt Friedman
caca36bc50 [ticket/12060] Refactor u_action in the events that use it
PHPBB3-12060
2013-12-12 13:58:59 -08:00
Matt Friedman
6ccec39e43 [ticket/12060] Use $sql_ary instead of $sql
PHPBB3-12060
2013-12-12 13:50:13 -08:00
Matt Friedman
b1e05be6ea [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
PHPBB3-12060
2013-12-12 09:55:21 -08:00
Matt Friedman
3659ba884e [ticket/12060] Copy this_u_action back to original this->u_action var
PHPBB3-12060
2013-12-12 09:54:46 -08:00
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