1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 13:46:33 +02:00
Commit Graph

252 Commits

Author SHA1 Message Date
448df1cdf5 Merge branch 'ticket/9549' into develop
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
2011-03-01 16:57:00 -05:00
76ad7c938d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
2011-02-24 23:45:55 +01:00
c4b3d3a089 [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
Since knowledge base instructions tell users to place this script
in the root of the forum, use './' as phpbb root path. Actual
initialization code copied from check_flash_bbcodes.php.

PHPBB3-10058
2011-02-24 17:31:44 -05:00
ba41e45f84 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7778] Update all the schema files
  [ticket/7778] Add the column change to `mysql_upgrader.php`
  [ticket/7778] BBCode single limit

Conflicts:
	phpBB/install/database_update.php
2011-02-23 22:03:42 -05:00
1b88f5a316 [ticket/7778] Add the column change to mysql_upgrader.php
PHPBB3-7778
2011-02-23 21:15:40 -05:00
a7bc76d246 [ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.

Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes

PHPBB3-7778
2011-02-23 21:15:40 -05:00
023a102082 [ticket/9549] Update database with the new config values and columns
PHPBB3-9549
2011-02-16 18:21:47 +01:00
cde423591e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9859] Remove the years from the copyright statements in docs files.
  [ticket/9859] Remove the year from the copyright meta tag in docs/*.html
  [ticket/9859] Remove the meta copyright tag as well.
  [ticket/9859] Remove the credit line comment from all html files.
  [ticket/9859] Remove years in credit line from some more files.
2011-01-16 22:26:27 +01:00
2a703b4055 [ticket/9859] Remove years in credit line from some more files.
Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group

Print output now includes:
Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/

This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".

PHPBB3-9859
2011-01-16 17:53:30 +01:00
adfa1656fb Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php
2010-12-13 16:35:55 +01:00
67593824d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog
  [ticket/9903] Script for detecting potentially malicious flash bbcodes
  [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.
  [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
2010-11-20 17:56:17 +01:00
49b639dd95 [ticket/9903] Script for detecting potentially malicious flash bbcodes
PHPBB3-9903
2010-11-19 11:31:00 +01:00
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
2e787fa836 Merge branch 'develop-olympus' into develop
* develop-olympus: (57 commits)
  Revert "[ticket/7716] Data too long for column 'message_subject'"
  [ticket/7716] Data too long for column 'message_subject'
  [ticket/9780] Adding unit tests for gen_rand_string().
  [ticket/9780] Add length check back to gen_rand_string().
  [ticket/7972] Copying topics in the MCP now indexes the new topic.
  [ticket/9782] Board disable radio set on when server load high
  [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
  [ticket/9104] Safari does not display box headers correctly in the ACP.
  [ticket/9777] Print error message in pre-commit hook when php is not installed.
  [ticket/7716] Data too long for column 'message_subject'
  [task/git-tools] Ignore git commit message comments
  [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
  [task/git-tools] Vastly expanded commit-msg hook.
  [task/git-tools] Beginnings of a syntax checking hook.
  [task/git-tools] Append ticket identifier to commit message prior to editing.
  [ticket/7332] Redirect users back to post details when performing actions.
  [ticket/7332] Collapse post details content down to a maximum of 300px heigh
  [ticket/9771] Remove query string parameters that have no name.
  [ticket/9760] Remove unrestricted wildcards from search terms.
  [ticket/9599] Reimplement phpbb_checkdnsrr() function.
  ...

Conflicts:
	tests/template/template.php
2010-08-21 23:35:43 +02:00
38cc9ce72f [task/set-permissions] shell script to set file permissions
PHPBB3-9689
2010-06-28 18:12:56 +02:00
591217a903 Merge branch 'develop-olympus' into develop
* develop-olympus: (21 commits)
  [feature/notify_status] Define'd constants for notify_status
  [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
  [ticket/9547] Use separate constants for display/enable active topics.
  [ticket/9535] Also fix the margin in the install_update.html
  [ticket/9535] Fix some more rtl margin issues.
  [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
  [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9545] Initial forum should display active topics by default.
  [ticket/9546] Also delete bookmarks, when a topic is deleted.
  [ticket/9529] Topic review is not showing all selected posts.
  [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
  [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
  [ticket/9119] Respect language selection on automated update.
  [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
  [ticket/9567] Newly registered users group description rewording.
  ...
2010-05-16 19:52:36 +02:00
273d926b08 Merge branch 'ticket/aptx/9525' into develop-olympus
* ticket/aptx/9525:
  [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
2010-05-16 18:38:28 +02:00
1d2b4ffc65 [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
:: can replace 1 or more groups (not 2 or more)

PHPBB3-9524
2010-05-16 18:36:21 +02:00
797a9ed28c Merge branch 'develop-olympus' into develop 2010-03-06 03:33:16 +01:00
568fb83373 Merge branch 'master' into develop-olympus 2010-03-06 02:29:04 +01:00
2e1cd98a5a exclude the image file with text in the name from having newlines fixed 2010-03-05 22:22:39 +01:00
693a2dc99b Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
2010-03-03 23:32:09 +01:00
bba33ead30 Updating the create_schema_files.php file to reflect the minor mssql schema change introduced in r10489 (implementing mssql native driver support - Bug #57055)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10548 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-27 18:04:32 +00:00
926d0f980e fix_files script must have been broken by svn:eol-style quite a while ago, now uses tr rather than sed to replace carriage returns
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10464 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-31 21:50:10 +00:00
2906a24122 Bug #56545 - Speed up topic move operation by adding an index for topic_id on the topics track table.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10462 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-28 23:15:25 +00:00
5306a586b1 Revert r9564, Fix #54445, Related to #44665.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10445 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 18:42:04 +00:00
42c5be5dac Just a little reminder for when we decide to update the confusables one day
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10365 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 01:31:19 +00:00
b68de2323d merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-16 15:48:23 +00:00
ae88f95808 update mysql_upgrader to latest schema
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10219 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-11 09:56:11 +00:00
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
fc5a21e16a Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-|
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10107 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 17:27:13 +00:00
0fe74ebcea Add INDEX on user_regdate because this is the default ORDER BY in memberlist.php - thanks nickvergessen.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10106 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 15:44:10 +00:00
36b8b94ea6 script to update email hashes (they are not strings btw, but BINT)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10063 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-30 11:10:12 +00:00
09ad10a734 ok, i am very sorry, but this needs to be fixed.
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 15:00:47 +00:00
ee65d2147b fix r9713 for #36565
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9931 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-05 15:28:46 +00:00
d0e9e4189c Fix Bug #46285 (drop index patch by Paul) - i hope the re-addition of the FULLTEXT index works. :o
If someone wants to try? :)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9930 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-05 14:50:39 +00:00
58c0bd804f update mysql_upgrader
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9925 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-05 12:47:56 +00:00
1f871950d8 #48985
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9916 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-03 15:46:56 +00:00
4739c7ba39 [Feature] Added new functionality to inactive users module:
- Ability to set users per page.
- Ability to sort by posts/number of reminders/last reminded date.
- Show number of posts and ability to search posts.
- Show number of reminders sent to user.
- Show date of last reminder sent to user.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9845 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-24 11:13:32 +00:00
6e4a7c03d1 Users can report PMs to moderators which are then visible in a new MCP module
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 20:59:11 +00:00
4bef644a94 Addition to r9696 - update develop/ scripts
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9697 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-27 09:34:55 +00:00
762f87b8ad update mysql upgrader to 3.0.6-dev
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9657 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-23 10:58:44 +00:00
433de350c0 - [Feature] New &quot;Newly Registered Users&quot; group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts.
- [Feature] Ability to define if the &quot;Newly Registered Users&quot; group will be assigned as the default group to newly registered users.

As a coincidence also Bug #46535 got fixed.
Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-20 18:45:16 +00:00
5d9cf2aa41 Make captchas stricter by oly having one entry per session; fix a bug in ucp_register that caused three captcha instances to be generated. Non-MySQL databases and garbage collecting needs extensive testing.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9626 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 12:31:28 +00:00
d7d96223e7 - Display coloured usernames in ACP groups management screens
- Changed behaviour of group_create() function to support specifying additional group columns
- New groups option to excempt group leaders from group permissions


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 09:51:50 +00:00
9f21f1ab5e Fix bug #44665 - Add index on log_time to the log table to prevent slowdown on boards with many log entries.
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9564 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-08 12:36:26 +00:00
56122028f0 create place for any external or modified libraries (i do not want to have them scattered all over the place).
Also document the initial file structure ;)

git-svn-id: file:///svn/phpbb/trunk@9555 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-07 17:59:31 +00:00
dc1e334d07 bring mysql upgrader up-to-date with 3.0.5-dev
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9493 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-28 14:14:32 +00:00
4cbf6bc703 Merge most changes from 3.0.x branch since the 25th december.
(Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-22 16:34:26 +00:00