aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-215-34/+0
|\ | | | | [ticket/12005] Remove code responsible for PM popup completely
| * [ticket/12005] Remove PM popupLukasz2013-11-081-2/+0
| | | | | | | | PHPBB3-12005
| * [ticket/12005] Remove PM popup UCP moduleLukasz2013-11-082-28/+0
| | | | | | | | PHPBB3-12005
| * [ticket/12005] Remove PM popup from converterLukasz2013-11-081-1/+0
| | | | | | | | PHPBB3-12005
| * [ticket/12005] Remove PM popup setting from user preferencesLukasz2013-11-081-3/+0
| | | | | | | | PHPBB3-12005
* | Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-212-2/+0
|\ \ | | | | | | [ticket/10810] Move color swatches from popup windows to inline blocks.
| * | [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-132-2/+0
| | | | | | | | | | | | PHPBB3-10810
* | | [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constantJoas Schilling2013-11-191-1/+1
| | |
* | | [prep-release-3.1.0-a2] Update version to 3.1.0-a2Joas Schilling2013-11-191-1/+1
| | |
* | | Merge remote-tracking branch 'Marc/ticket/11896' into developJoas Schilling2013-11-191-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11896: [ticket/11896] Use $form_time and fix out of bounds $form_time [ticket/11896] Correctly document return of null in docblocks [ticket/11896] Minor code improvements in phpbb_functional_test_case [ticket/11896] Add functional tests for marking all notifications read [ticket/11896] Add ability to define expected message after posting [ŧicket/11896] Set form_time with time() when marking all notifications read
| * | | [ticket/11896] Use $form_time and fix out of bounds $form_timeMarc Alexander2013-11-141-2/+3
| | | | | | | | | | | | | | | | PHPBB3-11896
| * | | [ŧicket/11896] Set form_time with time() when marking all notifications readMarc Alexander2013-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | form_time is only set if is passed via the form. Since the mark notifications read link does not use the form, it will default to 0 causing the mark notifications logic to only mark notifications read if their time is smaller or equal to 0. This patch will change ucp_notifications to correctly set form_time for the confirm_box. PHPBB3-11896
* | | | [ticket/12023] Correctly compare the size of the array in ignore_new_filesJoas Schilling2013-11-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12023
* | | | Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-135-6/+6
|\ \ \ \ | |_|/ / |/| | | [ticket/11525] Only remove group or user prefix from given avatar data
| * | | [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-245-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #1853 from nickvergessen/ticket/11927Nathan Guse2013-11-111-0/+48
|\ \ \ \ | | | | | | | | | | [ticket/11927] Correctly add new files on update
| * | | | [ticket/11927] Prefix function with phpbb_Joas Schilling2013-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11927
| * | | | [ticket/11927] Add doc block to new functionJoas Schilling2013-11-071-0/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11927
| * | | | [ticket/11927] Correctly add new files on updateJoas Schilling2013-11-071-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we ignore language and style files when the directory where they go to do not exist. However in 3.1 we introduce some new sub directories: * language/en/email/short/ * styles/prosilver/theme/en/ So we need to change our check to look whether the language or style exist, rather then the parent directory. PHPBB3-11927
* | | | | [ticket/12002] Add link hash to extension manager linksJoas Schilling2013-11-081-6/+11
| |_|/ / |/| | | | | | | | | | | PHPBB3-12002
* | | | [ticket/11994] Change error level for missing .json fileJoas Schilling2013-11-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11994
* | | | [ticket/11994] Rename "uninstall" to "delete data"Joas Schilling2013-11-081-9/+12
| | | | | | | | | | | | | | | | PHPBB3-11994
* | | | [ticket/11994] Make install/enable just one UI thingJoas Schilling2013-11-081-8/+4
| | | | | | | | | | | | | | | | PHPBB3-11994
* | | | [ticket/11994] Use display name on confirmation screenJoas Schilling2013-11-081-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11994
* | | | [ticket/11994] Make extension manager UI less misleadingJoas Schilling2013-11-081-13/+21
|/ / / | | | | | | | | | | | | | | | | | | Enable and Install were split into two different expressions. Purge was renamed to uninstall to make clearer what is going to happen. PHPBB3-11994
* | | Merge remote-tracking branch 'nickvergessen/ticket/11973' into developDhruv2013-11-041-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11973: [ticket/11973] Remove logic from tokens language array
| * | | [ticket/11973] Remove logic from tokens language arrayJoas Schilling2013-10-261-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | [ticket/11990] Remove result_mssqlnative usage in acp_database.phpPatrick Webster2013-11-031-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #1790 from prototech/ticket/11280Nathan Guse2013-11-021-1/+0
|\ \ \ | |_|/ |/| | [ticket/11280] Prevent duplicate entry in forums_track table.
| * | [ticket/11280] Prevent duplicate entry in forums_track table.Cesar G2013-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | Enforcing a time limit prevents all rows from being selected, thus a new row is inserted resulting in a duplicate entry. PHPBB3-11280
* | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-023-35/+16
|\ \ \ | | | | | | | | [ticket/11746] Add "admin activation required" notification.
| * | | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-262-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11746
| * | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-243-35/+16
| | |/ | |/| | | | | | | PHPBB3-11746
* | | Merge remote-tracking branch 'brunoais/ticket/11663' into developJoas Schilling2013-11-021-1/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11663: [ticket/11663] Add the doc block about the parameters. [ticket/11663] Add the doc block about the return value. [ticket/11663] Make generate_text_for_storage return the errors.
| * | | [ticket/11663] Add the doc block about the parameters.brunoais2013-08-171-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11663
| * | | [ticket/11663] Add the doc block about the return value.brunoais2013-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong. PHPBB3-11663
| * | | [ticket/11663] Make generate_text_for_storage return the errors.brunoais2013-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong. PHPBB3-11663
* | | | Merge pull request #1810 from nickvergessen/ticket/11031Nils Adermann2013-11-021-2/+34
|\ \ \ \ | | | | | | | | | | Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes
| * | | | [ticket/11031] Correctly add groups to teampageJoas Schilling2013-11-021-1/+33
| | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | [ticket/11031] Fix group legend positionJoas Schilling2013-10-281-1/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-11031
* | | | [ticket/11983] Add missing argument to docblock in ucp_notificationsMarc Alexander2013-11-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The argument $subscriptions was not documented in the docblock of the method output_notification_types() until now. PHPBB3-11983
* | | | Merge pull request #1839 from bantu/task/code-snifferNils Adermann2013-11-017-17/+18
|\ \ \ \ | | | | | | | | | | More PHP Code Sniffer rules
| * | | | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-307-16/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-11980
| * | | | [task/code-sniffer] Fix argument list spacing.Andreas Fischer2013-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11980
* | | | | [ticket/11987] Add {ADMIN_ROOT_PATH}.Cesar G2013-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11987
* | | | | [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.Cesar G2013-10-302-2/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11987
* | | | | [ticket/11987] Change {ROOT_PATH} to point to board root.Cesar G2013-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11987
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11974' into developDhruv2013-10-301-10/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11974: [ticket/11974] Fix timezone names with underscores [ticket/11974] Translate all timezones
| * | | | [ticket/11974] Translate all timezonesJoas Schilling2013-10-271-10/+4
| |/ / / | | | | | | | | | | | | PHPBB3-11974
* | | | Merge remote-tracking branch 'marc1706/ticket/11981' into developAndreas Fischer2013-10-297-26/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11981: [ticket/11981] Fix code sniffer complaints
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-04 23:27:08 +0000