aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ŧicket/11600] Split get driver tests into tests for all and only enabled onesMarc Alexander2013-06-251-10/+34
| | | | PHPBB3-11600
* [ticket/11600] Increase code test coverage of avatar managerMarc Alexander2013-06-101-22/+92
| | | | | | | Currently, not all methods and their possible behaviors are tested with unit tests. Add them for better code coverage. PHPBB3-11600
* Merge remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0715-1171/+1542
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11481: [ticket/11481] Move prepended slash from calls into function [ticket/11481] Remove globals and use dependency injection instead [ticket/11481] Use container for all classes and inject dependencies [ticket/11481] Move functions from feed into helper class [ticket/11481] Move active topics feed to own file [ticket/11481] Move topics feed to own file [ticket/11481] Move news feed to own file [ticket/11481] Move forums feed to own file [ticket/11481] Move topic feed to own file [ticket/11481] Move forum feed to own file [ticket/11481] Move overall feed to own file [ticket/11481] Move feed topic base to own file [ticket/11481] Move feed post base to own file [ticket/11481] Move feed base to own file [ticket/11481] Move feed factory to own file
| * [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-066-6/+6
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0612-125/+157
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-069-34/+139
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-063-109/+167
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-062-123/+139
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-062-77/+93
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move news feed to own fileJoas Schilling2013-06-062-99/+115
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move forums feed to own fileJoas Schilling2013-06-062-62/+78
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move topic feed to own fileJoas Schilling2013-06-062-98/+114
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move forum feed to own fileJoas Schilling2013-06-062-129/+145
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move overall feed to own fileJoas Schilling2013-06-062-83/+99
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move feed topic base to own fileJoas Schilling2013-06-062-45/+61
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move feed post base to own fileJoas Schilling2013-06-062-43/+59
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move feed base to own fileJoas Schilling2013-06-062-214/+230
| | | | | | | | PHPBB3-11481
| * [ticket/11481] Move feed factory to own fileJoas Schilling2013-06-062-88/+104
| | | | | | | | PHPBB3-11481
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-070-0/+0
|\ \ | | | | | | | | | * develop-olympus:
| * \ Merge remote-tracking branch 'remotes/nickv/ticket/11543' into develop-olympusNathaniel Guse2013-06-072-0/+359
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11543: [ticket/11543] Add more users so #hidden <> #normal [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
* | \ \ Merge remote-tracking branch 'remotes/nickv/ticket/develop/11543' into developNathaniel Guse2013-06-073-0/+353
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/develop/11543: [ticket/11543] Add more users so #hidden <> #normal [ticket/develop/11543] Use plurals in develop [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
| * \ \ \ Merge branch 'ticket/11543' into ticket/develop/11543Joas Schilling2013-06-072-10/+21
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11543: [ticket/11543] Add more users so #hidden <> #normal Conflicts: tests/functions/obtain_online_test.php
| | * | | [ticket/11543] Add more users so #hidden <> #normalJoas Schilling2013-06-072-10/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| * | | | [ticket/develop/11543] Use plurals in developJoas Schilling2013-06-062-25/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| * | | | Merge branch 'ticket/11543' into ticket/develop/11543Joas Schilling2013-06-062-0/+348
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11543: [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
| | * | | [ticket/11543] Use correct IP addresses and inject time for correct valuesJoas Schilling2013-06-061-22/+25
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | [ticket/11543] Add unit tests for obtain_users_online_string()Joas Schilling2013-06-062-1/+185
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | [ticket/11543] Add unit tests for obtain_users_online() with empty forumJoas Schilling2013-06-061-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | [ticket/11543] Add unit tests for obtain_users_online()Joas Schilling2013-06-061-0/+65
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | [ticket/11543] Add unit tests for obtain_guest_count()Joas Schilling2013-06-062-0/+80
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
* | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-06-061-0/+20
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling (1) and Nils Adermann (1) * remotes/upstream/develop-olympus: [ticket/11590] Close database connections when tearDown() is called
| * | | | Merge pull request #1466 from nickvergessen/ticket/11590Nils Adermann2013-06-061-0/+20
| |\ \ \ \ | | | | | | | | | | | | [ticket/11590] Close database connections when tearDown() is called
| | * | | | [ticket/11590] Close database connections when tearDown() is calledJoas Schilling2013-06-071-0/+20
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11590
* | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-060-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * develop-olympus:
| * | | | Merge remote-tracking branch 'remotes/nickv/ticket/11568' into develop-olympusNathaniel Guse2013-06-065-105/+173
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11568: [ticket/11568] Split status code and html debug assertion into two methods [ticket/11568] Add comma at end of array key-value couple [ticket/11568] Invert logic for asserting the response [ticket/11568] Use static calls for static methods [ticket/11568] Remove unused method [ticket/11568] Only assert string when doctype is there at all [ticket/11568] Add method to get page content [ticket/11568] Allow different status codes [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header [ticket/11568] Fix common_groups_test.php form handling [ticket/11568] Make CookieJar static aswell [ticket/11568] Remove manual calls to assert_response_success() [ticket/11568] Only use a static version of the client [ticket/11568] Any output before the doc type means there was an error [ticket/11568] Set client manually so we can increase the cURL timeout [ticket/11568] Use Goutte Client to install the board for functional tests
* | \ \ \ \ Merge remote-tracking branch 'remotes/nickv/ticket/11568-develop' into developNathaniel Guse2013-06-0618-183/+219
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11568-develop: (21 commits) [ticket/11568] Split status code and html debug assertion into two methods [ticket/11568] Add comma at end of array key-value couple [ticket/11568] Invert logic for asserting the response [ticket/11568] Use static calls for static methods [ticket/develop/11568] Remove unneccessary second call with wrong arguments [ticket/11568] Remove unused method [ticket/11568] Only assert string when doctype is there at all [ticket/develop/11568] Fix some more tests in 3.1 [ticket/develop/11568] Remove php extension parameter [ticket/develop/11568] Remove unneccessary calls to assert_response_success() [ticket/develop/11568] Do not directly access $client from tests [ticket/11568] Add method to get page content [ticket/11568] Allow different status codes [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header [ticket/11568] Fix common_groups_test.php form handling [ticket/11568] Make CookieJar static aswell [ticket/11568] Remove manual calls to assert_response_success() [ticket/11568] Only use a static version of the client [ticket/11568] Any output before the doc type means there was an error [ticket/11568] Set client manually so we can increase the cURL timeout ...
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-06-0726-145/+640
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11568-develop * 'develop' of https://github.com/phpbb/phpbb3: (29 commits) [ticket/11588] Also use version.phpbb.com in install_update.php. [ticket/11587] Add functional tests for group teampage settings [ticket/11538] Add admin as admins leader and moderator in memberlist_test [ticket/11587] Pass legend and teampage settings to group_create() [ticket/11586] Move $filedata['thumbnail'] to where it might be returned. [ticket/11586] Combine $filedata['post_attach'] assign into a single statement. [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE. [ticket/11586] Combine administrator/moderator checks together. [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11122] Add dhruv to active authors [ticket/11122] Remove Oleg and igorw from active authors [ticket/10840] Add check_form_key to acp_groups.php [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. [ticket/11409] Add success message after updating group position settings [ticket/11549] Add functional test for ACP Extension Module with Template [ticket/11570] Fix link and make the notice more conspiciuous [ticket/11549] Do not set extension dir path for style in adm/index.php [ticket/11570] Add link back to update process [ticket/11569] Add type parameter and fix language variable [ticket/11569] Add parameter to URL and remove comment ... Conflicts: tests/functional/common_groups_test.php
* | | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11587' into developNathaniel Guse2013-06-064-10/+170
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11587: [ticket/11587] Add functional tests for group teampage settings [ticket/11587] Pass legend and teampage settings to group_create()
| * | | | | | [ticket/11587] Add functional tests for group teampage settingsMarc Alexander2013-06-043-6/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The group_legend and group_teampage settings, which are needed for the teampage, are tested with these newly added functional tests. Duplicate code has been reduced as much as possible. PHPBB3-11587
| * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11587Marc Alexander2013-06-043-8/+14
| |\ \ \ \ \ \
| * | | | | | | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without passing those values, the group is removed from the teampage and the legend while submitting the edit form on the ucp groups manage page. PHPBB3-11587
* | | | | | | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathaniel Guse2013-06-065-78/+165
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Make inTag function reusable [feature/editor-code-tabs] Check for browser support in function [feature/editor-code-tabs] Apply code editor to everything [feature/editor-code-tabs] Correctly count indentation on first line
| * | | | | | | | [feature/editor-code-tabs] Make inTag function reusableVjacheslav Trushkin2013-05-221-29/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change inTag function to reusable JS function that can check for any BBCode PHPBB3-11557
| * | | | | | | | [feature/editor-code-tabs] Check for browser support in functionVjacheslav Trushkin2013-05-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for browser support and valid textarea in function instead of before applying function. PHPBB3-11557
| * | | | | | | | [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-205-92/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move code editor from prosilver to assets Apply code editor to subsilver2 Apply code editor to ACP elements where bbcode is allowed PHPBB3-11557
| * | | | | | | | [feature/editor-code-tabs] Correctly count indentation on first lineVjacheslav Trushkin2013-05-201-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly count indentation on first line of code tag PHPBB3-11557
* | | | | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11564' into developNathaniel Guse2013-06-062-5/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11564: [ticket/11564] Missing new line in tweaks.css [ticket/11564] Notifications popup fixes
| * | | | | | | | | [ticket/11564] Missing new line in tweaks.cssVjacheslav Trushkin2013-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing new line at the end of tweaks.css PHPBB3-11564
| * | | | | | | | | [ticket/11564] Notifications popup fixesVjacheslav Trushkin2013-05-232-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix width issue with vertical scrollbar Correctly absolutely position it above link, allowing style authors to move notifications link around in style Fix IE7 positioning PHPBB3-11564
* | | | | | | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-061-1/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * develop-olympus: [ticket/11588] Also use version.phpbb.com in install_update.php.