aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9657] Add migration files for updating the databaseJoas Schilling2013-03-062-0/+245
| | | | PHPBB3-9657
* [ticket/9657] Correctly return to viewtopic page when handling postsJoas Schilling2013-03-061-1/+1
| | | | | | | While managing posts from viewtopic.php we should return to that page, rather then the MCP PHPBB3-9657
* [ticket/9657] Fix "Display this post" link if javascript is disabledJoas Schilling2013-03-061-2/+2
| | | | PHPBB3-9657
* [ticket/9657] Move softdelete permission to new post-tabJoas Schilling2013-03-061-1/+1
| | | | PHPBB3-9657
* [ticket/9657] Correctly state when to refresh last/first post info on approvingJoas Schilling2013-03-061-2/+4
| | | | PHPBB3-9657
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-063-10/+36
|\ | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11402] Fix undefined index in post/topic_in_queue [ticket/11400] If email is disabled, disable it for notifications
| * 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
| * | [ticket/11402] Fix undefined index in post/topic_in_queueNathan Guse2013-03-052-8/+35
| |/ | | | | | | PHPBB3-11402
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-0584-1828/+4771
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/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-0412-312/+917
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-04147-3455/+10814
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | * | [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/Joas Schilling2013-03-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10714
| | * | [ticket/10714] Logs are disabled for this page call onlyJoas Schilling2013-03-032-4/+14
| | | | | | | | | | | | | | | | PHPBB3-10714
| | * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-02-2576-113/+3263
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (119 commits) [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated [ticket/11358] Changed the name of post parameter. [ticket/11358] Changed the action parameter value to represent the link. [ticket/11358] Enabled link making all users default for a group. [ticket/11358] Removed redundant code and referred proper variable. [ticket/11358] Success message even without selecting a user. [ticket/11355] Referred proper variable when validating selection. [ticket/11355] Wrong error message when no user is selected. [ticket/10896] Add missing email validation lost in develop merge [ticket/7262] Add note about set_config() not updating is_dynamic. [ticket/7262] Add $is_dynamic example to set_config() and set_config_count(). [ticket/7262] Backport set_config() and set_config_count() docs from develop. [ticket/11122] Move rxu to 'Former Contributors' section. [ticket/11122] Add EXreaction to docs/AUTHORS. [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION [ticket/11361] Make sure that array passed to strtr() has the proper format. [ticket/11179] remove extra & in function call [ticket/11179] correct start parameter in sphinx search [ticket/11179] correct start parameter in native author search [ticket/11179] correct start parameter in native keyword search ... Conflicts: phpBB/config/tables.yml
| | * | | [ticket/10714] Update add_log docs block with @param and @deprecatedJoas Schilling2013-02-251-1/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | [ticket/10714] Remove fallback code from previous commits and move globalJoas Schilling2013-01-231-10/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | [ticket/10714] Fix missing parameter and global phpbb_log in unit testsJoas Schilling2013-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-229-62/+112
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11329] Moving colors to colours.css [ticket/9492] Fix missing phpbb_container in unit tests [ticket/9492] Fix typo in SQL query [ticket/9492] Ensure to delete the avatar/rank data when we change it [ticket/9492] Ensure to update all avatar values when the avatar is changed [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar [ticket/9492] Add unit tests for custom ranks and avatars [ticket/9492] Retain custom ranks and avatars when setting users default group [ticket/11328] Replace long buttons text with short text [ticket/11328] Add language variables for buttons
| | * | | | [ticket/10714] Add getter for is_in_admin and use itJoas Schilling2013-01-221-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | [ticket/10714] Fix more commentsJoas Schilling2013-01-221-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | [ticket/10714] Cast values to integer before using them in the queryJoas Schilling2013-01-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | [ticket/10714] Fix several doc blocks and commentsJoas Schilling2013-01-223-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | [ticket/10714] Use new core.adm_relative_path to create the object.Joas Schilling2013-01-162-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-16142-2719/+3187
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (205 commits) [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/11201] Remove database column on update [ticket/10431] Remove .left class from reply-all [ticket/10431] Remove reply-all custom css [ticket/10431] Adjustments for large buttons [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11201] Remove MSN/WLM fields [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone ...
| | * | | | | [ticket/10714] Fix several comments and variable namesJoas Schilling2013-01-162-53/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | [ticket/10714] Fix database driver class nameJoas Schilling2012-12-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2012-12-1458-313/+1097
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (158 commits) [ticket/11015] Move comment in the right place. [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31 [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli. [ticket/11015] Change permission adding in database updater to new style. [ticket/11015] Change more docblocks to phpbb_db_driver. [ticket/11015] Installer still needs 3.0-style dbms name. [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11015] Include functions.php because it is not always included. [ticket/11265] Add assertions for board installation success. [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager [ticket/11015] Convert database drivers to new spelling in post setup sync. [ticket/11015] Convert connect test to the new syntax. [ticket/11015] Restore whitespace to avoid conflict when merging develop. [ticket/10975] Add a test for viewing a profile. [ticket/10975] Test restricting by first character. [ticket/10975] Avoid rewriting global config twice. [ticket/10975] Test memberlist, not user creation. [ticket/10975] Some quick tests to check the memberlist behaviour [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. ...
| | * | | | | | [ticket/10714] Forgot most important, use container to create $phpbb_logJoas Schilling2012-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | [ticket/10714] Remove type hinting to allow the usage of mocks in testsJoas Schilling2012-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | [ticket/10714] Use dependencies instead of globalsJoas Schilling2012-12-093-45/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a setter for the admin root path, as it is not defined all the time. Aswell as we added a setter for the table name, so it can still be used for custom tables. PHPBB3-10714
| | * | | | | | [ticket/10714] Compare log_type to false, rather then nullJoas Schilling2012-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2012-12-07416-2935/+8191
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (645 commits) [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1 [ticket/10679] Use module_auth to limit access to the module [ticket/10679] Add new permission for changing profile field information [ticket/11219] Coding guidelines and naming consistency changes [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP [ticket/11247] Fix wrong property reference in flock class. [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10103] New and improved wording. [ticket/10716] Only lint on php 5.3+. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. ...
| | * | | | | | | [ticket/10714] Rely on global instead of creating an instanceJoas Schilling2012-12-072-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Make attributed protected rather then privateJoas Schilling2012-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Remove some private functions from the log interfaceJoas Schilling2012-11-112-47/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Fix some commentsJoas Schilling2012-11-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Remove dependency injection and use global insteadJoas Schilling2012-08-213-43/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids loading functions_admin.php globally and was suggested by naderman PHPBB3-10714
| | * | | | | | | [ticket/10714] Always try to trigger events on phpbb_dispatcherJoas Schilling2012-08-211-20/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We may add the if () later again, if we decide to do that. PHPBB3-10714
| | * | | | | | | [ticket/10714] Remove event core.function_add_log, add_log should be used ↵Joas Schilling2012-08-211-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead PHPBB3-10714
| | * | | | | | | [ticket/10714] Enable event core.get_logs_get_additional_dataJoas Schilling2012-08-211-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Enable event core.get_logs_modify_entry_dataJoas Schilling2012-08-211-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Fix core.add_log eventJoas Schilling2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Add event core.get_logs_modify_typeJoas Schilling2012-08-211-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core.get_logs_switch_mode is superseded by this one and therefor removed PHPBB3-10714
| | * | | | | | | [ticket/10714] Enable core.add_log event and remove superseded add_log_caseJoas Schilling2012-08-211-24/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Refactor disable mechanism to only disable certain typesJoas Schilling2012-08-212-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only disable admin log when adding multiple users, so critical errors are still logged. PHPBB3-10714
| | * | | | | | | [ticket/10714] Change $phpbb_dispatcher calls to the new layoutJoas Schilling2012-08-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714