aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12561] Reworked tests by nickvergessenPayBas2014-05-278-112/+206
| | | | PHPBB3-12561
* [ticket/12561] Added tests for "after last", "after missing" and "empty"PayBas2014-05-263-9/+111
| | | | | | Also removed tabs PHPBB3-12561
* [ticket/12561] Add check to see if "after" column actually existsPayBas2014-05-261-1/+9
| | | | | | If not, just append to the end PHPBB3-12561
* [ticket/12561] Added test for "after"PayBas2014-05-242-0/+48
| | | | PHPBB3-12561
* [ticket/12561] Add "after" check to schema_generator for columns_addPayBas2014-05-191-1/+11
| | | | PHPBB3-12561
* Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-05-180-0/+0
|\ | | | | | | * develop-olympus:
| * Merge pull request #2470 from bantu/task/samiJoas Schilling2014-05-185-155/+418
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | [task/sami] Add Sami to composer dependencies and build script * bantu/task/sami: [task/sami] Establish alphabetical order. [task/sami] Also ignore ext/ directory. [task/sami] Replace phpdoctor with sami. [task/sami] Add sami/sami as a composer development dependency.
* | \ Merge pull request #2471 from bantu/task/sami-ascraeusJoas Schilling2014-05-185-154/+256
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [task/sami-ascraeus] Add Sami to composer dependencies and build script * bantu/task/sami-ascraeus: [task/sami] Establish alphabetical order. [task/sami] Also ignore ext/ directory. [task/sami] Replace phpdoctor with sami. [task/sami] Add sami/sami as a composer development dependency.
| * \ \ Merge branch 'task/sami' into task/sami-ascraeusAndreas Fischer2014-05-171-1/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | * task/sami: [task/sami] Establish alphabetical order. [task/sami] Also ignore ext/ directory.
| | * | [task/sami] Establish alphabetical order.Andreas Fischer2014-05-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12495
| | * | [task/sami] Also ignore ext/ directory.Andreas Fischer2014-05-171-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12495
| * | | Merge branch 'task/sami' into task/sami-ascraeusAndreas Fischer2014-05-165-154/+255
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/sami: [task/sami] Replace phpdoctor with sami. [task/sami] Add sami/sami as a composer development dependency. Conflicts: phpBB/composer.json phpBB/composer.lock
| | * | [task/sami] Replace phpdoctor with sami.Andreas Fischer2014-05-163-153/+51
| | | | | | | | | | | | | | | | PHPBB3-12495
| | * | [task/sami] Add sami/sami as a composer development dependency.Andreas Fischer2014-05-162-2/+366
| | |/ | | | | | | | | | PHPBB3-12495
* | | Merge remote-tracking branch 'n-aleha/ticket/12547' into develop-ascraeusCesar G2014-05-1611-10/+10
|\ \ \ | | | | | | | | | | | | | | | | * n-aleha/ticket/12547: [ticket/12547] Rename jquery.js to jquery.min.js in assets directory
| * | | [ticket/12547] Rename jquery.js to jquery.min.js in assets directoryn-aleha2014-05-1511-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | phpBB uses the minified version of jQuery hence the rename. PHPBB3-12547
* | | | Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeusCesar G2014-05-168-24/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * n-aleha/ticket/12525: [ticket/12525] Add string argument to contact and email user language variables
| * | | | [ticket/12525] Add string argument to contact and email user language variablesn-aleha2014-05-178-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In language/en/common.php: * Introduce a new language variable 'CONTACT' => 'Contact' * Add a string argument to lang var 'CONTACT_USER' to avoid an appended '{USERNAME}' in template. * Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended '{USERNAME}' in template. Also fix typos. PHPBB3-12525
* | | | | Merge remote-tracking branch 'brunoais/ticket/PHPBB3-12533' into ↵Cesar G2014-05-162-2/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * brunoais/ticket/PHPBB3-12533: [ticket/12533] Make <a> use all the "see all" "button" [ticket/12533] Make <a> use all the notification item size
| * | | | [ticket/12533] Make <a> use all the "see all" "button"brunoais2014-05-142-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the CSS so that the `<a>` of the notifications list for the "see all" uses all the container. PHPBB3-12533
| * | | | [ticket/12533] Make <a> use all the notification item sizebrunoais2014-05-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed padding CSS to the notifications' `<li>` and it's `<a>` (immediate child) so that the `<a>` block uses all it's container width and height. To compensate that, I added the padding that was in the `<li>` to the `<a>` PHPBB3-12533
* | | | | Merge pull request #2463 from nickvergessen/ticket/12433Andreas Fischer2014-05-152-2/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12433] Use a different message when nesting of quotes is not allowed * nickvergessen/ticket/12433: [ticket/12433] Use a different message when nesting of quotes is not allowed
| * | | | | [ticket/12433] Use a different message when nesting of quotes is not allowedJoas Schilling2014-05-152-2/+11
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12433
* | | | | Merge pull request #2464 from nickvergessen/ticket/11163Andreas Fischer2014-05-151-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11163] Add ext/index.htm * nickvergessen/ticket/11163: [ticket/11163] Add ext/index.htm
| * | | | | [ticket/11163] Add ext/index.htmJoas Schilling2014-05-151-0/+10
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11163
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-05-152-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12540] Fix broken placeholders in language files Conflicts: phpBB/language/en/common.php phpBB/language/en/posting.php phpBB/language/en/ucp.php
| * | | Merge pull request #2454 from nickvergessen/ticket/12540Andreas Fischer2014-05-153-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12540] Fix broken placeholders in language files * nickvergessen/ticket/12540: [ticket/12540] Fix broken placeholders in language files
| | * | | [ticket/12540] Fix broken placeholders in language filesJoas Schilling2014-05-133-3/+3
| |/ / / | | | | | | | | | | | | PHPBB3-12540
* | | | Merge pull request #2456 from Nicofuma/ticket/12435Andreas Fischer2014-05-141-8/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12435] purge_notifications() fails for unused notifications * Nicofuma/ticket/12435: [ticket/12435] Update the comment [ticket/12435] purge_notifications() fails for unused notifications
| * | | | [ticket/12435] Update the commentTristan Darricau2014-05-141-4/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-12435
| * | | | [ticket/12435] purge_notifications() fails for unused notificationsTristan Darricau2014-05-141-8/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12435 PHPBB3-12435
* | | | Merge pull request #2457 from prototech/ticket/12544Andreas Fischer2014-05-141-8/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | [ticket/12544] Update Plupload to 2.1.2. * prototech/ticket/12544: [ticket/12544] Update Plupload to 2.1.2.
| * | | [ticket/12544] Update Plupload to 2.1.2.Cesar G2014-05-131-8/+8
|/ / / | | | | | | | | | PHPBB3-12544
* | | Merge pull request #2452 from n-aleha/ticket/12519Joas Schilling2014-05-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12519] Restore m_approve language description * n-aleha/ticket/12519: [ticket/12519] Restore m_approve language description
| * | | [ticket/12519] Restore m_approve language descriptionn-aleha2014-05-121-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | Restore acl_m_approve language description to: "Can approve and restore posts" PHPBB3-12519
* | | Merge remote-tracking branch 'nickvergessen/ticket/12534' into develop-ascraeusMarc Alexander2014-05-124-10/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/12534: [ticket/12534] Fix filter for functional tests [ticket/12534] Do not use errorbox for multi steps [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
| * | | [ticket/12534] Fix filter for functional testsJoas Schilling2014-05-121-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12534
| * | | [ticket/12534] Do not use errorbox for multi stepsJoas Schilling2014-05-122-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12534
| * | | [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensionsJoas Schilling2014-05-123-6/+10
| | | | | | | | | | | | | | | | PHPBB3-12534
* | | | Merge pull request #2446 from nickvergessen/ticket/12518Andreas Fischer2014-05-122-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12518] Apply De Morgan to make the conditions easier reasable * nickvergessen/ticket/12518: [ticket/12518] Apply De Morgan to make the conditions easier to read
| * | | | [ticket/12518] Apply De Morgan to make the conditions easier to readJoas Schilling2014-05-112-3/+3
|/ / / / | | | | | | | | | | | | PHPBB3-12518
* | | | Merge remote-tracking branch 'nickvergessen/ticket/12518' into develop-ascraeusMarc Alexander2014-05-112-26/+93
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * nickvergessen/ticket/12518: [ticket/12518] Add event to overwrite the cannot edit condition in posting.php [ticket/12518] Add event to overwrite the allow edit and delete conditions
| * | | [ticket/12518] Add event to overwrite the cannot edit condition in posting.phpJoas Schilling2014-05-111-11/+38
| | | | | | | | | | | | | | | | PHPBB3-12518
| * | | [ticket/12518] Add event to overwrite the allow edit and delete conditionsJoas Schilling2014-05-111-15/+55
|/ / / | | | | | | | | | PHPBB3-12518
* | | Merge pull request #2442 from Elsensee/ticket/12451-2Joas Schilling2014-05-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12451] Fix whitespace in posting.php lang file * Elsensee/ticket/12451-2: [ticket/12451] Fix whitespace in posting.php lang file
| * | | [ticket/12451] Fix whitespace in posting.php lang fileOliver Schramm2014-05-111-1/+1
|/ / / | | | | | | | | | PHPBB3-12451
* | | Merge pull request #2438 from marc1706/ticket/12517Joas Schilling2014-05-112-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12517] Correctly call $log->add in prune shadow topics * marc1706/ticket/12517: [ticket/12517] Correctly call $log->add in prune shadow topics
| * | | [ticket/12517] Correctly call $log->add in prune shadow topicsMarc Alexander2014-05-112-2/+9
| | | | | | | | | | | | | | | | PHPBB3-12517
* | | | Merge pull request #2439 from prototech/ticket/12526Joas Schilling2014-05-111-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | [ticket/12526] Fix undefined index: filesize when editing PM with attachments. * prototech/ticket/12526: [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
| * | | [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12526
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 20:56:59 +0000