aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3781 from Elsensee/ticket/8708-2Tristan Darricau2015-07-222-0/+42
|\ | | | | | | | | | | | | | | [ticket/8708] Add extra permission for posting global announcements * Elsensee/ticket/8708-2: [ticket/8708] Apply permission 'f_announce_global' [ticket/8708] Add f_announce_global permission
| * [ticket/8708] Add f_announce_global permissionOliver Schramm2015-07-192-0/+42
| | | | | | | | PHPBB3-8708
* | Merge pull request #3745 from s9e/ticket/13986Tristan Darricau2015-07-191-42/+145
|\ \ | |/ |/| | | | | | | | | | | | | [ticket/13986] Add --resume option to reparser CLI * s9e/ticket/13986: [ticket/13986] Replaced hardcoded value [ticket/13986] Fixed resume data to carry through multiple runs [ticket/13986] Add --resume option to reparser CLI
| * [ticket/13986] Replaced hardcoded valueJoshyPHP2015-07-171-1/+1
| | | | | | | | PHPBB3-13986
| * [ticket/13986] Fixed resume data to carry through multiple runsJoshyPHP2015-07-171-2/+2
| | | | | | | | | | | | | | Options restored from a previous execution should carry to the next resumed execution PHPBB3-13986
| * [ticket/13986] Add --resume option to reparser CLIJoshyPHP2015-07-171-41/+144
| | | | | | | | PHPBB3-13986
* | Merge branch '3.1.x'Marc Alexander2015-07-171-4/+54
|\ \ | |/ |/|
| * Merge pull request #3593 from satanasov/ticket/13817Marc Alexander2015-07-171-4/+54
| |\ | | | | | | | | | [ticket/13817] Add core.update_session event
| | * [ticket/13817] Fix target versionStanislav Atanasov2015-07-121-4/+4
| | | | | | | | | | | | PHPBB3-13817
| | * [ticket/13817] fix after for session_updateStanislav Atanasov2015-06-241-3/+3
| | | | | | | | | | | | | | | | | | Fix wrong variables passed to create session event PHPBB3-13817
| | * [ticket/13817] Add read-only notes to eventsStanislav Atanasov2015-06-201-0/+3
| | | | | | | | | | | | PHPBB3-13817
| | * [ticket/13817] Fix missing var namesStanislav Atanasov2015-06-201-0/+1
| | | | | | | | | | | | | | | | | | Var names in doc block PHPBB3-13817
| | * [ticket/13817] Add _afterStanislav Atanasov2015-06-201-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested events are named *_after core.session_start_after is moved after USERS_TABLE update to prevent returning session data from extensions PHPBB3-13817
| | * [ticket/13817] Change trgger_event to dispatchStanislav Atanasov2015-06-201-1/+1
| | | | | | | | | | | | | | | | | | Fix no event parameters PHPBB3-13817
| | * [ticket/13817] Fix empty eventStanislav Atanasov2015-06-201-1/+1
| | | | | | | | | | | | | | | | | | Try adding event with no parameters PHPBB3-13817
| | * [ticket/13817] Fix empty vars arrayStanislav Atanasov2015-06-201-2/+1
| | | | | | | | | | | | PHPBB3-13817
| | * [ticket/13817] Fix missing phpbb_dispatcherStanislav Atanasov2015-06-201-3/+17
| | | | | | | | | | | | | | | | | | Fix missing phpbb_dispatcher and add event to session_create PHPBB3-13817
| | * [ticket/13817] Add session_kill and session_gcStanislav Atanasov2015-06-201-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket was changed to add few more session related events core.session_kill - send user_id and session_id core.session_gc - just triger event PHPBB3-13817
| | * [ticket/13817] Change sinceStanislav Atanasov2015-06-201-1/+1
| | | | | | | | | | | | | | | | | | As requested by nickvergessen PHPBB3-13817
| | * [ticket/13817] Add core.update_session eventStanislav Atanasov2015-06-201-1/+12
| | | | | | | | | | | | | | | | | | Add core.update_session event in \phpbb\session.php PHPBB3-13817
* | | Merge pull request #3776 from VSEphpbb/ticket/14033Tristan Darricau2015-07-174-4/+5
|\ \ \ | | | | | | | | | | | | [ticket/14033] Fix errors in docblocks
| * | | [ticket/14033] Fix errors in docblocksMatt Friedman2015-07-164-4/+5
| | | | | | | | | | | | | | | | PHPBB3-14033
* | | | [ticket/14034] Fix reparser names that contain "text_reparser" in the middleJoshyPHP2015-07-172-4/+4
| | | | | | | | | | | | | | | | PHPBB3-14034
* | | | Merge branch '3.1.x'Marc Alexander2015-07-151-0/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3737 from javiexin/ticket/13980Marc Alexander2015-07-151-0/+7
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13980] Uploaded avatar not removed when new is uploaded
| | * | | [ticket/13980] Uploaded avatar not removed when new is uploadedjaviexin2015-07-091-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the previously uploaded avatar when a new one with a different extension is uploaded, using existing delete method PHPBB3-13980
| | * | | [ticket/13980] Uploaded avatar not removed when new is uploadedjaviexin2015-07-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the previously uploaded avatar when a new one with a different extension is uploaded PHPBB3-13980
* | | | | Merge pull request #3751 from Nicofuma/ticket/11444Máté Bartus2015-07-1428-559/+1223
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11444] Moving the in-board notifications to a method class
| * | | | | [ticket/11444] Fix services definitionTristan Darricau2015-07-131-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11444
| * | | | | [ticket/11444] Update tests and cleanup types/methodsTristan Darricau2015-07-139-33/+102
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11444
| * | | | | [ticket/11444] Cleanup method constructorsTristan Darricau2015-07-136-84/+89
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11444
| * | | | | [ticket/11444] BC layerTristan Darricau2015-07-131-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11444
| * | | | | [ticket/11444] Moving the in-board notifications to a method classNicofuma2015-07-1325-462/+1030
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the in-board method for the notifications is hardcoded and cannot be disabled. This method should be in his own class extending `phpbb\notification\method\method_interface`. It also add the possibility, for each method, to be enabled by default (ie: no entry in the DB => notification enabled). https://tracker.phpbb.com/browse/PHPBB3-11444 https://tracker.phpbb.com/browse/PHPBB3-11967 PHPBB3-11444
* | | | | | Merge pull request #3758 from s9e/ticket/14008Tristan Darricau2015-07-131-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/14008] Do not add a user_id value to quotes from guests
| * | | | | [ticket/14008] Do not add a user_id value to quotes from guestsJoshyPHP2015-07-131-0/+6
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-14008
* | | | | [ticket/14000] Added support for emojiJoshyPHP2015-07-121-0/+5
|/ / / / | | | | | | | | | | | | PHPBB3-14000
* | | | Merge branch '3.1.x'Marc Alexander2015-07-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: tests/template/template_includecss_test.php
| * | | [ticket/13995] Remove deprecated projection media typeMatt Friedman2015-07-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13995
* | | | Merge pull request #3744 from s9e/ticket/13987Tristan Darricau2015-07-072-3/+38
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13987] Add --dry-run option to reparser CLI
| * | | | [ticket/13987] Replaced optional parameter with explicit APIJoshyPHP2015-07-063-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added disable_save() and enable_save() to toggle a dry run PHPBB3-13987
| * | | | [ticket/13987] Add --dry-run option to reparser CLIJoshyPHP2015-07-063-13/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-13987
* | | | | Merge pull request #3623 from s9e/ticket/10620Tristan Darricau2015-07-075-25/+127
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | [ticket/10620] Quote improvements
| * | | | [ticket/10620] Removed extraneous quotes from attribute valuesJoshyPHP2015-06-251-6/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-10620
| * | | | [ticket/10620] Updated docblockJoshyPHP2015-06-251-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10620
| * | | | [ticket/10620] Implemented quote improvementsJoshyPHP2015-06-254-18/+111
| | | | | | | | | | | | | | | | | | | | PHPBB3-10620
* | | | | Merge pull request #3726 from CHItA/ticket/13961Tristan Darricau2015-07-063-2/+128
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13961] Add orderable service collections
| * | | | | [ticket/13961] Define behaviour when the array is modified in a loopMate Bartus2015-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13961
| * | | | | [ticket/13961] Allow the collection to be modified runtimeMate Bartus2015-06-271-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13961
| * | | | | [ticket/13961] Move back service_collections under original namespaceMate Bartus2015-06-269-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13961
| * | | | | [ticket/13961] Fix compatibility issue with parent classMate Bartus2015-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13961