aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
Commit message (Collapse)AuthorAgeFilesLines
...
| * [ticket/9725] Create an Azure SQL compatible SchemaHenry Sudhof2014-03-011-4/+16
| | | | | | | | | | | | | | | | | | | | Two problems were encountered when installing on AzureSQL: -Azure SQL does not support the ON clause of T-SQL -Azure SQL requries a clustered index AKA primary key on all tables The fix is makeshift; it introduces questionable primary indices, which should be replaced with auto--increment columns. PHPBB3-9725
* | [ticket/12262] Do not use inline assignmentsJoas Schilling2014-03-151-4/+7
| | | | | | | | PHPBB3-12262
* | [ticket/12262] Do not use getExtension()Joas Schilling2014-03-151-1/+1
| | | | | | | | | | | | The method is php 5.3.6+ only. PHPBB3-12262
* | [ticket/12262] Fix location list for acp events with "Locations:"Joas Schilling2014-03-111-2/+13
| | | | | | | | PHPBB3-12262
* | [ticket/12262] Also find vars array when it's defined in the trigger_event()Joas Schilling2014-03-111-8/+19
| | | | | | | | PHPBB3-12262
* | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-3/+2
| | | | | | | | PHPBB3-12236
* | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-3/+2
| | | | | | | | PHPBB3-12237
* | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-041-3/+2
| | | | | | | | PHPBB3-12235
* | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-031-3/+2
| | | | | | | | PHPBB3-12187
* | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-3/+2
| | | | | | | | PHPBB3-12234
* | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-101-3/+2
| | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-3/+2
| | | | | | | | PHPBB3-12115
* | [ticket/12115] Convert user occupation to a profile fieldJoas Schilling2014-02-061-3/+2
| | | | | | | | PHPBB3-12115
* | [ticket/11998] Turn develop/extensions.php into console commands.Andreas Fischer2013-11-051-129/+0
| | | | | | | | PHPBB3-11998
* | [ticket/11924] Verify that the script is only run from command lineJoas Schilling2013-10-261-0/+5
| | | | | | | | PHPBB3-11924
* | [ticket/11924] Do not use globals :(Joas Schilling2013-10-261-17/+10
| | | | | | | | PHPBB3-11924
* | [ticket/11924] Remove duplicated codeJoas Schilling2013-10-161-54/+22
| | | | | | | | PHPBB3-11924
* | [ticket/11924] Add option to export php event listJoas Schilling2013-10-161-0/+242
| | | | | | | | PHPBB3-11924
* | [ticket/11924] Reduce unneccessary loadJoas Schilling2013-10-161-6/+2
| | | | | | | | PHPBB3-11924
* | [ticket/11924] Add version info of template events to events.mdJoas Schilling2013-10-161-2/+3
| | | | | | | | PHPBB3-11924
* | [ticket/11924] Add script to export events.md with wiki markupJoas Schilling2013-10-161-0/+102
| | | | | | | | PHPBB3-11924
* | [ticket/11905] 3.1.0-a1 MigrationNathan Guse2013-10-101-0/+42
| | | | | | | | | | | | | | | | | | Created a migration tips develop tool to help find the migration tree tips so they can be copied to versions released. With this, A1 is the only current tree tip (it depends on all other migrations). PHPBB3-11905
* | [ticket/11866] Remove outdated and broken develop scriptJoas Schilling2013-09-261-24/+0
| | | | | | | | PHPBB3-11866
* | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-262-2/+2
| | | | | | | | PHPBB3-11866
* | [ticket/11700] Add file headers to develop scripts for namespaceNils Adermann2013-09-192-0/+30
| | | | | | | | PHPBB3-11700
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-164-2527/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-032-2/+2
| | | | | | | | | | | | PHPBB3-11825
| * | [ticket/11755] MySQL upgrader out of dateNathan Guse2013-09-022-2545/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | De-duplicating code from create_schema_files, mysql_upgrader. New file phpbb/db/schema_data which contains all the current schema data. New function in db_tools public static function get_dbms_type_map() to make the type map available everywhere (without requiring $db be setup already) PHPBB3-11755
| * | [ticket/11761] Serve blank file locally in functional testAndy Chase2013-08-062-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Example.org no longer serves blank responses, failing functional tests. this patch creates a blank file and serve it locally during the test, instead of hitting the http://example.org servers kindly provided by IANA. PHPBB3-11761
| * | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-0/+19
| |\ \ | | |/ | | | | | | | | | | | | * develop-olympus: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
| | * Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12Joas Schilling2013-07-301-2/+19
| | |\ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11753: [ticket/11753] Remove ?> from MySQL Upgrader. [ticket/11753] Update MySQL upgrader schema data.
| | | * [ticket/11753] Remove ?> from MySQL Upgrader.Andreas Fischer2013-07-301-2/+0
| | | | | | | | | | | | | | | | PHPBB3-11753
| | | * [ticket/11753] Update MySQL upgrader schema data.Andreas Fischer2013-07-301-0/+19
| | | | | | | | | | | | | | | | PHPBB3-11753
| * | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
| | * | [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"Andreas Fischer2013-07-301-1/+2
| | |/ | | | | | | | | | | | | | | | ... on PHP 5.4 or higher. PHPBB3-11524
* | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-162-4/+4
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Add develop scripts to use namespaces and rename interfacesNils Adermann2013-09-162-0/+210
|/ / | | | | | | PHPBB3-11700
* | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-111-6/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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] Schema changes and migration fileNathaniel Guse2013-04-281-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-071-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11408] user_jabber instead of jabber [ticket/10202] Rename method names _all() to _array(). [ticket/10202] Add migration file for config_db_text. [ticket/10202] Upgrade TEXT to the bigger MTEXT. [ticket/10202] Improve method documentation. [ticket/10202] SQL escape the table name. [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries. [ticket/10202] Define phpbb_config_db_text as a service. [ticket/10202] Add tests for phpbb_config_db_text. [ticket/10202] Adjust method names to guidelines. [ticket/10202] Add database schema for phpbb_config_db_text. [ticket/10202] Implementation of config options with arbitrary length values. [ticket/11166] Add ajaxify support to normal ACP confirm_box() [ticket/11166] Fix several custom confirm templates in prosilver [ticket/11166] Add caption to AJAX confirm box default template [ticket/11166] Fix typo in comment [ticket/11166] Use provided custom templates on AJAX confirm box
| * | [ticket/10202] Upgrade TEXT to the bigger MTEXT.Andreas Fischer2013-03-051-1/+1
| | | | | | | | | | | | PHPBB3-10202
| * | [ticket/10202] Add database schema for phpbb_config_db_text.Andreas Fischer2013-03-051-0/+8
| | | | | | | | | | | | PHPBB3-10202
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-051-3/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (234 commits) [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10411] Fix call to function on non-object $db->...() [ticket/10411] Remove ajax delete, so the page is refreshed [feature/avatars] Auto-clear avatar dimensions when first changing avatars [ticket/10411] Update schema file with new table and remove the column [ticket/10411] Add unit tests for move() with values >1 [ticket/10411] Add migrations file for teampage table [ticket/10411] Revert database_update.php changes from for easier update ...
| * | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-041-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (100) and others # Via Marc Alexander (8) and Igor Wiedler (3) * remotes/marc/feature/avatars: (138 commits) [feature/avatars] Update module_auth of ucp module and fix small issues [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [feature/avatars] Auto-clear avatar dimensions when first changing avatars [feature/avatars] Use "Main" as category for avatars in root of gallery [feature/avatars] Remove trailing whitespace from avatar code [feature/avatars] Pass phpbb_user to prepare and process form functions [feature/avatars] Document the use of the allowed extensions array [feature/avatars] Use array for allowed extensions and implode if needed [feature/avatars] Use deprecated for compatibility function [feature/avatars] Correct license, copyright and package info [feature/avatars] Move list of supported formats to avatar driver class [feature/avatars] Add include of functions_display.php in BC function [feature/avatars] Add note about when compatibility function was added [feature/avatars] Add compatibility function for get_user_avatar() [feature/avatars] Move definition of driver_collection to avatars.yml [feature/avatars] Remove the obsolete request argument for avatar drivers [feature/avatars] Add missing @var to docblocks in avatar manager [feature/avatars] Remove not needed inline style [feature/avatars] Differentiate tests for get drivers functions ...
| | * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-041-0/+36
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| | * \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-071-12/+28
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| | * \ \ \ Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-094-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| | * | | | | [feature/avatars] Unify size of avatar_typeMarc Alexander2012-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was set to 255 in one file while it was 32 in other files. As the size of 32 is rather low this was increased to 255. PHPBB3-10018
| | * | | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into ↵Marc Alexander2012-11-121-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/avatars Conflicts: phpBB/adm/style/acp_groups.html phpBB/adm/style/acp_users_avatar.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_display.php phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/styles/prosilver/template/ucp_avatar_options.html