mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 20:45:29 +02:00
Code Issues Releases Wiki Activity
19,245 Commits 18 Branches 192 Tags
Commit Graph

1606 Commits

Author SHA1 Message Date
Matt Friedman
b26e4dd42c [ticket/12060] Correctly label alpha versions in event docblocks 
PHPBB3-12060
 2013-12-13 10:31:04 -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
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
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