aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | [ticket/11492] Fix issues with log objectJoas Schilling2013-04-111-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11492
| * | | | | | [ticket/11492] Split into mutliple testsJoas Schilling2013-04-111-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11492
| * | | | | | [ticket/11492] Do not add the user againJoas Schilling2013-04-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11492
| * | | | | | [ticket/11492] Add tests for removing/adding usersJoas Schilling2013-04-112-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11492
| * | | | | | [ticket/11492] Add functional test for empty teampageJoas Schilling2013-04-112-0/+49
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11492
* | | | | | Merge pull request #1312 from VSEphpbb/ticket/11463Nils Adermann2013-04-041-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11463] Add title attribute to topics in search results
| * | | | | | [ticket/11463] Add title attribute to topics in search resultsMatt Friedman2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use this title attribute in viewforum_body.html, but not in search_results.html. Perhaps we should, as this will maintain consitency between all these topic view pages. PHPBB3-11463
* | | | | | | Merge pull request #1199 from imkingdavid/ticket/11334Nils Adermann2013-04-033-9/+90
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11334] Properly generate controller URL with helper url() method
| * \ \ \ \ \ \ Merge pull request #7 from nickvergessen/ticket/imkingdavid/11334-2David King2013-03-152-4/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11334] Allow parameters to be specified in the route
| | * | | | | | | [ticket/11334] Allow parameters to be specified in the routeJoas Schilling2013-03-152-4/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Fix copyright year in test fileJoas Schilling2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Use mocks instead of making parameters optionalJoas Schilling2013-03-152-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Move unit tests for helper->url() into own fileJoas Schilling2013-03-152-11/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Expand functionality of helper->url()Joas Schilling2013-03-151-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expanded the functionality of helper->url() to support all parameters of append_sid() itself. PHPBB3-11334
| * | | | | | | [ticket/11334] Include functions.php and fix class name in testsJoas Schilling2013-03-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Remove extraneous periodDavid King2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Make $phpbb_dispatcher global, as done in append_sid testDavid King2013-03-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Make url helper method publicDavid King2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Add a test for the controller helper URL methodDavid King2013-03-152-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
| * | | | | | | [ticket/11334] Properly generate controller URL until paths issue gets fixedDavid King2013-03-151-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11334
* | | | | | | | Merge pull request #1323 from t-backoff/ticket/11477Nils Adermann2013-03-315-1/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ticket/11477
| * | | | | | | | Changing effectively_installed function to check if the config var is set.Tabitha Backoff2013-03-311-1/+1
| | | | | | | | |
| * | | | | | | | Migration file and change board_home_text to board_index_textTabitha Backoff2013-03-286-7/+28
| | | | | | | | |