aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11836] Fix subsilver fatal errorJoseph Warner2013-09-131-1/+3
| | | | PHPBB3-11836
* [ticket/11836] Fix fatal error on unsupported provider for auth linkJoseph Warner2013-09-131-1/+3
| | | | PHPBB3-11836
* Merge pull request #1675 from marc1706/ticket/11809Nathan Guse2013-09-132-2/+2
|\ | | | | [ticket/11809] Ensure code.js is first script included after jQuery
| * [ticket/11809] Ensure code.js is first script included after jQueryMarc Alexander2013-09-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The file core.js sets up most of the AJAX and jQuery related framework for phpBB. Due to this, it needs to be included before any other javascript file in order to ensure that subsequent files can use the phpBB variables and functions. Currently, it is however loaded with INCLUDEJS in overall_footer which causes it to be loaded after every other javascript file except for the style specific ajax.js. This causes every javascript file that is included before core.js and is using the phpBB AJAX functions or variables to break. PHPBB3-11809
* | Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-137-19/+139
|\ \
| * | [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Revert changes in functions.phpDavid King2013-09-121-3/+3
| | | | | | | | | | | | | | | | | | These will be added in another PR PHPBB3-11824
| * | [ticket/11824] Reorganize test fileDavid King2013-09-121-18/+17
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Update language string for board settingsDavid King2013-09-121-1/+1
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Revert changes to functions_content.phpDavid King2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | These will be fixed in another PR PHPBB3-11824
| * | [ticket/11824] Add tests for urls with mod_rewrite enabledDavid King2013-09-061-3/+48
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Change copyright year in migration fileDavid King2013-09-061-1/+1
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Remove unused globalsDavid King2013-09-061-1/+1
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Fix smiliesDavid King2013-09-061-2/+2
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Fix logicDavid King2013-09-062-3/+3
| | | | | | | | | | | | PHPBB3-11824
| * | [ticket/11824] Add option for mod_rewriteDavid King2013-09-038-33/+109
| | | | | | | | | | | | PHPBB3-11824
* | | Merge pull request #1709 from rechosen/ticket/11843Nathan Guse2013-09-133-2/+8
|\ \ \ | | | | | | | | [ticket/11843] Make the twig lexer fix DEFINE variables with underscores again
| * | | [ticket/11843] Added newlines and included numbers in the DEFINE vars testrechosen2013-09-132-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per suggestion of nickvergessen, I added newlines in the DEFINE variables with underscores test. Now if the test fails, it's easier to spot which part is failing. Also added a test for DEFINE variables containing numbers. PHPBB3-11843
| * | | [ticket/11843] Add checking DEFINE variables with underscores to template_testrechosen2013-09-132-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent the underscore in DEFINE variables from being forgotten again, the template tests now test INCLUDEing a file based on the contents of a DEFINE variable with underscores in it. PHPBB3-11843
| * | | [ticket/11843] The twig lexer fixes DEFINE variables with underscores againrechosen2013-09-131-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/1708 accidentally stopped the twig lexer from fixing DEFINE variables with underscores in them. This commit restores that functionality. PHPBB3-11843
* | | Merge pull request #1622 from EXreaction/ticket/11373David King2013-09-125-2/+97
|\ \ \ | | | | | | | | [ticket/11373] Prune old read notifications with cron
| * \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-12263-5514/+7398
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (188) and others # Via Andreas Fischer (41) and others * 'develop' of github.com:phpbb/phpbb3: (435 commits) [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [feature/oauth] Fix tabindex [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [feature/oauth] Fix bug on ucp_auth_link related to error display ...
| * | | | [ticket/11373] Use inheritdocNathan Guse2013-08-281-13/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11373
| * | | | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-275-5/+110
| | | | | | | | | | | | | | | | | | | | PHPBB3-11373
* | | | | Merge pull request #1689 from EXreaction/ticket/11727David King2013-09-122-7/+165
|\ \ \ \ \ | |_|/ / / |/| | | | [ticket/11727] Mark style directories safe to load from
| * | | | [ticket/11727] Fix indentationNathan Guse2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11727
| * | | | [ticket/11727] Fix indentationNathan Guse2013-09-121-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11727
| * | | | [ticket/11727] Template loader support for safe directories to load files fromNathan Guse2013-09-022-7/+165
| | | | | | | | | | | | | | | | | | | | PHPBB3-11727
* | | | | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-127-35/+176
|\ \ \ \ \ | | | | | | | | | | | | Group join approved notification
| * | | | | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-122-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| * | | | | [ticket/11745] Add test for group request approvedNathan Guse2013-07-271-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| * | | | | Merge branch 'ticket/11744' of github.com:EXreaction/phpbb3 into ticket/11745Nathan Guse2013-07-273-168/+145
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'ticket/11744' of github.com:EXreaction/phpbb3: [ticket/11744] Helper function to assert notifications in base test
| * | | | | | [ticket/11745] Group request approved notificationNathan Guse2013-07-275-33/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
* | | | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-1214-295/+657
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11744] Group join request notification
| * \ \ \ \ \ \ Merge branch 'ticket/11744' of github.com:EXreaction/phpbb3 into ticket/11744Nathan Guse2013-07-283-168/+145
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * 'ticket/11744' of github.com:EXreaction/phpbb3: [ticket/11744] Helper function to assert notifications in base test
| | * | | | | | [ticket/11744] Helper function to assert notifications in base testNathan Guse2013-07-273-168/+145
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes tests PHPBB3-11744
| * | | | | | [ticket/11744] Cast to intNathan Guse2013-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | | [ticket/11744] InheritdocNathan Guse2013-07-281-54/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] CommentsNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] LanguageNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] Copyright yearNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] Fix tests for postgresqlNathaniel Guse2013-07-263-50/+31
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] spellingNathaniel Guse2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] Empty notifications tables after testing themNathaniel Guse2013-07-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] Tables are not truncated in some dbms during testsNathaniel Guse2013-07-262-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] Fix functional test case that's failingNathaniel Guse2013-07-261-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] Include onceNathaniel Guse2013-07-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] CleanupNathaniel Guse2013-07-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| * | | | | [ticket/11744] Group request testNathaniel Guse2013-07-262-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-21 17:33:49 +0000