aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'noxwizard/ticket/11919' into prep-release-3.1.0-a1Joas Schilling2013-10-151-2/+2
|\ | | | | | | | | * noxwizard/ticket/11919: [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
| * [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()Patrick Webster2013-10-141-2/+2
| | | | | | | | PHPBB3-11919
* | [ticket/11918] Make sql_freeresult() consistent across all DB driversPatrick Webster2013-10-148-10/+11
|/ | | | PHPBB3-11918
* Merge pull request #1772 from bantu/feature/plupload/integrationNils Adermann2013-10-133-0/+407
|\ | | | | [ticket/10929] Integration of Plupload
| * [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-113-0/+407
| | | | | | | | | | | | | | | | This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929
* | Merge pull request #1582 from bantu/feature/plupload/cronNils Adermann2013-10-131-0/+124
|\ \ | | | | | | [ticket/10929] Cron Job for Plupload Upload Directory Cleaning
| * | [feature/plupload/cron] NamespacificationAndreas Fischer2013-10-111-6/+8
| | | | | | | | | | | | PHPBB3-10929
| * | [feature/plupload/cron] Add cronjob for cleaning plupload temporary directory.Andreas Fischer2013-10-111-0/+122
| |/ | | | | | | PHPBB3-10929
* | Merge pull request #1766 from bantu/ticket/11621David King2013-10-133-17/+52
|\ \ | | | | | | [ticket/11621] Improve MySQL fulltext search indexes
| * | [ticket/11621] Add explanation to mysql_fulltext_drop.Andreas Fischer2013-10-131-0/+8
| | | | | | | | | | | | PHPBB3-11621
| * | [ticket/11621] Correct GPLv2 link in file header.Andreas Fischer2013-10-111-1/+1
| | | | | | | | | | | | PHPBB3-11621
| * | [ticket/11621] Put mysql_fulltext_drop into alpha1 migration.Andreas Fischer2013-10-111-0/+1
| | | | | | | | | | | | PHPBB3-11621
| * | Merge remote-tracking branch 'phpbb/develop' into ticket/11621Andreas Fischer2013-10-113-7/+80
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: [ticket/11867] Schema files are not created by create_schema_files.php [ticket/11905] 3.1.0-a1 Migration [ticket/11903] Speed up paging test [ticket/11703] Extend the correct migration class. [ticket/11874] Correct when $phpbb_root_path is appended to build_url() [ticket/11703] Also use empty() for T_JQUERY_LINK. [ticket/11703] Add effectively_installed(). [ticket/11703] Make jQuery CDN switch more generic. [ticket/11874] Fix tests [ticket/11874] Do not always prepend the web path; only replace phpbb_root_path [ticket/11345] Don't include scheme, so HTTPS is used where necessary. [ticket/11345] Wrap remote webfonts in S_ALLOW_CDN. [ticket/11345] Move css import to template [ticket/11345] Add Droid Sans as fallback font [ticket/11345] Change font for buttons
| * | | [ticket/11621] Use effectively_installed() instead.Andreas Fischer2013-10-111-5/+6
| | | | | | | | | | | | | | | | PHPBB3-11621
| * | | [ticket/11621] Add migration dropping MySQL search indexes.Andreas Fischer2013-10-111-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | Possibly time-consuming index-regeneration will be left to the user. PHPBB3-11621
| * | | [ticket/11621] Remove unnecessary things around index_created() return value.Andreas Fischer2013-10-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11621
| * | | [ticket/11621] Swap columns of post_content index.Andreas Fischer2013-10-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11621
| * | | Merge remote-tracking branch 'phpbb/develop' into ticket/11621Andreas Fischer2013-10-10271-2706/+5125
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (542 commits) [ticket/11901] Pass empty string as relative_url for non-local magic URL. [ticket/11898] Correct adm_relative_path created by installer [ticket/11898] Correct admin S_LOGIN_ACTION [ticket/11892] Fix undefined variables: to_forum_id & to_topic_id [ticket/11890] Fix untranslated string when deleting posts through MCP. [ticket/11895] Fix undefined $forum_id [ticket/10383] Update the results without the overlay popup. [ticket/10383] Make the content transitions smoother. [ticket/10383] AJAXify poll voting [ticket/11888] Update default search backend in namespaces migration [ticket/11739] Rename “Remember Me” login keys module [ticket/11893] Remove unnecessary <fieldset> causing a large font size [ticket/11894] Fix typo in "Delete post" option [ticket/11888] Use \phpbb\search\fulltext_native as search backend config [ticket/11608] Mark failed test as incomplete for mysql search backend [ticket/11608] Update search backend class names to namespaces [ticket/11608] Move markIncomplete to search backends test [ticket/11608] Rename base search test class file [ticket/11608] Remove suffix test from base class [ticket/11608] Mark postgres search not found test as incomplete ...
| * | | | [ticket/11621] Remove mysql extra indexesDhruv2013-08-261-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove post_text index as post_content index is sufficient to search post text. PHPBB3-11621
* | | | | [ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception.Andreas Fischer2013-10-111-1/+3
| |_|_|/ |/| | | | | | | | | | | PHPBB3-11908
* | | | [ticket/11906] Fix namespace issues in prune_notificationsJoas Schilling2013-10-111-4/+6
| |_|/ |/| | | | | | | | PHPBB3-11906
* | | Merge pull request #1767 from EXreaction/ticket/11905Nils Adermann2013-10-101-0/+42
|\ \ \ | | | | | | | | [ticket/11905] 3.1.0-a1 Migration
| * | | [ticket/11905] 3.1.0-a1 MigrationNathan Guse2013-10-101-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a migration tips develop tool to help find the migration tree tips so they can be copied to versions released. With this, A1 is the only current tree tip (it depends on all other migrations). PHPBB3-11905
* | | | Merge pull request #1764 from EXreaction/ticket/11874Nils Adermann2013-10-101-7/+5
|\ \ \ \ | |/ / / |/| | | [ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
| * | | [ticket/11874] Do not always prepend the web path; only replace phpbb_root_pathNathan Guse2013-10-101-7/+5
| | |/ | |/| | | | | | | PHPBB3-11874
* | | [ticket/11703] Extend the correct migration class.Andreas Fischer2013-10-101-1/+1
| | | | | | | | | | | | PHPBB3-11703
* | | [ticket/11703] Add effectively_installed().Andreas Fischer2013-10-101-0/+5
| | | | | | | | | | | | PHPBB3-11703
* | | [ticket/11703] Make jQuery CDN switch more generic.Andreas Fischer2013-10-101-0/+28
|/ / | | | | | | | | | | | | Config variable: load_jquery_cdn -> allow_cdn Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN PHPBB3-11703
* | [ticket/11895] Fix undefined $forum_idNathaniel Guse2013-10-081-1/+1
| | | | | | | | PHPBB3-11895
* | Merge pull request #1753 from dhruvgoel92/ticket/11888Nathan Guse2013-10-071-1/+1
|\ \ | | | | | | [ticket/11888] Use \phpbb\search\fulltext_native as search backend config
| * | [ticket/11888] Update default search backend in namespaces migrationDhruv2013-10-061-1/+1
| | | | | | | | | | | | PHPBB3-11888
* | | [ticket/11885] Fix migrations errorNathan Guse2013-10-043-12/+18
| | | | | | | | | | | | PHPBB3-11885
* | | [ticket/11885] Use conditional in update_data()David King2013-10-043-6/+9
| | | | | | | | | | | | PHPBB3-11885
* | | [ticket/11885] Fix migration files for 3.0.12David King2013-10-043-3/+3
| | | | | | | | | | | | PHPBB3-11885
* | | [ticket/11885] Add migration files for 3.0.12-RC2 and RC3 and 3.0.12David King2013-10-043-0/+90
| | | | | | | | | | | | PHPBB3-11885
* | | Merge pull request #1742 from EXreaction/ticket/11840David King2013-10-041-7/+7
|\ \ \ | |/ / |/| | Ticket/11840 Refactor the extension metadata class
| * | [ticket/11840] Fix regexNathan Guse2013-09-301-1/+1
| | | | | | | | | | | | PHPBB3-11840
| * | [task/composer-compatibility] Minor changes that will break extension BCMichaelC2013-10-011-7/+7
| | | | | | | | | | | | PHPBB3-11840
* | | Merge remote-tracking branch 'EXreaction/ticket/11883' into developDhruv2013-10-041-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan (1) and Nathan Guse (1) # Via Nathan Guse * EXreaction/ticket/11883: [ticket/11883] Only output the migration time, not total [ticket/11883] Report completed data step in migration as "Installing Data"
| * | | [ticket/11883] Report completed data step in migration as "Installing Data"Nathan2013-10-021-0/+5
| | | | | | | | | | | | | | | | PHPBB3-11883
* | | | Merge pull request #1739 from nickvergessen/ticket/11871Nathan Guse2013-10-031-6/+1
|\ \ \ \ | | | | | | | | | | [ticket/11871] Allow backslash in classnames for Modules
| * | | | [ticket/11871] Allow backslash in classnames for ModulesJoas Schilling2013-09-271-6/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11871
* | | | | Merge pull request #1704 from dhruvgoel92/ticket/11344Nathan Guse2013-10-031-0/+42
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11344] Add migration to remove acp_style_components module in 3.1
| * | | | | [ticket/11344] Upgrade migration to namespacesDhruv2013-10-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11344
| * | | | | [ticket/11344] Fix url of licenseDhruv2013-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11344
| * | | | | [ticket/11344] Add migration to remove acp_style_components module in 3.1Dhruv2013-10-031-0/+40
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-11344
* | | | | Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-033-5/+5
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11786] Fix various defects in PHPDoc in-code documentation
| * \ \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-2379-1551/+3195
| |\ \ \ \ \
| * | | | | | [ticket/11786] Further improve wording in phpbb/notification/type/quote.phprechosen2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further improve wording in phpbb/notification/type/quote.php per suggestion of imkingdavid. PHPBB3-11786
| * | | | | | [ticket/11786] s/@return void/@return null in content_visibility.phprechosen2013-08-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file phpbb/content_visibility.php still contained a few instances of '@return void' in its PHPDoc blocks, fixed. Thanks to JoshyPHP for reporting. PHPBB3-11786