aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10963] Modified filespec::is_image() to check actual mimetypeFyorl2012-07-021-1/+5
| | | | | | | Modified filespec::is_image() to check the Fileinfo mimetype rather than trusting the browser. PHPBB3-10963
* Merge pull request #814 from p/ticket/10828Nils Adermann2012-06-111-0/+15
|\ | | | | [ticket/10828] Connect to postgres database by default.
| * [ticket/10828] Connect to postgres database by default.Oleg Pudeyev2012-05-211-0/+15
| | | | | | | | | | | | | | | | When not connecting to a specific database, connect to postgres database which specifically exists as a default database to connect to. PHPBB3-10828
* | Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' ↵Nils Adermann2012-06-116-0/+170
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * github-dhruvgoel92/feature/delete-auto-logins: [feature-delete-auto-logins] adds module to database update [feature/delete-auto-logins] fixes style [feature/delete-auto-logins] improves styling [feature/delete-auto-logins] fixes language entry [feature/delete-auto-logins] fix language keys and styling [feature/delete-auto-logins] explain persistent keys in the ucp. [feature/delete-auto-logins] template added for subsilver2 [feature/delete-auto-logins] improved styling and fixes language [feature/delete-auto-logins] using loop for errors [feature/delete-auto-logins] fixes css corners [feature/delete-auto-logins] Fixes language entries [feature/delete-auto-logins] checks form key [feature/delete-auto-logins] Fixes language entries and redirection. [feature/delete-auto-logins] User can view/delete auto logins.
| * | [feature-delete-auto-logins] adds module to database updateDhruv Goel2012-06-031-0/+7
| | | | | | | | | | | | | | | ucp delete auto-login keys module is added to database_update.php under 3.1-dev
| * | [feature/delete-auto-logins] fixes styleDhruv Goel2012-05-172-6/+4
| | | | | | | | | | | | | | | | | | | | | removes reset button and some minor style fixes in subsilver2 and prosilver. PHPBB3-9647
| * | [feature/delete-auto-logins] improves stylingDhruv Goel2012-05-172-43/+41
| | | | | | | | | | | | PHPBB3-9647
| * | [feature/delete-auto-logins] fixes language entryDhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | PHPBB3-9647
| * | [feature/delete-auto-logins] fix language keys and stylingDhruv Goel2012-05-173-10/+12
| | | | | | | | | | | | | | | | | | introduction of language variables instead of hardcoded language. PHPBB3-9647
| * | [feature/delete-auto-logins] explain persistent keys in the ucp.Dhruv Goel2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | a short explaination of persistent keys in edit persistent keys section PHPBB3-9647
| * | [feature/delete-auto-logins] template added for subsilver2Dhruv Goel2012-05-171-0/+51
| | | | | | | | | | | | PHPBB3-9647
| * | [feature/delete-auto-logins] improved styling and fixes languageDhruv Goel2012-05-173-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | Table ahs been styled. Date is now formatted properly instead of the unix timestamp being displayed earlier. fixes small mistake in language entry PHPBB3-9647
| * | [feature/delete-auto-logins] using loop for errorsDhruv Goel2012-05-172-2/+8
| | | | | | | | | | | | | | | | | | | | | instead of hardcoding html code into ERROR variable, we use errors array and use loop in template file. PHPBB3-9647
| * | [feature/delete-auto-logins] fixes css cornersDhruv Goel2012-05-171-2/+2
| | | | | | | | | | | | PHPBB3-9647
| * | [feature/delete-auto-logins] Fixes language entriesDhruv Goel2012-05-171-4/+4
| | | | | | | | | | | | | | | | | | | | | Fixed language entries so that UI shows persistent login keys instead of autologin keys. PHPBB3-9647
| * | [feature/delete-auto-logins] checks form keyDhruv Goel2012-05-171-8/+21
| | | | | | | | | | | | | | | | | | The form key is checked after submission if not correct error is returned. PHPBB3-9647
| * | [feature/delete-auto-logins] Fixes language entries and redirection.Dhruv Goel2012-05-171-1/+2
| | | | | | | | | | | | | | | | | | The user is redirected after deleting auto login session keys. PHPBB3-9647
| * | [feature/delete-auto-logins] User can view/delete auto logins.Dhruv Goel2012-05-174-0/+90
| | | | | | | | | | | | | | | | | | | | | User has an extra option in UCP->Profile to view the auto logins and clear them. PHPBB3-9647
* | | Merge pull request #796 from imkingdavid/ticket/10837Nils Adermann2012-06-111-9/+0
|\ \ \ | | | | | | | | [ticket/10837] Removed tearDownAfterClass() from extension_controller_test.php
| * | | [ticket/10837] Removed tearDownAfterClass() from extension_controller_test.phpDavid King2012-05-071-9/+0
| | | | | | | | | | | | | | | | PHPBB3-10837
* | | | Merge PR #834 branch 'bantu/ticket/10931' into developOleg Pudeyev2012-06-114-0/+290
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10931: [ticket/10931] Apply strtolower() correctly, i.e. not on false. [ticket/10931] Also test get_bytes() and get_string() with false. [ticket/10931] Make to_numeric function globally available. [ticket/10931] Make sure get_bytes() always returns either an int or a float. [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes(). [ticket/10931] Use strict assertSame() instead of assertEquals(). [ticket/10931] Also test for negative values. [ticket/10931] Also test lower case units in test_get_bytes(). [ticket/10931] Correctly use GNU GPL version 2. [ticket/10931] Make it clear that we are mocking the ini_get() function. [ticket/10931] Document that false is also returned if value is not well formed [ticket/10931] Correct method description of get_string(). [ticket/10931] Let us try ini_get() without error suppression. [ticket/10931] Unit tests for phpbb_php_ini class. [ticket/10931] Add wrapper class for ini_get function.
| * | | | [ticket/10931] Apply strtolower() correctly, i.e. not on false.Andreas Fischer2012-06-111-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Also test get_bytes() and get_string() with false.Andreas Fischer2012-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Make to_numeric function globally available.Andreas Fischer2012-06-113-15/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Make sure get_bytes() always returns either an int or a float.Andreas Fischer2012-06-112-9/+39
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes().Andreas Fischer2012-06-111-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Use strict assertSame() instead of assertEquals().Andreas Fischer2012-06-111-19/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Also test for negative values.Andreas Fischer2012-06-111-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Also test lower case units in test_get_bytes().Andreas Fischer2012-06-111-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Correctly use GNU GPL version 2.Andreas Fischer2012-06-113-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Make it clear that we are mocking the ini_get() function.Andreas Fischer2012-06-112-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Document that false is also returned if value is not well formedAndreas Fischer2012-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Correct method description of get_string().Andreas Fischer2012-06-111-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Let us try ini_get() without error suppression.Andreas Fischer2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Unit tests for phpbb_php_ini class.Andreas Fischer2012-06-112-0/+74
| | | | | | | | | | | | | | | | | | | | PHPBB3-10931
| * | | | [ticket/10931] Add wrapper class for ini_get function.Andreas Fischer2012-06-111-0/+165
|/ / / / | | | | | | | | | | | | | | | | | | | | Provides easier handling of the different interpretations of ini values. PHPBB3-10931
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-313-24/+141
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. [develop-olympus] Add changelog for 3.0.11 release. [develop-olympus] Bump version numbers for 3.0.11-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.11 releases. Conflicts: phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| * | | | [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.Andreas Fischer2012-05-313-3/+3
| | | | |
| * | | | [develop-olympus] Add changelog for 3.0.11 release.Andreas Fischer2012-05-311-19/+136
| | | | |
| * | | | [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-314-8/+8
| | | | |
| * | | | [develop-olympus] Bumping version numbers to final for 3.0.11 releases.Andreas Fischer2012-05-3110-11/+11
| | | | |
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Nils Adermann (2) and Andreas Fischer (1) * develop-olympus: [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympusNils Adermann2012-05-311-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10788: [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
| | * | | | [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.Andreas Fischer2012-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10788
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympusNils Adermann2012-05-311-6/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
* | \ \ \ \ \ Merge remote-tracking branch 'github-bantu/ticket/10790' into developNils Adermann2012-05-311-6/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
| * | | | | | [ticket/10790] Remove a (kind of) dead code section from submit_pm().Andreas Fischer2012-05-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of $user->data['user_id'] is (almost) guranteed to be integer since session::session_create() casts it to integer. The type of $row['user_id'] is only an integer if the DB driver adjusts the PHP type according to the DB type. This is only done by some of our not-so-popular DB drivers and is not the case for MySQL. As such this comparison is (almost) never true and a PM is also sent to the author itself when it is sent to a group the author is also a member of. Since this behaviour seems to have been accepted by the communty, the dead code is removed and current behaviour is kept. Also, checking this in the loop seems to be a rather bad idea. Introduced by 78b1c4caaa17cc8760b685ad41c19f15f9d89b68. PHPBB3-10790
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10550] Sort not installed styles list in the styles section of the ACP. Conflicts: phpBB/includes/acp/acp_styles.php
| * | | | | | Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympusNils Adermann2012-05-311-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10550: [ticket/10550] Sort not installed styles list in the styles section of the ACP.
| | * | | | | | [ticket/10550] Sort not installed styles list in the styles section of the ACP.Andreas Fischer2012-05-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10550