aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11438] Add empty sql_query_pre to delta-sourceJoas Schilling2013-03-151-0/+1
| | | | PHPBB3-11438
* [ticket/11438] Move backslash to concatenate the query strings correctlyJoas Schilling2013-03-151-60/+30
| | | | | | Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88 PHPBB3-11438
* [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()Joas Schilling2013-03-151-1/+1
| | | | PHPBB3-11438
* Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-095-4/+5
|\ | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * remotes/dhruv/ticket/11303: [ticket/11303] rename attribute to timezone-preselect [ticket/11303] remove additional brackets [ticket/11303] use S_TZ_PRESELECT in subsilver [ticket/11303] add S_TZ_PRESELECT template var
| * [ticket/11303] rename attribute to timezone-preselectDhruv2013-02-174-4/+4
| | | | | | | | PHPBB3-11303
| * [ticket/11303] remove additional bracketsDhruv2013-02-121-1/+1
| | | | | | | | PHPBB3-11303
| * [ticket/11303] use S_TZ_PRESELECT in subsilverDhruv2013-02-121-1/+1
| | | | | | | | PHPBB3-11303
| * [ticket/11303] add S_TZ_PRESELECT template varDhruv2013-02-082-1/+2
| | | | | | | | | | | | | | add a new template variable to check if timezone has already been selected by the user while registeration. PHPBB3-11303
* | Merge remote-tracking branch 'remotes/marc/ticket/11323' into developNathaniel Guse2013-03-092-4/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11323: [ticket/11323] Reduce additional code and revert regex to previous one [ticket/11323] Enable tests for inclusion of defined variables [ticket/11323] Correctly treat variables in template defines
| * | [ticket/11323] Reduce additional code and revert regex to previous oneMarc Alexander2013-02-261-7/+12
| | | | | | | | | | | | PHPBB3-11323
| * | [ticket/11323] Enable tests for inclusion of defined variablesMarc Alexander2013-02-191-3/+0
| | | | | | | | | | | | PHPBB3-11323
| * | [ticket/11323] Correctly treat variables in template definesMarc Alexander2013-02-191-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Previously, any template variables that were used when defining a variable were treated as strings. This is a regression to phpBB 3.0. With this patch the template variables will be properly parsed. PHPBB3-11323
* | | Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into developNathaniel Guse2013-03-091-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # By OpenShift guest # Via OpenShift guest * remotes/Blitze/ticket/11383: [ticket/11383] Correctly revert modules added/removed by migrator
| * | | [ticket/11383] Correctly revert modules added/removed by migratorOpenShift guest2013-03-031-0/+6
| | | | | | | | | | | | | | | | PHPBB3-11383
* | | | Merge remote-tracking branch 'EXreaction/ticket/11423' into developDavid King2013-03-092-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11423: [ticket/11423] Send unformatted usernames to the email template
| * | | | [ticket/11423] Send unformatted usernames to the email templateNathaniel Guse2013-03-092-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-11423
* | | | Merge remote-tracking branch 'remotes/nickv/ticket/11421' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11421: [ticket/11421] Correctly display submit button when needed
| * | | | [ticket/11421] Correctly display submit button when neededJoas Schilling2013-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11421
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11417' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11417: [ticket/11417] FIx submit button description on notifications options page
| * | | | | [ticket/11417] FIx submit button description on notifications options pageJoas Schilling2013-03-071-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11417
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11390' into developNathan Guse2013-03-071-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11390: [ticket/11390] Correctly separate list of notifications from header [ticket/11390] Hide pagination when there are no notifications
| * | | | | [ticket/11390] Correctly separate list of notifications from headerJoas Schilling2013-03-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11390
| * | | | | [ticket/11390] Hide pagination when there are no notificationsJoas Schilling2013-03-071-7/+5
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11390
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11407' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11407: [ticket/11407] Fix <dfn> description of "notification" option.
| * | | | [ticket/11407] Fix <dfn> description of "notification" option.Joas Schilling2013-03-071-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-11407
* | | | Merge remote-tracking branch 'EXreaction/ticket/11408' into developDavid King2013-03-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11408: [ticket/11408] user_jabber instead of jabber
| * | | | [ticket/11408] user_jabber instead of jabberNathaniel Guse2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11408
* | | | | Merge remote-tracking branch 'remotes/bantu/ticket/10202' into developNathan Guse2013-03-0614-0/+428
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/10202: [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/10202] Rename method names _all() to _array().Andreas Fischer2013-03-052-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Add migration file for config_db_text.Andreas Fischer2013-03-051-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Upgrade TEXT to the bigger MTEXT.Andreas Fischer2013-03-056-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Improve method documentation.Andreas Fischer2013-03-051-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] SQL escape the table name.Andreas Fischer2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.Andreas Fischer2013-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Define phpbb_config_db_text as a service.Andreas Fischer2013-03-052-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Add tests for phpbb_config_db_text.Andreas Fischer2013-03-052-0/+134
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Adjust method names to guidelines.Andreas Fischer2013-03-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Add database schema for phpbb_config_db_text.Andreas Fischer2013-03-058-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | [ticket/10202] Implementation of config options with arbitrary length values.Andreas Fischer2013-03-051-0/+157
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11166' into developDavid King2013-03-0610-20/+133
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11166: [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
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-06368-7928/+26189
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (799 commits) [ticket/11402] Fix undefined index in post/topic_in_queue [ticket/11400] If email is disabled, disable it for notifications [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/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working ... Conflicts: phpBB/assets/javascript/core.js
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11400' into developDavid King2013-03-051-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse # Via Nathan Guse * EXreaction/ticket/11400: [ticket/11400] If email is disabled, disable it for notifications
| * | | | | | [ticket/11400] If email is disabled, disable it for notificationsNathan Guse2013-03-051-2/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-11400
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11402' into developDavid King2013-03-052-8/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse # Via Nathan Guse * EXreaction/ticket/11402: [ticket/11402] Fix undefined index in post/topic_in_queue
| * | | | | [ticket/11402] Fix undefined index in post/topic_in_queueNathan Guse2013-03-052-8/+35
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11402
* | | | | Merge remote-tracking branch 'remotes/marc/ticket/11398' into developNathaniel Guse2013-03-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11398: [ticket/11398] Correctly call permission_set method in permission tool
| * | | | | [ticket/11398] Correctly call permission_set method in permission toolMarc Alexander2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The permission_set method calls itself inside the permission tool. Probably due to an oversight, it is called as $this->set(), which causes a fatal error. This patch will get rid of this issue. PHPBB3-11398
* | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/10714' into developNathaniel Guse2013-03-0418-313/+1725
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/10714: (56 commits) [ticket/10714] Get log from container in install, update and download/file [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10714] Update add_log docs block with @param and @deprecated [ticket/10714] Remove fallback code from previous commits and move global [ticket/10714] Fix missing parameter and global phpbb_log in unit tests [ticket/10714] Add getter for is_in_admin and use it [ticket/10714] Fix more comments [ticket/10714] Cast values to integer before using them in the query [ticket/10714] Fix several doc blocks and comments [ticket/10714] Fix missing 8th argument in unit tests [ticket/10714] Use new core.adm_relative_path to create the object. [ticket/10714] Fix several comments and variable names [ticket/10714] Fix database driver class name [ticket/10714] Forgot most important, use container to create $phpbb_log [ticket/10714] Remove type hinting to allow the usage of mocks in tests [ticket/10714] Fix dependency injections in unit tests with mocks [ticket/10714] Use dependencies instead of globals [ticket/10714] Compare log_type to false, rather then null [ticket/10714] Add global variables for the unit tests ...
| * | | | | [ticket/10714] Get log from container in install, update and download/fileJoas Schilling2013-03-043-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-03-04162-3467/+11651
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (255 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-10 14:21:07 +0000