aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-094-45/+77
| | | | | | Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path PHPBB3-11832
* [ticket/develop/11832] Fix path detectionVjacheslav Trushkin2013-09-091-1/+7
| | | | | | Clean up path, do not count first / PHPBB3-11832
* Merge pull request #1618 from VSEphpbb/ticket/11747Nathan Guse2013-09-058-1/+152
|\ | | | | [ticket/11747] UCP Prefs Core and Template Events
| * [ticket/11747] Tweak some of the wording in the events docMatt Friedman2013-07-271-8/+8
| | | | | | | | PHPBB3-11747
| * [ticket/11747] Use _prepend and _append for template eventsMatt Friedman2013-07-267-24/+24
| | | | | | | | PHPBB3-11747
| * [ticket/11747] ucp_prefs_post template eventsMatt Friedman2013-07-263-0/+18
| | | | | | | | PHPBB3-11747
| * [ticket/11747] ucp_prefs_post core eventsMatt Friedman2013-07-261-0/+25
| | | | | | | | PHPBB3-11747
| * [ticket/11747] ucp_prefs_view template eventsMatt Friedman2013-07-263-0/+40
| | | | | | | | PHPBB3-11747
| * [ticket/11747] ucp_prefs_view core eventsMatt Friedman2013-07-261-0/+25
| | | | | | | | PHPBB3-11747
| * [ticket/11747] ucp_prefs_personal template eventsMatt Friedman2013-07-263-0/+18
| | | | | | | | PHPBB3-11747
| * [ticket/11747] ucp_prefs_personal core eventsMatt Friedman2013-07-261-0/+25
| | | | | | | | PHPBB3-11747
| * [ticket/11747] Add $phpbb_dispatcher to globalMatt Friedman2013-07-261-1/+1
| | | | | | | | PHPBB3-11747
* | Merge pull request #1435 from cyberalien/ticket/11562Nathan Guse2013-09-051-121/+8
|\ \ | | | | | | forum_fn.js cleanup
| * | [ticket/11562] Use jQuery in subPanelsVjacheslav Trushkin2013-08-301-17/+3
| | | | | | | | | | | | PHPBB-11562
| * | [ticket/11562] Remove submit_default_button from forum_fnVjacheslav Trushkin2013-08-301-92/+0
| | | | | | | | | | | | | | | | | | | | | Remove submit_default_button() and related functions from forum_fn.js PHPBB3-11562
| * | [ticket/11562] Convert marklist() to jQueryVjacheslav Trushkin2013-08-301-12/+5
| | | | | | | | | | | | PHPBB3-11562
* | | Merge pull request #1695 from dhruvgoel92/ticket/11825Nathan Guse2013-09-053-2/+2
|\ \ \ | | | | | | | | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
| * | | [ticket/11825] Move schema_data.php into includes/ instead of phpbb/Dhruv2013-09-033-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11825
* | | | Merge pull request #1651 from cyberalien/ticket/11782Nathan Guse2013-09-057-43/+81
|\ \ \ \ | | | | | | | | | | Fix layout of notices in posts
| * | | | [ticket/11782] Apply line-height correctlyVjacheslav Trushkin2013-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply line-height only to bolded elements inside post notices that are direct child elements of forms. PHPBB3-11782
| * | | | [ticket/11782] RTL support for post noticesVjacheslav Trushkin2013-08-111-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11782
| * | | | [ticket/11782] Change p.rules to p.post-notice in CSSVjacheslav Trushkin2013-08-112-13/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-11782
| * | | | [ticket/11782] Change p.rules to p.post-notice in templatesVjacheslav Trushkin2013-08-114-30/+43
| | | | | | | | | | | | | | | | | | | | PHPBB3-11782
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-051-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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. Conflicts: build/build.xml phpBB/install/database_update.php
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-052-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [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. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | | | [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.Andreas Fischer2013-09-021-0/+3
| | | | | |
| | * | | | [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-023-3/+9
| | | | | |
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11791' into developDavid King2013-09-025-5/+5
|\ \ \ \ \ \
| * | | | | | [ticket/11791] Load adm/ events from styles/adm/event/Nathan Guse2013-09-025-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11791
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11818' into developDavid King2013-09-022-160/+349
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11818] Update Symfony dependencies to 2.3.*Nathan Guse2013-09-022-160/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11818
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11755' into developDavid King2013-09-024-2786/+1456
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11755] MySQL upgrader out of dateNathan Guse2013-09-024-2786/+1456
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | De-duplicating code from create_schema_files, mysql_upgrader. New file phpbb/db/schema_data which contains all the current schema data. New function in db_tools public static function get_dbms_type_map() to make the type map available everywhere (without requiring $db be setup already) PHPBB3-11755
* | | | | | | | Merge pull request #1102 from imkingdavid/ticket/11215Nathan Guse2013-09-026-34/+95
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11215] Correct paths when path info is used for controller access
| * | | | | | | | [ticket/11215] Remove unnecessary commentDavid King2013-09-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| * | | | | | | | [ticket/11215] Fix helper_url_test.php testsDavid King2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| * | | | | | | | [ticket/11215] Add newline back to .htaccess, fix wordingDavid King2013-09-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| * | | | | | | | [ticket/11215] Update comment in .htaccessDavid King2013-09-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| * | | | | | | | [ticket/11215] Uncomment rewrite rules in .htaccessDavid King2013-09-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we check to see if the rewrite module is available we don't have to comment the rewrite lines PHPBB3-11215
| * | | | | | | | [ticket/11215] Make controller helper url() method use correct formatDavid King2013-09-022-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| * | | | | | | | [ticket/11215] Add commented-out URL rewrite capability to .htaccessDavid King2013-09-022-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| * | | | | | | | Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-025-4/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
| * | | | | | | | Merge branch 'develop' into ticket/11215David King2013-08-31350-2426/+1904
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' into ticket/11215David King2013-07-141-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [ticket/11694] Do not locate assets with root path
| * \ \ \ \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-1311-38/+120
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [ticket/11675] Fix template loop [ticket/11690] Old module class names may get autoloaded by class_exists [ticket/9649] Display information on index for moderators on unapproved posts [ticket/11686] Not checking for phpBB Debug errors on functional tests [ticket/11553] Typo [ticket/11553] Replace bullet with unicode [ticket/11553] Move bulletin points to pseudo class [ticket/11600] Remove duplicate test case [ticket/11600] Use lowercase null and remove duplicate test cases [ticket/11600] Use local variable for $user in test_localize_errors [ŧicket/11600] Split get driver tests into tests for all and only enabled ones [ticket/11600] Increase code test coverage of avatar manager
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-13111-1580/+3615
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (214 commits) [ticket/10999] Fix assets_version in ACP [prep-release-3.0.12] More changelog items for the 3.0.12 release. [ticket/11687] Add assets_version to phpbb_config [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". [ticket/11674] Do not include vendor folder if there are no dependencies. [ticket/11685] Remove logout confirmation page [ticket/11684] Remove useless confirmation page after login and admin login [ticket/9657] Define user before injecting [ticket/9657] Remove old code [ticket/9657] Keep approval state of posts/topics when copying them [ticket/9657] Add functional tests for forking a copy [ticket/9657] Add functional test for splitting topic [ticket/11112] Do not change opensource.org link to https [ticket/9657] Add functional test for restoring a post/topic [ticket/11112] Use https for user-visible links to phpbb.com [ticket/9657] Fix a little error when moving softdeleted topics [ticket/9657] Add unit tests for softdeleting and moving posts/topics [ticket/9657] Remove last references to m_restore permission [ticket/9657] Fix english language :( [ticket/9657] Notifications do not require emails or jabber anymore ...
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into ticket/11215David King2013-07-132-14/+191
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [ticket/11647] Always use & for URLs [ticket/11647] Allow custom ports [ticket/11647] Use $config for assets_version [ticket/11647] Fix invalid variable name [ticket/11647] New assets handling [ticket/11647] Fix tests for INCLUDEJS
| * | | | | | | | | | | | [ticket/11215] Don't try to use when it isn't thereDavid King2013-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-112515
| * | | | | | | | | | | | Merge branch 'develop' into ticket/11215David King2013-07-1327-252/+577
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (53 commits) [ticket/11671] Update composer.lock [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps [ticket/11668] Move lint test to the end for travis [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred ...