aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-0/+1
| | | | | | Added a newline to better seperate the two headers. PHPBB3-11129
* [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-2/+16
| | | | | | | | "You are not subscribed to any forums". While correct, could lead to confusion. What's missing is a header right above the message that says "Watched Topics" to match the "Watched Forums" header above. This will assert the idea that there are two separate watchable sections. As is, it looks like that message is talking about the "Watched Forums" section, since it's listed under that header. PHPBB3-11129
* Merge remote-tracking branch 'nickvergessen/ticket/10966-2' into developAndreas Fischer2013-04-193-86/+67
|\ | | | | | | | | * nickvergessen/ticket/10966-2: [ticket/10966] Introduce MSSQL base class for native and ODBC
| * [ticket/10966] Introduce MSSQL base class for native and ODBCJoas Schilling2013-04-193-86/+67
|/ | | | PHPBB3-10966
* Merge remote-tracking branch 'nickvergessen/ticket/11501' into developAndreas Fischer2013-04-183-13/+6
|\ | | | | | | | | | | * nickvergessen/ticket/11501: [ticket/11501] Remove test_ prefix from data provider methods [ticket/11501] Assert the variables instead of fail() with the condition
| * [ticket/11501] Remove test_ prefix from data provider methodsJoas Schilling2013-04-192-4/+4
| | | | | | | | PHPBB3-11501
| * [ticket/11501] Assert the variables instead of fail() with the conditionJoas Schilling2013-04-191-9/+2
| | | | | | | | PHPBB3-11501
* | Merge remote-tracking branch 'nickvergessen/ticket/10966' into developAndreas Fischer2013-04-183-246/+148
|\ \ | |/ |/| | | | | * nickvergessen/ticket/10966: [ticket/10966] Introduce MySQL base class
| * [ticket/10966] Introduce MySQL base classJoas Schilling2013-04-173-246/+148
|/ | | | PHPBB3-10966
* Merge remote-tracking branch 'nickvergessen/ticket/11491' into developAndreas Fischer2013-04-151-10/+24
|\ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11491: [ticket/11491] Copy files back only if we saved them previously [ticket/11491] Only copy files from phpBB/ext/ the directory exists [ticket/11491] Correctly remove the store/temp_ext/ directory after use [ticket/11491] Fix path to the ext/ folder [ticket/11491] Add extension_acp_test.php to functional group [ticket/11491] Fix class name of functional test [ticket/11491] Move file to correct directory
| * [ticket/11491] Copy files back only if we saved them previouslyJoas Schilling2013-04-121-3/+9
| | | | | | | | PHPBB3-11491
| * [ticket/11491] Only copy files from phpBB/ext/ the directory existsJoas Schilling2013-04-121-4/+9
| | | | | | | | PHPBB3-11491
| * [ticket/11491] Correctly remove the store/temp_ext/ directory after useJoas Schilling2013-04-121-2/+2
| | | | | | | | PHPBB3-11491
| * [ticket/11491] Fix path to the ext/ folderJoas Schilling2013-04-121-1/+1
| | | | | | | | PHPBB3-11491
| * [ticket/11491] Add extension_acp_test.php to functional groupJoas Schilling2013-04-121-0/+3
| | | | | | | | PHPBB3-11491
| * [ticket/11491] Fix class name of functional testJoas Schilling2013-04-121-1/+1
| | | | | | | | PHPBB3-11491
| * [ticket/11491] Move file to correct directoryJoas Schilling2013-04-121-0/+0
| | | | | | | | PHPBB3-11491
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-04-151-0/+3
|\ \ | | | | | | | | | | | | | | | * develop-olympus: [ticket/11493] add checks for Notice and Warning [ticket/11493] add check for phpBB Debug in functional tests
| * \ Merge remote-tracking branch 'dhruvgoel92/ticket/11493' into develop-olympusAndreas Fischer2013-04-151-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11493: [ticket/11493] add checks for Notice and Warning [ticket/11493] add check for phpBB Debug in functional tests
| | * | [ticket/11493] add checks for Notice and WarningDhruv2013-04-151-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11493
| | * | [ticket/11493] add check for phpBB Debug in functional testsDhruv2013-04-151-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11493
* | | | Merge remote-tracking branch 'marc1706/ticket/11488' into developAndreas Fischer2013-04-152-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11488: [ticket/11488] Use correct base class in email notification method
| * | | | [ticket/11488] Use correct base class in email notification methodMarc Alexander2013-04-152-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ticket/11451 this was not correctly changed to reflect the new class phpbb_notifcation_method_messenger_base. Additionally, an undefined variable error has been fixed in messenger_base.php (change should be confirmed by bantu though). PHPBB3-11488
* | | | Merge remote-tracking branch 'nickvergessen/ticket/11494' into developAndreas Fischer2013-04-141-14/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11494: [ticket/11494] Filter crawler in first place [ticket/11494] Use functions instead of repeating [ticket/11494] Fix memberlist leaders functional tests
| * | | | [ticket/11494] Filter crawler in first placeJoas Schilling2013-04-151-23/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-11494
| * | | | [ticket/11494] Use functions instead of repeatingJoas Schilling2013-04-131-19/+29
| | | | | | | | | | | | | | | | | | | | PHPBB3-11494
| * | | | [ticket/11494] Fix memberlist leaders functional testsJoas Schilling2013-04-111-8/+24
| | |_|/ | |/| | | | | | | | | | | | | | | | | | The scope of the crawler should be reduced to the specific table PHPBB3-11494
* | | | Merge remote-tracking branch 'hjpotter92/ticket/11225' into developAndreas Fischer2013-04-131-19/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * hjpotter92/ticket/11225: [ticket/11225] Deletion of unused mcp_jumpbox.html file
| * | | | [ticket/11225] Deletion of unused mcp_jumpbox.html filehjpotter922013-04-111-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file/template is no longer used(as mentioned in it). PHPBB3-11225
* | | | | Merge pull request #1184 from marc1706/ticket/11314Nils Adermann2013-04-1212-866/+511
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11314] Improve readability and code cleanup in new JavaScript files
| * \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-26213-2819/+15863
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/timezone.js
| * | | | | | [ticket/11314] Modify files to comply with coding standardsMarc Alexander2013-03-268-734/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| * | | | | | [ticket/11314] Fix JSHint issues in adm editor.jsMarc Alexander2013-03-261-36/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time without changing the behavior. PHPBB3-11314
| * | | | | | [ticket/11314] Fix issues mentioned in jshint reportMarc Alexander2013-03-268-181/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, the editor.js files are now the same file in both subsilver2, prosilver, and the acp. PHPBB3-11314
| * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-02-27138-3112/+8143
| |\ \ \ \ \ \
| * | | | | | | [ticket/11314] Add missing radix parametersMarc Alexander2013-01-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| * | | | | | | [ticket/11314] Fix whitespace issuesMarc Alexander2013-01-122-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| * | | | | | | [ticket/11314] Add missing "use strict" to timezone.js filesMarc Alexander2013-01-103-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11314
| * | | | | | | [ticket/11314] Use return variable instead of overusing the return keywordMarc Alexander2013-01-101-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a return variable and modify it to our needs. PHPBB3-11314
| * | | | | | | [ticket/11314] Add missing semi-colonsMarc Alexander2013-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omitting the semi-colon is not legal behavior for JavaScript. PHPBB3-11314
| * | | | | | | [ticket/11314] Cleanup core.js codingMarc Alexander2013-01-101-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function errorHandler() was used in returnHandler() before it was defined. The unused variable alert has been removed from errorHandler(). Overuse of the var keyword for the variable sign has been removed and the if statement has been simplified. The definition of the variable i has been moved outside of the for loop definition. The var keyword shouldn't be used inside the definition of the for loop. PHPBB3-11314
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-04-121-41/+42
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | | | | | | | * develop-olympus: [ticket/11358] Removed all trailing white spaces. [ticket/11358] Fixed the code according to coding guidlines.
| * | | | | | Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-04-121-41/+42
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11358: [ticket/11358] Removed all trailing white spaces. [ticket/11358] Fixed the code according to coding guidlines.
| | * | | | | [ticket/11358] Removed all trailing white spaces.erangamapa2013-04-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed all trailing white spaces with new lines. PHPBB3-11358
| | * | | | | [ticket/11358] Fixed the code according to coding guidlines.erangamapa2013-04-121-42/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added proper indentation and new line after break in switch statement. PHPBB3-11358
* | | | | | | Merge remote-tracking branch 'rechosen/ticket/11116' into developAndreas Fischer2013-04-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rechosen/ticket/11116: [ticket/11116] Made ACP "extension not available" error message E_USER_WARNING
| * | | | | | | [ticket/11116] Made ACP "extension not available" error message E_USER_WARNINGrechosen2013-04-111-2/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message generated when an administrator tries to enable an incompatible extension used to be displayed in the green of the default E_USER_NOTICE. Changed it to E_USER_WARNING to make it appear in red, as requested in the ticket. PHPBB3-11116
* | | | | | | Merge pull request #1336 from nickvergessen/ticket/11492Nils Adermann2013-04-113-3/+124
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ticket/11492] Fix error on teampage when there are no users.
| * | | | | | [ticket/11492] Initialize $user_ids and $group_users arraysJoas Schilling2013-04-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also avoid unneccessary calls to permissions when user_ids is empty PHPBB3-11492
| * | | | | | [ticket/11492] Fix the test once moreJoas Schilling2013-04-111-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11492
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-11 07:56:13 +0000