aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-219-83/+116
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Senky (19) and others # Via Senky * remotes/Senky/ticket/11010: (32 commits) [ticket/11010] properly tabifying 'max_autologin_time' [ticket/11010] resolving latest comments [ticket/11010] Fixes for number input in acp [ticket/11010] Fix input type for urls [ticket/11010] Fix email inputs [ticket/11010] updating tests [ticket/11010] dealing with dimensions problem, removing extra code [ticket/11010] Change input type to search for search forms [ticket/11010] Add all HTML5 input types to ACP [ticket/11010] Add HTML5 input types to installer [ticket/11010] validation to match type [ticket/11010] displaying min and max only if they are set [ticket/11010] fixing tests [ticket/11010] replacing maxlenght with max [ticket/11010] applying some of EXreaction notes [ticket/11010] Try to keep min < max. [ticket/11010] Mock user in order for the test to run standalone. [ticket/11010] Progress toward fixing the test suite. [ticket/11010] adding type="url" to 'site_home_url' [ticket/11010] fixing inputs types in memberlist_search.html ...
| * [ticket/11010] properly tabifying 'max_autologin_time'Senky2013-05-211-1/+1
| | | | | | | | PHPBB3-11010
| * [ticket/11010] resolving latest commentsSenky2013-05-212-2/+2
| | | | | | | | PHPBB3-11010
| * [ticket/11010] Fixes for number input in acpVjacheslav Trushkin2013-05-205-9/+9
| | | | | | | | PHPBB3-11010
| * [ticket/11010] updating testsSenky2013-05-201-3/+2
| | | | | | | | PHPBB3-11010
| * [ticket/11010] dealing with dimensions problem, removing extra codeSenky2013-05-202-5/+8
| | | | | | | | PHPBB3-11010
| * [ticket/11010] Add all HTML5 input types to ACPVjacheslav Trushkin2013-05-201-0/+12
| | | | | | | | | | | | Add all new HTML5 input types to functions_acp.php, handle them as text for now PHPBB3-11010
| * [ticket/11010] validation to match typeSenky2013-05-202-48/+48
| | | | | | | | PHPBB3-11010
| * [ticket/11010] displaying min and max only if they are setSenky2013-05-201-2/+2
| | | | | | | | PHPBB3-11010
| * [ticket/11010] replacing maxlenght with maxSenky2013-05-203-62/+64
| | | | | | | | PHPBB3-11010
| * [ticket/11010] applying some of EXreaction notesSenky2013-05-202-4/+4
| | | | | | | | PHPBB3-11010
| * [ticket/11010] adding type="url" to 'site_home_url'Senky2013-05-201-1/+1
| | | | | | | | PHPBB3-11010
| * [ticket/11010] adding type="number" to inputs in functions_profile_fields.phpSenky2013-05-201-9/+9
| | | | | | | | PHPBB3-11010
| * [ticket/11010] fixing problems with 4th parameter in number typeSenky2013-05-201-1/+2
| | | | | | | | PHPBB3-11010
| * [ticket/11010] adding type="number" in ACP; adding type="email" in installSenky2013-05-203-59/+73
| | | | | | | | PHPBB3-11010
| * [ticket/11010] changing email and url input types in php filesSenky2013-05-203-6/+6
| | | | | | | | PHPBB3-11010
| * [ticket/11010] adding new input types into build_cfg_template()Senky2013-05-201-0/+2
| | | | | | | | PHPBB3-11010
* | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-05-202-2/+2
|\ \ | |/ |/| | | | | | | | | # By David King # Via David King (1) and Nathan Guse (1) * remotes/upstream/develop-olympus: [ticket/11551] Fix error in system tab if get_remote_file returns empty string
| * [ticket/11551] Fix error in system tab if get_remote_file returns empty stringDavid King2013-05-202-2/+2
| | | | | | | | | | | | | | | | Currently a debug error is thrown. With this patch, it fails without keeping the admin from being able to access the rest of the System modules by showing a nicer error "Failed to obtain latest version information." PHPBB3-11551
* | 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