aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | [ticket/12920] Add composer.json for phpbb/phpbb-core libraryNils Adermann2014-08-071-0/+24
| |/ / / |/| | | | | | | | | | | PHPBB3-12920
* | | | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-073-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12847] Allow the extensions to say if they can be enabled * Nicofuma/ticket/12847: [ticket/12847] Allow the extensions to say if they can be enabled
| * | | | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-133-0/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-12847
* | | | | Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-0747-60/+125
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Sami for ascraeus * n-aleha/ticket/12557ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
| * | | | | [ticket/12557] Fix php file descriptionn-aleha2014-08-0718-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix post data description for notificationsn-aleha2014-08-078-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix pass by reference doc blocksn-aleha2014-08-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block in extension base classn-aleha2014-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block in mimetype guessern-aleha2014-08-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-032-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-034-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | | | | [ticket/12557] Template fixesn-aleha2014-08-034-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Search, cron and profilefields fixesn-aleha2014-08-037-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Notification fixesn-aleha2014-08-0314-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Sami pt1n-aleha2014-08-037-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
* | | | | | Merge remote-tracking branch 'github-marc1706/ticket/11148' into ↵Nils Adermann2014-08-071-2/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/11148: [ticket/11148] Remove unneeded variable mimetype and use type octet-stream [ticket/11148] Change expected output with disallowed content in test [ticket/11148] Always use the output of the mimetype guesser in get_mimetype [ticket/11148] Get rid of extra line in mimetype guesser setter doc block [ticket/11148] Add missing parts to docblock of get_mimetype() method [ticket/11148] Default to application/octet-stream if no mimetype given [ticket/11148] Use mimetype guesser for uploaded avatars [ticket/11148] Pass mimetype guesser to upload_attachment() function [ticket/11148] Add mimetype guesser to filespec and fileupload class
| * | | | | | [ticket/11148] Use mimetype guesser for uploaded avatarsMarc Alexander2014-06-231-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11148
* | | | | | | Merge pull request #2798 from tmbackoff/ticket/12912Joas Schilling2014-08-061-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12912] Undefined index when adding logs from extensions * tmbackoff/ticket/12912: [ticket/12912] Undefined index when adding logs from extensions
| * | | | | | | [ticket/12912] Undefined index when adding logs from extensionsTabitha Backoff2014-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add isset() to forum_id and topic_id. PHPBB3-12912
* | | | | | | | Merge pull request #2795 from Dragooon/ticket/12910Joas Schilling2014-08-061-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12910] Set get_name for Google+ fields * Dragooon/ticket/12910: [ticket/12910] Set get_name for Google+ fields
| * | | | | | | [ticket/12910] Set get_name for Google+ fieldsShitiz Garg2014-08-031-0/+8
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12910
* | | | | | | Merge pull request #2793 from n-aleha/ticket/12909Andreas Fischer2014-08-031-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12909] Use correct lang vars in cli extension enable * n-aleha/ticket/12909: [ticket/12909] Use correct lang vars in cli extension enable
| * | | | | | | [ticket/12909] Use correct lang vars in cli extension enablen-aleha2014-08-031-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12909
* | | | | | | [ticket/12908] Fix operator typo in increment.phpn-aleha2014-08-031-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12908
* | | | | | Merge pull request #2767 from Nicofuma/ticket/12882Joas Schilling2014-07-311-0/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12882] Update search_type when it's not prefixed by phpbb_search * Nicofuma/ticket/12882: [ticket/12882] Use a new migration [ticket/12882] Update search_type when it's not prefixed by phpbb_search
| * | | | | | [ticket/12882] Use a new migrationTristan Darricau2014-07-212-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12882
| * | | | | | [ticket/12882] Update search_type when it's not prefixed by phpbb_searchTristan Darricau2014-07-211-0/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-12882
* | | | | | Merge pull request #2780 from Nicofuma/ticket/12870Andreas Fischer2014-07-283-2/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12870] phpbbcli.php db:migrate can not update from 3.0.12 to 3.1 * Nicofuma/ticket/12870: [ticket/12870] Add doc block [ticket/12870] Create the migrations table with a method in the migrator [ticket/12870] Add $config['version'] in phpbb_extension_manager_test [ticket/12870] Create the migrations table in db:migrate
| * | | | | | [ticket/12870] Add doc blockTristan Darricau2014-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12870
| * | | | | | [ticket/12870] Create the migrations table with a method in the migratorTristan Darricau2014-07-273-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12870
| * | | | | | [ticket/12870] Create the migrations table in db:migrateTristan Darricau2014-07-262-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12870
* | | | | | | Merge pull request #2772 from dhruvgoel92/ticket/12656Andreas Fischer2014-07-2813-44/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12656] Translate existing CLI commands * dhruvgoel92/ticket/12656: [ticket/12656] Fix typo for "purged extension" [ticket/12656] Fix syntax in language file [ticket/12656] Fix typo [ticket/12656] Use utf8 ’ instead of escaping ' [ticket/12656] Use lang keys for all CLI strings [ticket/12656] Use lang keys for CLI command descriptions
| * | | | | | | [ticket/12656] Fix typoDhruv2014-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
| * | | | | | | [ticket/12656] Use lang keys for all CLI stringsDhruv2014-07-2310-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
| * | | | | | | [ticket/12656] Use lang keys for CLI command descriptionsDhruv2014-07-2313-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12656
* | | | | | | | Merge pull request #2718 from lucifer4o/ticket/12793Joas Schilling2014-07-271-8/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12793] String '0' does not display for string profile fields * lucifer4o/ticket/12793: [ticket/12793] Tests (added and changed) [ticket/12793] Changing get_profile_contact_value to get_profile_value_raw [ticket/12793] String '0' does not display for string profile fields
| * | | | | | | | [ticket/12793] Changing get_profile_contact_value to get_profile_value_rawStanislav Atanasov2014-07-101-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the return to get_profile_value_raw PHPBB3-12793
| * | | | | | | | [ticket/12793] String '0' does not display for string profile fieldsStanislav Atanasov2014-07-101-3/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/phpbb/phpbb/pull/2647#discussion_r14503051 PHPBB3-12793
* | | | | | | | Merge pull request #2719 from lucifer4o/ticket/12791Joas Schilling2014-07-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12791] String profile fields do not use links ... * lucifer4o/ticket/12791: [ticket/12791] Changed the if check [ticket/12791] String profile fields do not use links ...
| * | | | | | | | [ticket/12791] Changed the if checkStanislav Atanasov2014-07-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded variable PHPBB3-12791
| * | | | | | | | [ticket/12791] String profile fields do not use links ...Stanislav Atanasov2014-07-101-1/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | smilies and line breaks in memberlist The value is overwritten with the contact value Added aditional check if the field is a contact so we don't overwrite it. PHPBB3-12791
* | | | | | | | Merge pull request #2768 from Nicofuma/ticket/12883Andreas Fischer2014-07-261-6/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12883] Do not use basename() to get the search class in tidy_search * Nicofuma/ticket/12883: [ticket/12883] Remove pointless comments [ticket/12883] Do not use basename() to get the search class in tidy_search
| * | | | | | | [ticket/12883] Remove pointless commentsTristan Darricau2014-07-231-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12883
| * | | | | | | [ticket/12883] Do not use basename() to get the search class in tidy_searchTristan Darricau2014-07-211-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12883
* | | | | | | [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loopJoas Schilling2014-07-251-20/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not set S_NUM_ROWS while adding a row, to reduce the complexity If we would set it on adding, each subsequent adding would cause n modifications, resulting in a O(n!) complexity, rather then O(n) PHPBB3-12892
* | | | | | | Merge pull request #2766 from marc1706/ticket/12560Dhruv Goel2014-07-221-2/+29
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | [ticket/12560] Add methods to set upload and temp paths in plupload
| * | | | | | [ticket/12560] Add methods to set upload and temp paths in pluploadMarc Alexander2014-07-201-2/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The paths will be reset to the default paths after an upload is complete. PHPBB3-12560