aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.Andreas Fischer2010-07-231-1/+1
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'No subject specified' in 'Posts awaiting approval' if post subject is empty. PHPBB3-9503
| * | | | | | | | | | Merge branch 'ticket/bantu/9754' into develop-olympusIgor Wiedler2010-09-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9754: [ticket/9754] Populate S_USER_POSTED variable with correct value in search.php
| | * | | | | | | | | [ticket/9754] Populate S_USER_POSTED variable with correct value in search.phpAndreas Fischer2010-07-261-1/+1
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9754
* | | | | | | | | | Merge branch 'ticket/bantu/7252' into developIgor Wiedler2010-09-122-24/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/7252: [ticket/7252] Align array keys and values to "=>". [ticket/7252] Replace magic values with PHP constants. [ticket/7252] Replace magic values with PHP constants.
| * | | | | | | | | | [ticket/7252] Align array keys and values to "=>".Andreas Fischer2010-09-121-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7252
| * | | | | | | | | | [ticket/7252] Replace magic values with PHP constants.Chris Smith2010-09-101-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_supported_image_types() in includes/functions_posting.php contained the values of PHP constants hardcoded instead of using the constants. PHPBB3-7252
| * | | | | | | | | | [ticket/7252] Replace magic values with PHP constants.Chris Smith2010-09-101-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fileupload::image_types() contained hardcoded references to values of built in PHP constants, these have been replaced with the constants instead now. PHPBB3-7252
* | | | | | | | | | | Merge branch 'ticket/evil3/9394' into developAndreas Fischer2010-09-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9394: [ticket/9394] Fix comment in functions_upload
| * | | | | | | | | | | [ticket/9394] Fix comment in functions_uploadIgor Wiedler2010-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9394
* | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-09-101-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | * develop-olympus: [ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.
| * | | | | | | | | | Merge branch 'ticket/cs278/8935' into develop-olympusIgor Wiedler2010-09-101-0/+14
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/8935: [ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.
| | * | | | | | | | | [ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.Chris Smith2010-09-091-0/+14
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change actually applies to any configruation setting that is a pair of values one representing the maximum and one minimum. This change enforces that the maximum value cannot be less than the minimum value. PHPBB3-8935
* | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-09-095-8/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [task/git-tools] Change the GNU --lines argument to the POSIX -l [task/git-tools] Solve dependency on the GNU wc --max-line-length option [ticket/8944] Patch db_tools to support index length for MySQL4 [ticket/9039] Make mssqlnative.php non-executable [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update [ticket/9800] Update tracker URL in docs/README.html
| * | | | | | | | | Merge branch 'task/cs278/git-tools' into develop-olympusIgor Wiedler2010-09-091-4/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/cs278/git-tools: [task/git-tools] Change the GNU --lines argument to the POSIX -l [task/git-tools] Solve dependency on the GNU wc --max-line-length option
| | * | | | | | | | [task/git-tools] Change the GNU --lines argument to the POSIX -lChris Smith2010-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed to awk which handles the formatting differences between the two versions of wc -- BSD version prefixes the output with spaces, the GNU version does not. PHPBB3-9808
| | * | | | | | | | [task/git-tools] Solve dependency on the GNU wc --max-line-length optionChris Smith2010-09-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9808
| * | | | | | | | | Merge branch 'ticket/evil3/8944' into develop-olympusChris Smith2010-09-052-3/+35
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/8944: [ticket/8944] Patch db_tools to support index length for MySQL4 [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
| | * | | | | | | | | [ticket/8944] Patch db_tools to support index length for MySQL4Igor Wiedler2010-09-051-1/+17
| | | | | | | | | | |
| | * | | | | | | | | [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_updateIgor Wiedler2010-09-031-2/+18
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes following SQL error when updating the database to 3.0.6. BLOB column 'post_username' used in key specification without a key length PHPBB3-8944
| * | | | | | | | | Merge branch 'ticket/evil3/9800' into develop-olympusChris Smith2010-09-051-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9800: [ticket/9800] Update tracker URL in docs/README.html
| | * | | | | | | | | [ticket/9800] Update tracker URL in docs/README.htmlIgor Wiedler2010-09-021-1/+1
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9800
| * | | | | | | | | Merge branch 'ticket/evil3/9039' into develop-olympusChris Smith2010-09-051-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9039: [ticket/9039] Make mssqlnative.php non-executable
| | * | | | | | | | | [ticket/9039] Make mssqlnative.php non-executableIgor Wiedler2010-09-031-0/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9039
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-09-022-4/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9662] Search flood interval no longer applies to non-keyword searches [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
| * | | | | | | | | Merge branch 'ticket/jellydoughnut/9662' into develop-olympusAndreas Fischer2010-09-021-2/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9662: [ticket/9662] Search flood interval no longer applies to non-keyword searches
| | * | | | | | | | [ticket/9662] Search flood interval no longer applies to non-keyword searchesJosh Woody2010-08-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search interval was not consistently applied to "special" searches like "unread posts" and "view your topics." Now the special searches are always exempt from the flood interval. PHPBB3-9662
| * | | | | | | | | Merge branch 'ticket/bantu/9615' into develop-olympusChris Smith2010-08-301-2/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9615: [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
| | * | | | | | | | | [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()Andreas Fischer2010-08-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When magic_quotes_gpc is 'On' it also affects the $_FILES array and a filename like 'bantu"s testfile.txt' will be returned as 'bantu\"s testfile.txt'. Because utf8_basename() also strips off anything before the last backslash the filename was returned as '"s testfile.txt'. Calling stripslashes() before utf8_basename() solves the problem. PHPBB3-9615
* | | | | | | | | | | Merge branch 'feature/evil3/auto-loading' into developNils Adermann2010-08-312-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/evil3/auto-loading: [feature/auto-loading] Add test case for phpbb_dir2 =>
| * | | | | | | | | | [feature/auto-loading] Add test case for phpbb_dir2 =>Igor Wiedler2010-08-312-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes/dir2/dir2.php PHPBB3-9682
* | | | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-08-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / / | | | | | | | | | | * develop-olympus: [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
| * | | | | | | | | Merge branch 'ticket/bantu/9793' into develop-olympusNils Adermann2010-08-301-0/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9793: [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
| | * | | | | | | | [ticket/9793] Make sure send_status_line() is defined when in avatar mode.Andreas Fischer2010-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When download/file.php is in avatar mode set_modified_headers() can be called, which then calls send_status_line() which is not available because includes/functions.php is not included in avatar mode. We also load includes/functions.php in the bootstrap now to solve this problem. Regression from c1a4cb1d01dc19650219566b60671abc767af662. PHPBB3-9793 PHPBB3-7782
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-08-2821-37/+57
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9117] Wrong redirection after login. [ticket/9772] Unify permissions for sending email when board_email_form is off [ticket/7369] CPF date should always render the users selection. [ticket/7296] Exporting styles to tar creates corrupted archives. [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
| * | | | | | | | | Merge branch 'ticket/rxu/9117' into develop-olympusAndreas Fischer2010-08-282-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9117: [ticket/9117] Wrong redirection after login.
| | * | | | | | | | | [ticket/9117] Wrong redirection after login.rxu2010-08-282-2/+2
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Go easy way for now - just place S_LOGIN_REDIRECT before S_HIDDEN_FIELDS so the last value override the previous one. PHPBB3-9117
| * | | | | | | | | Merge branch 'ticket/cs278/7369' into develop-olympusAndreas Fischer2010-08-281-2/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/7369: [ticket/7369] CPF date should always render the users selection.
| | * | | | | | | | | [ticket/7369] CPF date should always render the users selection.Chris Smith2010-08-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPF render code was incorrectly adding the users timezone offset instead of removing it to compensate for the addition made in user::format_date(). PHPBB3-7369
| * | | | | | | | | | Merge branch 'ticket/nickvergessen/7296' into develop-olympusAndreas Fischer2010-08-282-5/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7296: [ticket/7296] Exporting styles to tar creates corrupted archives.
| | * | | | | | | | | | [ticket/7296] Exporting styles to tar creates corrupted archives.Joas Schilling2010-08-222-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the folders to the archive before putting the files inside, seems to break the tar-archives. PHPBB3-7296
| * | | | | | | | | | | Merge branch 'ticket/nickvergessen/9519' into develop-olympusAndreas Fischer2010-08-2814-25/+43
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9519: [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
| | * | | | | | | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-192-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the ACM-Modules we need to check whether the function is loaded, before we use it, as this is not the case from download/file.php in avatar-mode. PHPBB3-9519
| | * | | | | | | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9519
| | * | | | | | | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes/functions_convert.php and install/install_convert.php tested by Dicky. PHPBB3-9519
| | * | | | | | | | | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-1010-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acm_memory.php is untested. install/install_convert.php and includes/functions_convert.php are going to be tested and committed afterwards. PHPBB3-9519
| * | | | | | | | | | | | Merge branch 'ticket/jellydoughnut/9772' into develop-olympusAndreas Fischer2010-08-283-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9772: [ticket/9772] Unify permissions for sending email when board_email_form is off
| | * | | | | | | | | | | [ticket/9772] Unify permissions for sending email when board_email_form is offJosh Woody2010-08-283-3/+3
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending email via memberlist.php was limited to users having u_sendemail. When board_email_form is disabled, no such requirement was enforced. This is now changed. PHPBB3-9772
* | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-08-222-2/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7260] Don't delete poll if one exists and editing user lacks permission [ticket/9646] Honor CSS comments in @import statements
| * | | | | | | | | | | Merge branch 'ticket/jellydoughnut/9646' into develop-olympusAndreas Fischer2010-08-221-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9646: [ticket/9646] Honor CSS comments in @import statements
| | * | | | | | | | | | [ticket/9646] Honor CSS comments in @import statementsJosh Woody2010-08-201-2/+10
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a basic CSS comment parser that allows comments to prevent loading an @import statement. For simplicity, only whitespace is allowed between /* and the @import. Also adjust regex to not parse improper quotation marks. PHPBB3-9646 PHPBB3-8169