aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | [ticket/11415] Create function in finder find_from_extensionNathan Guse2013-05-102-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | | | [ticket/11415] Make migrator/ext.manager dependencies of the base ext classNathaniel Guse2013-05-012-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | | | [ticket/11415] Remove migrator dependency from extension managerNathaniel Guse2013-05-012-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | | | [ticket/11415] Move migrator to base extension class from ext.managerNathaniel Guse2013-05-012-75/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11415
| * | | | | | [ticket/11415] Move while loop from ext manager to acp_extensions.phpNathaniel Guse2013-05-012-27/+28
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now enable_step works as it's supposed to (do one step at a time) and less refreshes are required for the user. PHPBB3-11415
* | | | | | Merge remote-tracking branch 'remotes/blitze/ticket/11458' into developNathaniel Guse2013-05-181-25/+16
|\ \ \ \ \ \
| * | | | | | [ticket/11458] Use finder to get all permission language filesOpenShift guest2013-05-101-35/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11458
| * | | | | | [ticket/11458] We still auto add language files from the mods and acpOpenShift guest2013-04-131-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders in the language directory, so we revert some changes here PHPBB3-11458
| * | | | | | [ticket/11458] Search for permission language files in extensionsOpenShift guest2013-03-251-24/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extensions that add new permission masks only need to add a permission file in the language folder of the extension. The file must start with 'permissions_' eg 'permissions_blog.php'. The permission language file will be automatically included when viewing/setting permissions. PHPBB3-11458
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-161-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11536] Fixed incorrect removal of "install" in script_path
| * | | | | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into ↵Andreas Fischer2013-05-161-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/11536: [ticket/11536] Fixed incorrect removal of "install" in script_path
| | * | | | | | [ticket/11536] Fixed incorrect removal of "install" in script_pathVictor Nagy2013-05-151-2/+2
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier the script would incorrectly remove the word "install" from the script_path when trying to remove the last folder in the path named "/install". This would lead to issues when the path you are installing phpBB contained "install". For example "/install_test/install" would become "/_test". This change gets the parent folder instead of replacing all "install". $name contains /install_test/install/index.php from start and running dirname() gives /install_test/install. Running dirname once more gives the parent folder of install, /install_test. PHPBB3-11536
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
| * | | | | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The given path is an absolute path in general, just not on our current system. PHPBB3-11545
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | * develop-olympus: [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
| * | | | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-151-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11546
* | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into developNathan Guse2013-05-123-157/+144
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11533: [ticket/11533] Update unit tests [ticket/11533] Fix colspan and unnecessary tables [ticket/11533] Change list to table for notification settings [ticket/11533] Columns counter for notification settings
| * | | | | [ticket/11533] Fix colspan and unnecessary tablesVjacheslav Trushkin2013-05-111-123/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix colspan and remove unnecessary tables in notification settings page in subsilver2. PHPBB3-11533
| * | | | | [ticket/11533] Change list to table for notification settingsVjacheslav Trushkin2013-05-111-34/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11533
| * | | | | [ticket/11533] Columns counter for notification settingsVjacheslav Trushkin2013-05-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns counter template variable. It counts number of notification types + column for name + column for checkbox PHPBB3-11533
* | | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11465' into developNathan Guse2013-05-121-47/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (8) and Joas Schilling (3) # Via Marc Alexander * remotes/Marc/ticket/11465: [ticket/11465] Increase count of disabled extensions to 5 in functional test [ticket/11465] Add disabled ext to allow proper testing of get_module_infos() [ticket/11465] Add tests for optional arguments of get_module_infos() [ticket/11465] Add comments explaining the tests [ticket/11465] Check if class exists before including info file [ticket/11465] Correctly set the root path for the test [ticket/11465] The info file does not have _info suffix [ticket/11465] Add phpBB module to test [ticket/11465] Move require_once() in unit test to the top of the file [ticket/11465] Add unit tests for acp_modules::get_module_infos() [ticket/11465] Use extension finder when adding extensions' acp modules
| * \ \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-12128-1866/+3376
| |\ \ \ \ \ \
| * | | | | | | [ticket/11465] Check if class exists before including info fileMarc Alexander2013-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | [ticket/11465] The info file does not have _info suffixJoas Schilling2013-04-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | [ticket/11465] Use extension finder when adding extensions' acp modulesMarc Alexander2013-03-211-47/+25
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method acp_modules::get_module_infos() needs to use the extension finder whenever it is looking for a module's info file. While transitioning to the new extension system, only the initial search for all module info files was changed to the new system. Due to this it is not possible to add an extension's acp/mcp/ucp module manually in the ACP. This patch will always use the extension finder for the acp module's info files and therefore properly find the needed file. Additionally, the code has been cleaned up a little bit. PHPBB3-11465
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-122-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions. Conflicts: phpBB/includes/functions.php
| * | | | | [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no space between ; and the string "url=". But according to w3c, we should have atleast one space between them. So, added space characters accordingly. PHPBB3-11105
* | | | | | Merge remote-tracking branch 'remotes/bantu/ticket/11452' into developNathaniel Guse2013-05-111-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/11452] Now notification_method_email checks whether user has address.Andreas Fischer2013-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the user has an email address set before offering email notifications. The address could be missing for whatever reason, e.g. external authentication. This is also consistent with XMPP/Jabber now. PHPBB3-11452
* | | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into developNathaniel Guse2013-05-113-0/+111
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [ticket/10741] Docblock for phpbb.resizeTextAreaVjacheslav Trushkin2013-04-301-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better description of phpBB.resizeTextArea with detailed explanation of all optional parameters. Removed unnecessary semicolons PHPBB3-10741
| * | | | | | [ticket/10741] Fix for browser-specific resizing of textareaVjacheslav Trushkin2013-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable browser-specific resizing only after textarea has been resized Enable browser-specific resizing after script resizing has been reset PHPBB3-10741
| * | | | | | [ticket/10741] Do not resize textarea.no-auto-resizeVjacheslav Trushkin2013-04-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not auto-resize textareas with class .no-auto-resize PHPBB3-10741
| * | | | | | [ticket/10741] Automatically resize textareas in prosilver and ACPVjacheslav Trushkin2013-04-122-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically resize textareas in prosilver and ACP. PHPBB3-10741
| * | | | | | [ticket/10741] Function to resize textarea elementsVjacheslav Trushkin2013-04-121-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New function to automatically resize textarea elements as user types text PHPBB3-10741
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-092-2/+416
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR. [ticket/11513] Update all CLI calls to phpunit to use vendor/bin. [ticket/11513] Use PHPUnit from composer in .travis.yml. [ticket/11513] Update (all) composer dependencies. [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency. Conflicts: .travis.yml phpBB/composer.lock
| * | | | | | [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11513
| * | | | | | [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11513
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-091-189/+144
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11526] Update all dependencies / regenerate composer.lock. [ticket/11526] Increase composer minimum stability in olympus to stable. [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7. Conflicts: phpBB/composer.json phpBB/composer.lock
| * | | | | | [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11526
| * | | | | | [ticket/11526] Increase composer minimum stability in olympus to stable.Andreas Fischer2013-05-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11526
* | | | | | | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-083-19/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Matt Friedman # Via Matt Friedman * VSEphpbb/ticket/10155: [ticket/10155] Update copyright in new migration file to 2013 [ticket/10155] Make effectively installed test more specific [ticket/10155] Use more descriptive title for migration file [ticket/10155] Use new migration file for jQuery config update [ticket/10155] Update jQuery to 1.8.3
| * | | | | | | [ticket/10155] Update copyright in new migration file to 2013Matt Friedman2013-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | | | [ticket/10155] Make effectively installed test more specificMatt Friedman2013-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | | | [ticket/10155] Use more descriptive title for migration fileMatt Friedman2013-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | | | [ticket/10155] Use new migration file for jQuery config updateMatt Friedman2013-03-152-1/+32
| | | | | | | |
| * | | | | | | [ticket/10155] Update jQuery to 1.8.3Matt Friedman2013-03-143-20/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently included jQuery is old by now, v1.6.2. We should update to 1.8.3. This allows us to take advantage of the latest form of jQuery event delegation ($.on). I don't think it wise to update to jQuery 1.9.x yet, as many 3rd party scripts still need to be updated to cope with its deprecated features ($.browser). Therefor, 1.8.3 is the latest and most widely compatible stable version right now. PHPBB3-10155
* | | | | | | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-086-0/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * dhruvgoel92/ticket/10325: [ticket/10325] move migration into a new file [ticket/10325] fix acp language [ticket/10325] use assert_response_success parts [ticket/10325] fix language in acp and ucp [ticket/10325] add assert_response_success in test [ticket/10325] functional tests for forgot password functionality [ticket/10325] add logout function in functional_test_case [ticket/10325] fix language in acp and ucp [ticket/10325] improve acp option language [ticket/10325] fix language key [ticket/10325] fix language variable [ticket/10325] change language var [ticket/10325] fix language [ticket/10325] add new config value to database [ticket/10325] trigger error if forgot password option disabled [ticket/10325] add allow forgot password option in acp
| * | | | | | | [ticket/10325] move migration into a new fileDhruv2013-05-082-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10325
| * | | | | | | [ticket/10325] fix acp languageDhruv2013-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10325