aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-101-10/+12
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | | | [ticket/11103] Set basic notifications to be enabled by defaultNathan Guse2012-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, if there is no row for the user in the user_notifications table, the user will receive basic notifications. If the user wishes to not receive notifications, a row must be added with notify = 0. For other methods besides the basic (e.g. email, jabber) a row must still be added with notify = 1 for them to receive notifications PHPBB3-11103
| * | | | | | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is going to require you recreate the db tables. PHPBB3-11103
| * | | | | | | [ticket/11103] Change is_disabled to is_enabledNathan Guse2012-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you're following along and would like to update your DB, you can run the following queries to do so: ALTER TABLE phpbb_notifications CHANGE `is_disabled` `is_enabled` TINYINT( 1 ) NOT NULL DEFAULT '1'; UPDATE `phpbb_notifications` SET is_enabled = 1; PHPBB3-11103
| * | | | | | | [ticket/11103] Add is_disabled column to notifications tableNathan Guse2012-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications from extensions! Set is_disabled to 1 for all your notifications when your extension is disabled so they are ignored and do not cause errors. When your extension is enabled again, set is_disabled to 0 and your notifications will be working again. PHPBB3-11103
| * | | | | | | [ticket/11103] Display all unread notifications by defaultNathan Guse2012-09-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unread count to the page title PHPBB3-11103
| * | | | | | | [ticket/11103] Store the item's parent id for marking things readNathan Guse2012-09-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark topics/posts read from the markread() function. Identify unread items by a grey background in the header (for now) PHPBB3-11103
| * | | | | | | [ticket/11103] Fixing some db columns that were of the incorrect typeNathan Guse2012-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | | [ticket/11103] Add tables to the database updater and installerNathan Guse2012-09-081-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-12-204-4/+4
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission-rebase * 'develop' of https://github.com/phpbb/phpbb3: (544 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [ticket/11285] Use more granularity in dependency checks in compress test [ticket/10880] The m_approve permisson no longer implies f_noapprove. [ticket/10803] Show failure message until user dismisses it [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [ticket/10954] Miscellaneous coding fixes [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [ticket/10763] Use self when calling get_extension() in filespec class [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events ... Conflicts: phpBB/install/database_update.php phpBB/posting.php
| * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-294-4/+4
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | * develop-olympus: [ticket/11227] @return void -> @return null in develop-olympus.
| | * | | | | [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-294-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11227
* | | | | | | Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-101-10/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-merge-develop # By Oleg Pudeyev (45) and others # Via Oleg Pudeyev (42) and others * remotes/phpbb/develop: (289 commits) [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. [ticket/11050] make all properties protected in all search backends [ticket/11050] get_common_words() returns empty array for sphinx [ticket/11050] fix tidied search query docblock language [ticket/11050] fix min/max length docblock language [ticket/11050] multi sentences separated by period in docblocks [ticket/11050] fix separated spelling in docblock [ticket/11050] fix split words doc block language [ticket/11050] remove class word from docblocks ... Conflicts: phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/language/en/acp/permissions_phpbb.php phpBB/styles/prosilver/template/posting_editor.html
| * | | | | | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-061-10/+12
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10845: [ticket/10845] Removed one empty line that wasn't supposed to be there [ticket/10845] Two of the three colouns were missing in the DB update file [ticket/10845] Remove censor from text [ticket/10845] Now it shows the preview post parsed [ticket/10845] Changed the report system. Now it saves posts with the bbcode Conflicts: phpBB/includes/functions_content.php
| | * | | | | [ticket/10845] Changed the report system. Now it saves posts with the bbcodeBruno Ais2012-05-011-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the bitfield and uid of the bbcode is saved in the reports table. This will allow parsing the BBCode while loading the post to show PHPBB3-10845
* | | | | | | [feature/soft-delete] Fix the rest of *_approved and the delete_post unit testJoas Schilling2012-11-102-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | [feature/soft-delete] Append _approved to *_posts and *_topics column namesJoas Schilling2012-11-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | [feature/soft-delete] Fix sync() and some more functions to use the new fieldsJoas Schilling2012-10-221-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | [feature/soft-delete] Add new fields for topic/post counts for softdeleteJoas Schilling2012-10-211-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can not use the replies vs replies_real anymore, as we need to be able to determinate whether the posts are unapproved or softdeleted. So we need to add a new field and there by change the second one for consistency. We also add the posts_* fields for forums, which are a missing feature. PHPBB3-9567
* | | | | | | [feature/soft-delete] Add columns for soft delete detailsJoas Schilling2012-09-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | | [feature/soft-delete] Update development scripts with new column namesJoas Schilling2012-08-303-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | | [feature/soft-delete] Lay the groundwork for a soft-delete featureJosh Woody2012-08-292-10/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, I've added no new functionality. The biggest change here is adjusting the DB column names to "visibility" rather than "approved". Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :) PHPBB3-9657
* | | | | | [ticket/11052] update search backend constructor everywhereDhruv2012-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11052
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value Conflicts: phpBB/includes/acp/acp_profile.php
| * | | | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value
| | * | | | [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
* | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature/new-tz-handling
| * \ \ \ \ \ Merge branch 'develop-olympus' into developAndreas Fischer2012-06-281-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | | * develop-olympus: [ticket/10850] Changed the fopen mode to wb
| | * | | | [ticket/10850] Changed the fopen mode to wbBruno Ais2012-06-281-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the fopen mode from "wt" to "wb" as requested in the PR. The objective behind this is to prevent writting stuff like "\r\r\n" in windows PHPBB3-10850
* | | | | [feature/new-tz-handling] Remove appearances of board_dst and user_dstJoas Schilling2012-06-182-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
* | | | | Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into ↵Joas Schilling2012-06-041-2/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/new-tz-handling Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
| * | | | [feature/new-tz-handling] Modify database schemas.Chris Smith2012-03-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Dropped the user_dst column which is no longer required. - Modified the user_timezone column to take a string, max length 100. PHPBB3-9558
* | | | | Merge PR #799 branch 'develop-olympus' into developOleg Pudeyev2012-05-109-94/+53
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/10881] Replace old (and unify) file headers in develop files.
| * | | | [ticket/10881] Replace old (and unify) file headers in develop files.Andreas Fischer2012-05-109-94/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This especially also fixes the problem of the copyright symbol being represented using 0xA9, which is neither ASCII nor the appropriate UTF8 byte sequence for the copyright symbol. PHPBB3-10881
* | | | | [ticket/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-302-2/+2
| |_|/ / |/| | | | | | | | | | | PHPBB3-10847
* | | | [ticket/10785] Fixed illegal use of $_REQUEST in develop/fill.php.Callum Macrae2012-04-111-2/+2
| |_|/ |/| | | | | | | | PHPBB3-10785
* | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pull request (#654) was merged a little too quickly. In particular, display_last_subject per-forum option needs consensus. This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59. PHPBB3-10650
* | | [ticket/10650] Displaying last topic on forum listRahul2012-04-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The most recent topic title of the forum can now be displayed on the board index. An option is provided in the ACP under the 'General Forum Setting' which allows the admin to enable or disable this feature. PHPBB3-10650
* | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-293-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/merging-style-components * upstream/develop: (65 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10723] Stop Travis running all tests on sqlite [ticket/10703] Added a condition to check if ext directory exists [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information ... Conflicts: phpBB/install/database_update.php
| * \ \ Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into developOleg Pudeyev2012-03-271-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/feature/save-post-on-report: [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic [feature/save-post-on-report] bbcode_nl2br missing. [feature/save-post-on-report] Change the column type of reported text [feature/save-post-on-report] Changed the name of the column [feature/save-post-on-report] Bug fix table name [feature/save-post-on-report] Saves the post reported when a report is creat [feature/save-post-on-report] The complete changes for this feature
| | * | | [feature/save-post-on-report] Changed the name of the columnBruno Ais2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name of the column was changed from reported_post AND reported_text to reported_post_text. This change was made by request PHPBB3-10600
| | * | | [feature/save-post-on-report] Saves the post reported when a report is creatBruno Ais2012-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A problem when creating a report is that the report may be made and then the post changed. After the changes, if the report is seen the message it shows may not be correct to be reported. With these changes, when a report is created the system copies the post that was reported and shows it in the report details in the MCP PHPBB3-10600
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into developAndreas Fischer2012-03-251-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10703: [ticket/10703] Added a condition to check if ext directory exists
| | * | | | [ticket/10703] Added a condition to check if ext directory existsDhruv Goel2012-03-231-1/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existence of ext directory is checked, if not present a proper error message that file doesn't exist is printed out. No Fatal Error messages. PHPBB3-10703
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-191-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | * develop-olympus: [ticket/10691] Fixed the speed of creating search index
| | * | [ticket/10691] Fixed the speed of creating search indexDhruv Goel2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | $time is now initialized after each batch iteration. Speed for each batch iteration of creating search index is fixed. PHPBB3-10691
* | | | [feature/merging-style-components] Updating database and acp modulesVjacheslav Trushkin2012-03-142-84/+8
|/ / / | | | | | | | | | | | | | | | Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater PHPBB3-10632
* | | Merge remote-tracking branch 'cyberalien/ticket/10378' into developIgor Wiedler2012-02-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10378: [ticket/10378] Missing entries from imageset to css conversion [ticket/10378] Imageset to css convertor typo
| * | | [ticket/10378] Imageset to css convertor typoVjacheslav Trushkin2012-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Imageset to css convertor typo PHPBB3-10378
* | | | Merge branch 'develop' into ticket/10380Igor Wiedler2012-02-172-1/+124
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [ticket/10652] Fixing typo in template class [ticket/10645] Missing CSS for checkboxes [ticket/10614] Change not installed heading to available. [ticket/10614] Unbreak all_available on extension manager. [ticket/10614] Check if cache exists before destroying it [ticket/10614] Remove ext manager exceptions for now [ticket/10614] Refactor list command to use manager API [ticket/10614] Add purge command [ticket/10614] Tweak list output, show state, purge cache, handle missing exts [ticket/10614] Make script accessible from anywhere [ticket/10614] Better usage output [ticket/10614] Add a script to enable, disable and view status of extensions. [ticket/10500] Use correct class name in @uses. [ticket/10500] Fix phpbb_template_compile instantiation.
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-07 18:08:18 +0000