aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11010] adding new input types into build_cfg_template()Senky2013-05-201-0/+2
| | | | PHPBB3-11010
* Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-208-119/+306
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11413: (23 commits) [ticket/11413] Revert some cache service related changes from earlier [ticket/11413] Use phpbb_user in test [ticket/11413] $user should have been $this->user [ticket/11413] Fix unit tests [ticket/11413] Translate the error [ticket/11413] Rename file to something more helpful [ticket/11413] Remove remaining irrelevant code to this PR [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR) [ticket/11413] Remove conversion of user_notifications [ticket/11413] Correct copyright year [ticket/11413] Remove changes for ticket 11420 from this branch [ticket/11413] Include mock class [ticket/11413] Don't use the database for the convert test [ticket/11413] Test get_notification_type_id and _ids functions [ticket/11413] Use sql_insert_buffer [ticket/11413] Create test for notification conversion [ticket/11413] Fix test fixtures and tests [ticket/11413] Fix some more tests [ticket/11413] Fix notification tests [ticket/11413] Prevent recursive function calls ...
| * [ticket/11413] Revert some cache service related changes from earlierNathaniel Guse2013-05-131-3/+3
| | | | | | | | PHPBB3-11413
| * [ticket/11413] $user should have been $this->userNathaniel Guse2013-05-131-1/+1
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Translate the errorNathan Guse2013-05-101-1/+1
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Rename file to something more helpfulNathan Guse2013-05-101-1/+1
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Remove remaining irrelevant code to this PRNathaniel Guse2013-05-031-3/+3
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Remove conversion of user_notificationsNathaniel Guse2013-05-021-90/+0
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Correct copyright yearNathaniel Guse2013-05-021-1/+1
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Remove changes for ticket 11420 from this branchNathaniel Guse2013-05-021-0/+64
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Don't use the database for the convert testNathaniel Guse2013-04-301-1/+10
| | | | | | | | | | | | | | Different databases seem to work slightly differently here and are causing errors PHPBB3-11413
| * [ticket/11413] Use sql_insert_bufferNathaniel Guse2013-04-301-19/+8
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Fix notification testsNathaniel Guse2013-04-293-4/+33
| | | | | | | | | | | | | | Send types/methods the cache service, not the driver (not sure why the driver was sent before) PHPBB3-11413
| * [ticket/11413] Prevent recursive function callsNathaniel Guse2013-04-291-1/+4
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-296-70/+57
| | | | | | | | | | | | | | | | item_type is not equivalent to notification_type_name, it can be a generic string (typically used to be able to subscribe to multiple notification types while only subscribing to one item PHPBB3-11413
| * [ticket/11413] Rename columns in notification/manager.phpNathaniel Guse2013-04-281-111/+165
| | | | | | | | PHPBB3-11413
| * [ticket/11413] Schema changes and migration fileNathaniel Guse2013-04-282-64/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications tables are dropped because phpBB currently does not have any way to make the necessary changes to the DB schema (and no release has yet been made with these changes). This will fix the following bugs: PHPBB3-11411 PHPBB3-11413 PHPBB3-11414 PHPBB3-11416 PHPBB3-11420 PHPBB3-11413
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into developNathan Guse2013-05-201-0/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11482: [ticket/11482] Use double quotes for code [ticket/11482] Unit tests for advanced DEFINE [ticket/11482] Implementation of advanced DEFINE tag
| * | [ticket/11482] Use double quotes for codeVjacheslav Trushkin2013-04-101-7/+7
| | | | | | | | | | | | | | | | | | Use double quotes for code to avoid excessive escaping PHPBB3-11482
| * | [ticket/11482] Implementation of advanced DEFINE tagVjacheslav Trushkin2013-04-071-0/+28
| | | | | | | | | | | | | | | | | | Implementation of advanced DEFINE tag and ENDDEFINE PHPBB3-11482
* | | Merge remote-tracking branch 'marc1706/ticket/11535' into developAndreas Fischer2013-05-192-4/+16
|\ \ \ | | | | | | | | | | | | | | | | * marc1706/ticket/11535: [ticket/11535] Correctly merge avatar_errors array into primary error array
| * | | [ticket/11535] Correctly merge avatar_errors array into primary error arrayMarc Alexander2013-05-132-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $avatar_errors array needs to be merged into the primary $error array before the group settings get applied. This is currently not the case. Functional tests for this will be provided by PR #1401. PHPBB3-11535
* | | | Merge remote-tracking branch 'EXreaction/ticket/11415' into developDavid King2013-05-184-103/+138
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11415: [ticket/11415] Add test for find_from_extension() [ticket/11415] Send the extension base the finder rather than the manager [ticket/11415] Create function in finder find_from_extension [ticket/11415] Fix ext.manager constructor in tests [ticket/11415] Make migrator/ext.manager dependencies of the base ext class [ticket/11415] Remove migrator dependency from extension manager [ticket/11415] Move migrator to base extension class from ext.manager [ticket/11415] Move while loop from ext manager to acp_extensions.php
| * | | | [ticket/11415] Send the extension base the finder rather than the managerNathan Guse2013-05-102-10/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | [ticket/11415] Create function in finder find_from_extensionNathan Guse2013-05-102-13/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | [ticket/11415] Make migrator/ext.manager dependencies of the base ext classNathaniel Guse2013-05-012-13/+23
| | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | [ticket/11415] Remove migrator dependency from extension managerNathaniel Guse2013-05-011-4/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | [ticket/11415] Move migrator to base extension class from ext.managerNathaniel Guse2013-05-012-75/+86
| | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | [ticket/11415] Move while loop from ext manager to acp_extensions.phpNathaniel Guse2013-05-012-27/+28
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Now enable_step works as it's supposed to (do one step at a time) and less refreshes are required for the user. PHPBB3-11415
* | | | Merge remote-tracking branch 'remotes/blitze/ticket/11458' into developNathaniel Guse2013-05-181-25/+16
|\ \ \ \
| * | | | [ticket/11458] Use finder to get all permission language filesOpenShift guest2013-05-101-35/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-11458
| * | | | [ticket/11458] We still auto add language files from the mods and acpOpenShift guest2013-04-131-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders in the language directory, so we revert some changes here PHPBB3-11458
| * | | | [ticket/11458] Search for permission language files in extensionsOpenShift guest2013-03-251-24/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extensions that add new permission masks only need to add a permission file in the language folder of the extension. The file must start with 'permissions_' eg 'permissions_blog.php'. The permission language file will be automatically included when viewing/setting permissions. PHPBB3-11458
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
| * | | | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The given path is an absolute path in general, just not on our current system. PHPBB3-11545
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-151-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | * develop-olympus: [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
| * | | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11546
* | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into developNathan Guse2013-05-121-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11533: [ticket/11533] Update unit tests [ticket/11533] Fix colspan and unnecessary tables [ticket/11533] Change list to table for notification settings [ticket/11533] Columns counter for notification settings
| * | | | | [ticket/11533] Columns counter for notification settingsVjacheslav Trushkin2013-05-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns counter template variable. It counts number of notification types + column for name + column for checkbox PHPBB3-11533
* | | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11465' into developNathan Guse2013-05-121-47/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (8) and Joas Schilling (3) # Via Marc Alexander * remotes/Marc/ticket/11465: [ticket/11465] Increase count of disabled extensions to 5 in functional test [ticket/11465] Add disabled ext to allow proper testing of get_module_infos() [ticket/11465] Add tests for optional arguments of get_module_infos() [ticket/11465] Add comments explaining the tests [ticket/11465] Check if class exists before including info file [ticket/11465] Correctly set the root path for the test [ticket/11465] The info file does not have _info suffix [ticket/11465] Add phpBB module to test [ticket/11465] Move require_once() in unit test to the top of the file [ticket/11465] Add unit tests for acp_modules::get_module_infos() [ticket/11465] Use extension finder when adding extensions' acp modules
| * \ \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-1262-620/+1999
| |\ \ \ \ \ \
| * | | | | | | [ticket/11465] Check if class exists before including info fileMarc Alexander2013-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | [ticket/11465] The info file does not have _info suffixJoas Schilling2013-04-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | [ticket/11465] Use extension finder when adding extensions' acp modulesMarc Alexander2013-03-211-47/+25
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method acp_modules::get_module_infos() needs to use the extension finder whenever it is looking for a module's info file. While transitioning to the new extension system, only the initial search for all module info files was changed to the new system. Due to this it is not possible to add an extension's acp/mcp/ucp module manually in the ACP. This patch will always use the extension finder for the acp module's info files and therefore properly find the needed file. Additionally, the code has been cleaned up a little bit. PHPBB3-11465
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-121-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions. Conflicts: phpBB/includes/functions.php
| * | | | | [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no space between ; and the string "url=". But according to w3c, we should have atleast one space between them. So, added space characters accordingly. PHPBB3-11105
* | | | | | Merge remote-tracking branch 'remotes/bantu/ticket/11452' into developNathaniel Guse2013-05-111-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/11452] Now notification_method_email checks whether user has address.Andreas Fischer2013-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the user has an email address set before offering email notifications. The address could be missing for whatever reason, e.g. external authentication. This is also consistent with XMPP/Jabber now. PHPBB3-11452
* | | | | | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-081-0/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Matt Friedman # Via Matt Friedman * VSEphpbb/ticket/10155: [ticket/10155] Update copyright in new migration file to 2013 [ticket/10155] Make effectively installed test more specific [ticket/10155] Use more descriptive title for migration file [ticket/10155] Use new migration file for jQuery config update [ticket/10155] Update jQuery to 1.8.3
| * | | | | | [ticket/10155] Update copyright in new migration file to 2013Matt Friedman2013-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-02 19:33:03 +0000