aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-021-3/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | * github-vse/ticket/12254: [ticket/12254] Add subsilver2 support for cookie storage instead of SID [ticket/12254] Use a cookie instead of SID to store language selection [ticket/12254] No longer need to add change_lang to the URL params [ticket/12254] Use 'language' instead of 'set_lang' as the variable name [ticket/12254] Persist set_lang after reg only if changed from default [ticket/12254] Add set_lang var changes to subsilver2 files [ticket/12254] Use new set_lang var to avoid conflict with change_lang [ticket/12254] Stop using deprecated request_var in user class [ticket/12254] Better language switching on registration page
| * [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-021-6/+2
| | | | | | | | PHPBB3-12254
| * [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-111-3/+3
| | | | | | | | PHPBB3-12254
| * [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-071-3/+3
| | | | | | | | PHPBB3-12254
| * [ticket/12254] Stop using deprecated request_var in user classMatt Friedman2014-04-071-3/+3
| | | | | | | | PHPBB3-12254
| * [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-061-2/+16
| | | | | | | | PHPBB3-12254
* | [ticket/12475] Tabs, spaces, ...Nils Adermann2014-05-021-2/+2
| | | | | | | | PHPBB3-12475
* | [ticket/12475] Load extension migrations on cli updater tooNils Adermann2014-05-021-1/+2
| | | | | | | | PHPBB3-12475
* | Merge pull request #2381 from Nicofuma/ticket/12475Andreas Fischer2014-05-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12475] Undefined variable $log in db:migrate console command * Nicofuma/ticket/12475: [ticket/12475] Error in db:update console command
| * | [ticket/12475] Error in db:update console commandNicofuma2014-05-021-1/+1
| | | | | | | | | | | | PHPBB3-12475
* | | [ticket/12474] Error messages should be displayed with <error> tagNicofuma2014-05-021-1/+1
|/ / | | | | | | PHPBB3-12474
* | Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeusNils Adermann2014-05-021-0/+127
|\ \ | | | | | | | | | | | | | | | | | | * github-bantu/ticket/12473: [ticket/12473] Add console command for database migration. [ticket/12473] Add more compatibility to phpBB Console Application. [ticket/12473] Move compatibility globals out into its own file.
| * | [ticket/12473] Add console command for database migration.Andreas Fischer2014-05-021-0/+127
| | | | | | | | | | | | PHPBB3-12473
* | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into ↵Nils Adermann2014-05-023-115/+600
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/feature/sqlite3: [feature/sqlite3] Add sqlite3 database to .gitignore [feature/sqlite3] Use SQLite3 by default [feature/sqlite3] Remove invalid comment [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries [feature/sqlite3] Correctly recreate indexes when recreating a table [feature/sqlite3] Fix sql_index_drop() for sqlite3 [feature/sqlite3] Remove trailing comma from column list [feature/sqlite3] Update docblocks and function visibility [feature/sqlite3] Add support for SQLite 3
| * | | [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queriesJoas Schilling2014-05-021-4/+2
| | | | | | | | | | | | | | | | PHPBB3-9728
| * | | [feature/sqlite3] Correctly recreate indexes when recreating a tableJoas Schilling2014-05-021-82/+135
| | | | | | | | | | | | | | | | PHPBB3-9728
| * | | [feature/sqlite3] Fix sql_index_drop() for sqlite3Joas Schilling2014-05-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9728
| * | | [feature/sqlite3] Remove trailing comma from column listJoas Schilling2014-05-021-1/+6
| | | | | | | | | | | | | | | | PHPBB3-9728
| * | | [feature/sqlite3] Update docblocks and function visibilityPatrick Webster2014-05-021-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | Added missing docblock annotations and added visibility identifiers. PHPBB3-9728
| * | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-023-49/+453
| |/ / | | | | | | | | | | | | | | | | | | Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0 when support for SQLite 3 was added. PHPBB3-9728
* | | Merge remote-tracking branch 'github-prototech/ticket/11508' into ↵Nils Adermann2014-05-021-0/+116
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/11508: [ticket/11508] Fix build_url test. [ticket/11508] Add functional test for jumpbox. [ticket/11508] Use $phpbb_path_helper. [ticket/11508] Allow equal sign in parameter value. [ticket/11508] Remove unnecessary implode. [ticket/11508] Remove unnecessary isset check. [ticket/11508] Fix build_url test. [ticket/11508] Curly brace should be on its own line... [ticket/11508] The question mark is expected even if there are no parameters. [ticket/11508] Add tests. [ticket/11508] Do not add the '?' unless there are parameters. [ticket/11508] Change separator parameter to a simple true|false $is_amp. [ticket/11508] Move helper functions to path_helper class. [ticket/11508] Move the stripping param code to separate function as well. [ticket/11508] Build the jumpbox hidden fields using the _form action_ [ticket/11508] Split parts of build_url() into reusable functions.
| * | [ticket/11508] Allow equal sign in parameter value.Cesar G2014-04-221-4/+6
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Remove unnecessary implode.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Remove unnecessary isset check.Cesar G2014-04-221-4/+1
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Curly brace should be on its own line...Cesar G2014-04-221-1/+2
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Do not add the '?' unless there are parameters.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Change separator parameter to a simple true|false $is_amp.Cesar G2014-04-221-8/+9
| | | | | | | | | | | | PHPBB3-11508
| * | [ticket/11508] Move helper functions to path_helper class.Cesar G2014-04-221-0/+115
| | | | | | | | | | | | PHPBB3-11508
* | | Merge pull request #2336 from Nicofuma/ticket/12413Joas Schilling2014-05-025-39/+89
|\ \ \ | | | | | | | | [ticket/12413] Fatal Error log created for feed.php file
| * | | [ticket/12413] Move parent:open() call to the end of the functionNicofuma2014-05-022-4/+4
| | | | | | | | | | | | | | | | PHPBB3-12413
| * | | [ticket/12413] Fix coding styleNicofuma2014-05-023-4/+5
| | | | | | | | | | | | | | | | PHPBB3-12413
| * | | [ticket/12413] Fix: coding styleNicofuma2014-05-022-46/+10
| | | | | | | | | | | | | | | | PHPBB3-12413
| * | | [ticket/12413] Adding the missing visibilitiesNicofuma2014-05-021-9/+9
| | | | | | | | | | | | | | | | PHPBB3-12413
| * | | [ticket/12413] Fatal Error for feed.php?mode=forumsTristan Darricau2014-05-025-2/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12413 http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=45475 PHPBB3-12413
* | | | Merge branch 'exreaction/ticket/11881' into develop-ascraeusNils Adermann2014-05-021-10/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * exreaction/ticket/11881: [ticket/11881] Move convert_timezones_test to migrator [ticket/11881] Fix test filename [ticket/11881] Limit to 500 [ticket/11881] Make sure user_timezone isn't converted twice [ticket/11881] Better split the timezone conversion into chunks; add test [ticket/11881] Timezone migration can take a long time
| * | | | [ticket/11881] Limit to 500Nathan Guse2013-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11881
| * | | | [ticket/11881] Make sure user_timezone isn't converted twiceNathan Guse2013-10-041-1/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11881
| * | | | [ticket/11881] Better split the timezone conversion into chunks; add testNathan Guse2013-10-041-12/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-11881
| * | | | [ticket/11881] Timezone migration can take a long timeNathan2013-10-021-2/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-11881
* | | | | Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeusNils Adermann2014-05-021-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * github-marc1706/ticket/8960: [ticket/8960] Allow changing avatar path if it's not writable
| * | | | Merge branch 'ticket/8960-olympus' into ticket/8960Marc Alexander2014-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_board.php
* | | | | Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into ↵Nils Adermann2014-05-021-0/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-elsensee/ticket/stenudd/8558-2: [ticket/8558] Fix operator [ticket/8558] Fix field length in ACP [ticket/8558] Use only one variable and improve explain string [ticket/8558] Add config in migrations and schema_data [ticket/8558] Add display name in emails from board Conflicts: phpBB/includes/functions_messenger.php
| * | | | | [ticket/8558] Add config in migrations and schema_dataOliver Schramm2014-04-171-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into ↵Nils Adermann2014-05-026-9/+1156
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12273: (55 commits) [ticket/12273] Move $extension to constructor so the path is always set [ticket/12273] Find events.md relative from the path not the phpbb root [ticket/12273] Do not look in extensions docs/ and tests/ directory [ticket/12273] Also check file for adm "Location:" events [ticket/12273] Do not allow template events in non-html files [ticket/12273] Fix return description [ticket/12273] Update exporter to allow specifying an extension [ticket/12273] Allow to filter events for extensions [ticket/12273] Remove old parameter from function call [ticket/12273] Fix table header for adm events [ticket/12273] Add root path to recursive_event_filter_iterator [ticket/12273] Fix missing classes in export_events_for_wiki.php [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter [ticket/12273] Use RecursiveDirectoryIterator in md_exporter [ticket/12273] Fix doc blocks [ticket/12273] Do not allow 3.1-A1 for template events [ticket/12273] Sort arguments alphabetically before exporting [ticket/12273] Do not allow 3.1-A1 version [ticket/12273] Update since version to 3.1.0-a* style [ticket/12273] Update existing events ...
| * | | | | | [ticket/12273] Move $extension to constructor so the path is always setJoas Schilling2014-04-282-32/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Find events.md relative from the path not the phpbb rootJoas Schilling2014-04-281-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Do not look in extensions docs/ and tests/ directoryJoas Schilling2014-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Also check file for adm "Location:" eventsJoas Schilling2014-04-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Do not allow template events in non-html filesJoas Schilling2014-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Fix return descriptionJoas Schilling2014-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273