aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11795] Move find user JS to forum_fnVjacheslav Trushkin2013-09-143-42/+48
| | | | | | Move JavaScript from user search results to forum_fn.js PHPBB3-11795
* [ticket/11795] Replace TWIG with phpBB syntax in ACPVjacheslav Trushkin2013-09-142-2/+2
| | | | PHPBB3-11795
* [ticket/11795] Move MSN scripts to forum_fn.jsVjacheslav Trushkin2013-09-142-71/+59
| | | | | | | Move MSN scripts to forum_fn.js Rewrite MSN scripts to remove duplicate code PHPBB3-11795
* [ticket/11795] Use phpBB template syntax instead of TWIGVjacheslav Trushkin2013-09-143-6/+4
| | | | PHPBB3-11795
* [ticket/11795] Move PM popup JS to forum_fn.jsVjacheslav Trushkin2013-09-144-14/+12
| | | | | | | Move PM popup JavaScript from overall_header to forum_fn.js Use TWIG to escape PM popup URL PHPBB3-11795
* [ticket/11795] Get rid of pagination JS variablesVjacheslav Trushkin2013-09-148-23/+24
| | | | | | | Move pagination variables to data attributes Replace A_BASE_URL with BASE_URL and use TWIG to escape it PHPBB3-11795
* [ticket/11795] Get rid of onload_functionsVjacheslav Trushkin2013-09-142-42/+0
| | | | | | | Get rid of onload_functions and onunload_functions Scripts should use $(document).ready() instead PHPBB-11795
* [ticket/11795] Use data-reset-on-edit attr to reset elementsVjacheslav Trushkin2013-09-143-30/+7
| | | | | | | | | | Use data-reset-on-edit attribute to reset other inputs when editing input with data. Do not unbind event (old code unbound it after one use for no reason) PHPBB3-11795
* [ticket/11795] Redo form elements auto-focusVjacheslav Trushkin2013-09-143-25/+12
| | | | | | | Use data-focus attribute for forms to focus elements when document is loaded instead of adding JavaScript PHPBB3-11795
* Merge pull request #1710 from Hardolaf/ticket/11837Nathan Guse2013-09-131-0/+1
|\ | | | | [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
| * [ticket/11837] Replace escaped single quote with utf-8 single quoteJoseph Warner2013-09-131-1/+1
| | | | | | | | PHPBB3-11837
| * [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTEDJoseph Warner2013-09-131-0/+1
| | | | | | | | PHPBB3-11837
* | Merge branch 'develop-olympus' into developNathan Guse2013-09-130-0/+0
|\ \ | | | | | | | | | * develop-olympus:
| * \ Merge remote-tracking branch 'remotes/cyberalien/ticket/11811' into ↵Nathan Guse2013-09-133-0/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/cyberalien/ticket/11811: [ticket/11811] Remove outline on :focus
* | \ \ Merge remote-tracking branch 'remotes/cyberalien/ticket/develop-2/11811' ↵Nathan Guse2013-09-133-0/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * remotes/cyberalien/ticket/develop-2/11811: [ticket/11811] Remove outline on :focus
| * \ \ \ Merge branch 'ticket/11811' into ticket/develop-2/11811Vjacheslav Trushkin2013-09-143-0/+23
| |\ \ \ \ |/ / / / / | | | _ / | | | / | | | | | | | | | | | | | | | | | | | | * ticket/11811: [ticket/11811] Remove outline on :focus Conflicts: phpBB/adm/style/admin.css phpBB/styles/prosilver/theme/forms.css
| * | | [ticket/11811] Remove outline on :focusVjacheslav Trushkin2013-09-133-0/+23
| |/ / | | | | | | | | | PHPBB3-11811
* | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-133-141/+280
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11831] getAttribute was replaced with attr [ticket/11831] Update fabpot/goutte to 1.0.* Conflicts: phpBB/composer.lock
| * | Merge pull request #1701 from EXreaction/ticket/11831David King2013-09-123-155/+299
| |\ \ | | | | | | | | Update fabpot/goutte
| | * | [ticket/11831] getAttribute was replaced with attrNathan2013-09-061-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11831
| | * | [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-062-154/+298
| | | | | | | | | | | | | | | | PHPBB3-11831
* | | | Merge pull request #1713 from Hardolaf/ticket/11836Nathan Guse2013-09-131-1/+3
|\ \ \ \ | | | | | | | | | | [ticket/11836] Fix subsilver version of the error
| * | | | [ticket/11836] Fix subsilver fatal errorJoseph Warner2013-09-131-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11836
* | | | | Merge pull request #1711 from Hardolaf/ticket/11836Nathan Guse2013-09-131-1/+3
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | [ticket/11836] Fix fatal error on unsupported provider for auth link
| * | | [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