aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2010-05-161-2/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. ...
| * Merge branch 'ticket/aptx/9525' into develop-olympusNils Adermann2010-05-161-2/+3
| |\ | | | | | | | | | | | | * ticket/aptx/9525: [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
| | * [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting ↵Marek A. Ruszczyński2010-05-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | with :: :: can replace 1 or more groups (not 2 or more) PHPBB3-9524
* | | Merge branch 'develop-olympus' into developNils Adermann2010-03-061-1/+1
|\ \ \ | |/ /
| * | Merge branch 'master' into develop-olympusNils Adermann2010-03-061-1/+1
| |\ \ | | |/ | |/|
| | * exclude the image file with text in the name from having newlines fixedNils Adermann2010-03-051-1/+1
| | |
* | | Merge branch 'develop-olympus' into developNils Adermann2010-03-034-6/+14
|\ \ \ | |/ / | | | | | | | | | I simply used the develop-olympus version of all files that conflicted. Afterall there should not have been anything new in develop yet.
| * | Updating the create_schema_files.php file to reflect the minor mssql schema ↵Nils Adermann2010-02-271-2/+4
| |/ | | | | | | | | | | 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
| * fix_files script must have been broken by svn:eol-style quite a while ago, ↵Nils Adermann2010-01-311-3/+3
| | | | | | | | | | | | 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
| * Bug #56545 - Speed up topic move operation by adding an index for topic_id ↵Andreas Fischer2010-01-282-0/+2
| | | | | | | | | | | | on the topics track table. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10462 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Revert r9564, Fix #54445, Related to #44665.Andreas Fischer2010-01-252-2/+0
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10445 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Just a little reminder for when we decide to update the confusables one dayNils Adermann2009-12-231-1/+5
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10365 89ea8834-ac86-4346-8a33-228a782c2dd0
| * update mysql_upgrader to latest schemaMeik Sievertsen2009-10-111-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10219 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-|Andreas Fischer2009-09-041-1/+0
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10107 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Add INDEX on user_regdate because this is the default ORDER BY in ↵Andreas Fischer2009-09-041-0/+1
| | | | | | | | | | | | memberlist.php - thanks nickvergessen. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10106 89ea8834-ac86-4346-8a33-228a782c2dd0
| * script to update email hashes (they are not strings btw, but BINT)Meik Sievertsen2009-08-301-0/+57
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10063 89ea8834-ac86-4346-8a33-228a782c2dd0
| * ok, i am very sorry, but this needs to be fixed.Meik Sievertsen2009-08-122-0/+2
| | | | | | | | | | | | | | | | | | 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
| * fix r9713 for #36565Joas Schilling2009-08-051-0/+1
| | | | | | | | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9931 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Fix Bug #46285 (drop index patch by Paul) - i hope the re-addition of the ↵Meik Sievertsen2009-08-051-1/+19
| | | | | | | | | | | | | | | | 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
| * update mysql_upgraderMeik Sievertsen2009-08-051-0/+9
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9925 89ea8834-ac86-4346-8a33-228a782c2dd0
| * #48985Henry Sudhof2009-08-031-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9916 89ea8834-ac86-4346-8a33-228a782c2dd0
| * [Feature] Added new functionality to inactive users module:Meik Sievertsen2009-07-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | - 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
| * Users can report PMs to moderators which are then visible in a new MCP moduleNils Adermann2009-07-211-0/+6
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Addition to r9696 - update develop/ scriptsRuslan Uzdenov2009-06-272-2/+2
| | | | | | | | | | | | Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9697 89ea8834-ac86-4346-8a33-228a782c2dd0
| * update mysql upgrader to 3.0.6-devMeik Sievertsen2009-06-231-1/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9657 89ea8834-ac86-4346-8a33-228a782c2dd0
| * - [Feature] New "Newly Registered Users" group for assigning ↵Meik Sievertsen2009-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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 "Newly Registered Users" 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
| * Make captchas stricter by oly having one entry per session; fix a bug in ↵Henry Sudhof2009-06-191-0/+1
| | | | | | | | | | | | 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
| * - Display coloured usernames in ACP groups management screensMeik Sievertsen2009-06-191-0/+1
| | | | | | | | | | | | | | | | - 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
| * Fix bug #44665 - Add index on log_time to the log table to prevent slowdown ↵Andreas Fischer2009-06-082-0/+2
| | | | | | | | | | | | | | | | 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
| * bring mysql upgrader up-to-date with 3.0.5-dev Meik Sievertsen2009-04-281-1/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9493 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Fix duplicate creation of acl options in acl_add_options() under certain ↵Meik Sievertsen2009-03-201-1/+1
| | | | | | | | | | | | | | | | | | conditions. (Bug #38385, #40225) Add unique key to ACL options table to prevent duplicate permission options. (Bug #41835) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9400 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Small fix up should work now when ran from anywhere :)Chris Smith2009-02-071-1/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9314 89ea8834-ac86-4346-8a33-228a782c2dd0
| * curtesty of toonarmy :) (shows cached sql queries to determine useless sql ↵Meik Sievertsen2009-02-061-0/+2
| | | | | | | | | | | | caches) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9313 89ea8834-ac86-4346-8a33-228a782c2dd0
| * extend the style columns (style_id, template_id, imageset_id, image_id...)Meik Sievertsen2008-11-272-24/+24
| | | | | | | | | | | | No, not only because of possible style demos. :o git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9129 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Better handling and finer control for custom profile fields visibility ↵Meik Sievertsen2008-11-262-4/+6
| | | | | | | | | | | | options. (Patch by Highway of Life) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9127 89ea8834-ac86-4346-8a33-228a782c2dd0
| * - Added 'max_recipients' setting for private messages. This setting allows ↵Meik Sievertsen2008-09-232-0/+2
| | | | | | | | | | | | | | | | | | admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting. - Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8911 89ea8834-ac86-4346-8a33-228a782c2dd0
| * weird - schemas laterHenry Sudhof2008-07-291-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8730 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Schema changesHenry Sudhof2008-07-291-0/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8719 89ea8834-ac86-4346-8a33-228a782c2dd0
| * update upgrader schema to 3.0.2Meik Sievertsen2008-07-291-8/+11
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8718 89ea8834-ac86-4346-8a33-228a782c2dd0
| * change subject/title column lengthMeik Sievertsen2008-06-211-8/+8
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8666 89ea8834-ac86-4346-8a33-228a782c2dd0
| * removed executable props [Bug #6464]Nils Adermann2008-06-043-0/+0
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8598 89ea8834-ac86-4346-8a33-228a782c2dd0
| * This should get rid of the filesorts and temp tables on index (with topic ↵Henry Sudhof2008-03-171-1/+3
| | | | | | | | | | | | | | | | | | | | read tracking as exception). Updater still needs testing. Not yet merged to 3.1 #22715 - thanks HoL git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8436 89ea8834-ac86-4346-8a33-228a782c2dd0
| * merging r8373 into 3.0 branch: adding a new option to hide the entire list ↵Nils Adermann2008-02-031-0/+1
| | | | | | | | | | | | of subforums on listforums git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8374 89ea8834-ac86-4346-8a33-228a782c2dd0
* | merge changes from 3.0.x branchMeik Sievertsen2009-12-161-0/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Copy 3.0.x branch to trunkMeik Sievertsen2009-10-0430-0/+8510
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Move trunk/phpBB to old_trunk/phpBB Meik Sievertsen2009-10-0413-2808/+0
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
* | create place for any external or modified libraries (i do not want to have ↵Meik Sievertsen2009-06-071-0/+33
| | | | | | | | | | | | | | | | 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
* | Merge most changes from 3.0.x branch since the 25th december.Meik Sievertsen2009-03-221-0/+3
| | | | | | | | | | | | (Captcha changes for refreshing captcha image not included) git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
* | $db-> to phpbb::$db->Meik Sievertsen2009-02-223-130/+129
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@9336 89ea8834-ac86-4346-8a33-228a782c2dd0
* | $auth-> to phpbb::$acl->Meik Sievertsen2009-02-222-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@9335 89ea8834-ac86-4346-8a33-228a782c2dd0