aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2647 from Dragooon/ticket/12334Joas Schilling2014-07-0313-18/+380
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12334] Add PROFILE_FIELD_VALUE_RAW template var * Dragooon/ticket/12334: [ticket/12334] Remove profile fields test group [ticket/12334] Add additional test for type_string [ticket/12334] Add string test for type_int [ticket/12334] Improve type_dropdown's test description [ticket/12334] Group profile fields test [ticket/12334] Change get_profile_value_raw_data to profile_value_raw_data [ticket/12334] Add get_profile_value_raw unit test for type_bool [ticket/12334] Add get_profile_value_raw unit test for type_date [ticket/12334] Add get_profile_value_raw unit tests for type_dropdown [ticket/12334] Add get_profile_value_raw unit test for type_string [ticket/12334] Add get_profile_value_raw unit test for type_url [ticket/12334] Add get_profile_value_raw unit tests for type_int [ticket/12334] Removed tests [ticket/12334] Dropdowns cannot be tested this way [ticket/12334] Added test get_profile_value_raw [ticket/12334] Changed from valueid to value_raw [ticket/12334] Implemented get_profile_valueid method [ticket/12334] Added field_novalue fall-back as requested [ticket/12334] Add PROFILE_FIELD_VALUEID template var
| * [ticket/12334] Remove profile fields test groupShitiz Garg2014-06-277-21/+0
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add additional test for type_stringShitiz Garg2014-06-271-0/+24
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add string test for type_intShitiz Garg2014-06-271-0/+6
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Improve type_dropdown's test descriptionShitiz Garg2014-06-271-3/+3
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Group profile fields testShitiz Garg2014-06-277-0/+21
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Change get_profile_value_raw_data to profile_value_raw_dataShitiz Garg2014-06-276-12/+12
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add get_profile_value_raw unit test for type_boolShitiz Garg2014-06-241-4/+52
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add get_profile_value_raw unit test for type_dateShitiz Garg2014-06-241-0/+36
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add get_profile_value_raw unit tests for type_dropdownShitiz Garg2014-06-241-0/+48
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add get_profile_value_raw unit test for type_stringShitiz Garg2014-06-241-0/+30
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add get_profile_value_raw unit test for type_urlShitiz Garg2014-06-241-0/+30
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add get_profile_value_raw unit tests for type_intShitiz Garg2014-06-241-0/+54
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Removed testsPayBas2014-06-241-52/+0
| | | | | | | | | | | | Will be implemented in #2459 PHPBB3-12334
| * [ticket/12334] Dropdowns cannot be tested this wayPayBas2014-06-241-2/+2
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Added test get_profile_value_rawPayBas2014-06-241-0/+52
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Changed from valueid to value_rawPayBas2014-06-247-16/+16
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Implemented get_profile_valueid methodPayBas2014-06-247-1/+84
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Added field_novalue fall-back as requestedPayBas2014-06-241-2/+3
| | | | | | | | PHPBB3-12334
| * [ticket/12334] Add PROFILE_FIELD_VALUEID template varPayBas2014-06-241-7/+9
| | | | | | | | PHPBB3-12334
* | Merge remote-tracking branch 'nickvergessen/ticket/12645' into develop-ascraeusCesar G2014-07-021-1/+1
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/12645: [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 links
| * | [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 linksJoas Schilling2014-06-271-1/+1
| | | | | | | | | | | | PHPBB3-12645
* | | Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-07-021-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12120] Add nicofuma to the developers Conflicts: phpBB/docs/AUTHORS
| * \ \ Merge pull request #2685 from nickvergessen/ticket/12120Tristan Darricau2014-07-021-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12120] Add nicofuma to the developers * nickvergessen/ticket/12120: [ticket/12120] Add nicofuma to the developers
| | * | | [ticket/12120] Add nicofuma to the developersJoas Schilling2014-07-021-0/+1
| |/ / / | | | | | | | | | | | | PHPBB3-12120
* | | | Merge pull request #2681 from Nicofuma/ticket/12790Joas Schilling2014-07-011-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics * Nicofuma/ticket/12790: [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics
| * | | | [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topicsTristan Darricau2014-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12790
* | | | | Merge remote-tracking branch 'Elsensee/ticket/12674' into develop-ascraeusDhruv2014-07-011-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oliver Schramm # Via Oliver Schramm * Elsensee/ticket/12674: [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
| * | | | | [ticket/12674] Use user's colour in 'Last edited' line in sent PMsOliver Schramm2014-06-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12674
* | | | | | Merge pull request #2677 from nickvergessen/ticket/12779Dhruv Goel2014-07-011-102/+108
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ticket/12779] Change order of file lists on automatic update
| * | | | | [ticket/12779] Change order of file lists on automatic updateJoas Schilling2014-06-291-102/+108
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also allow collapsing all the groups and collapse categories without user interaction per default PHPBB3-12779
* | | | | Merge pull request #2669 from Nicofuma/ticket/12777Joas Schilling2014-06-296-14/+92
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12777] Rename extension status functions and add is_configured() * Nicofuma/ticket/12777: [ticket/12777] Add tests for unavailable extension [ticket/12777] Add tests [ticket/12777] Add is_purged() [ticket/12777] Update doc block of is_configured() [ticket/12777] Rename extension status functions and add is_configured()
| * | | | [ticket/12777] Add tests for unavailable extensionTristan Darricau2014-06-271-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-12777
| * | | | [ticket/12777] Add testsTristan Darricau2014-06-271-3/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-12777
| * | | | [ticket/12777] Add is_purged()Tristan Darricau2014-06-271-0/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-12777
| * | | | [ticket/12777] Update doc block of is_configured()Tristan Darricau2014-06-271-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12777
| * | | | [ticket/12777] Rename extension status functions and add is_configured()Tristan Darricau2014-06-275-11/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-12777
* | | | | Merge pull request #2598 from Nicofuma/ticket/12716Joas Schilling2014-06-274-1/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12716] Add the missing parameters in the call of clearToken * Nicofuma/ticket/12716: [ticket/12716] Use a string as session_id [ticket/12716] Add regression test [ticket/12716] Add the missing parameters in the call of clearToken
| * | | | | [ticket/12716] Use a string as session_idTristan Darricau2014-06-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12716
| * | | | | [ticket/12716] Add regression testTristan Darricau2014-06-193-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12716
| * | | | | [ticket/12716] Add the missing parameters in the call of clearTokenTristan Darricau2014-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12716
* | | | | | Merge pull request #2660 from marc1706/ticket/12764Joas Schilling2014-06-271-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12764] Properly handle errors upon connecting to MySQLi database * marc1706/ticket/12764: [ticket/12764] Properly handle errors upon connecting to MySQLi database
| * | | | | | [ticket/12764] Properly handle errors upon connecting to MySQLi databaseMarc Alexander2014-06-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the db_connect_id gets set up by mysql_init(), the db_connect_id will be an object with empty settings instead of just empty. Even if mysql_real_connect() encounters an error upon connecting, the db_connect_id is still set. This will result in trying to just access the database which obviously does nothing. By setting db_connect_id to an empty string, the script will not try to query th database and properly handle any errors that occur upon connecting. PHPBB3-12764
* | | | | | | Merge pull request #2658 from lucifer4o/ticket/12771Joas Schilling2014-06-271-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12771] Bug in profilefield_base_migration when used in ext * lucifer4o/ticket/12771: [ticket/12771] Shanging substr to strpos [ticket/12771] Change var name [ticket/12771] Bug in profilefield_base_migration when used in ext
| * | | | | | | [ticket/12771] Shanging substr to strposStanislav Atanasov2014-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logical change ... PHPBB3-12771
| * | | | | | | [ticket/12771] Change var nameStanislav Atanasov2014-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change var name PHPBB3-12771
| * | | | | | | [ticket/12771] Bug in profilefield_base_migration when used in extStanislav Atanasov2014-06-261-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base migration class should create lang entry for the new CPF but it is supposed to strip it of phpbb_ prefix. As extensions CPFs do not use phpbb_ prefix it will not create a lang entry. This is as simple solution as it can be done. PHPBB3-12771
* | | | | | | Merge pull request #2636 from Dragooon/ticket/12759Joas Schilling2014-06-273-32/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12759] Resolve query flooding while displaying large number of custom profile fields * Dragooon/ticket/12759: [ticket/12759] Fix type_bool and type_dropdown's UCP fields [ticket/12759] Remove lang_helper from profilefields_manager [ticket/12759] Cache all lang_options in lang_helper instead [ticket/12759] Extra line in profilefields_manager [ticket/12759] Cache lang_options for pm_viewmessage [ticket/12759] Cache lang_options on memberlist [ticket/12759] Add phpDoc comments to explain get_option_lang [ticket/12759] Little code cleanup [ticket/12759] Make sure $field_id has unique elements [ticket/12759] Cache the lang options earlier [ticket/12759] Cache lang options for all fields while displaying [ticket/12759] Allow multiple fields to be loaded via get_option_lang
| * | | | | | | [ticket/12759] Fix type_bool and type_dropdown's UCP fieldsShitiz Garg2014-06-272-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12759
| * | | | | | | [ticket/12759] Remove lang_helper from profilefields_managerShitiz Garg2014-06-272-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer required PHPBB3-12759