aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Collapse)AuthorAgeFilesLines
* [feature/oauth] Fix bug on ucp_auth_link related to error displayJoseph Warner2013-09-021-0/+1
| | | | PHPBB3-11673
* [feature/oauth] More small fixesJoseph Warner2013-09-021-1/+1
| | | | PHPBB3-11673
* [feature/oauth] More minor changes from reviewJoseph Warner2013-09-022-4/+5
| | | | PHPBB3-11673
* [feature/oauth] Fix small issues on ucp pagesJoseph Warner2013-09-022-2/+3
| | | | PHPBB3-11673
* [feature/oauth] A few more minor changesJoseph Warner2013-08-241-0/+13
| | | | PHPBB3-11673
* [feature/oauth] Changes due to code reviewJoseph Warner2013-08-242-19/+17
| | | | PHPBB3-11673
* [feature/oauth] Fix issues on ucp_login_link from reviewJoseph Warner2013-08-241-3/+38
| | | | PHPBB3-11673
* [feature/oauth] Clean up TODOsJoseph Warner2013-08-241-1/+0
| | | | PHPBB3-11673
* [feature/oauth] Fix template not refreshing issueJoseph Warner2013-08-141-0/+3
| | | | PHPBB3-11673
* [feature/oauth] Fix bug found in testingJoseph Warner2013-08-141-3/+3
| | | | PHPBB3-11673
* [feature/oauth] Implement unlinking in OAuthJoseph Warner2013-08-141-0/+3
| | | | PHPBB3-11673
* [feature/oauth] Fix errors found in testing linkingJoseph Warner2013-08-141-1/+1
| | | | PHPBB3-11673
* [feature/oauth] Refactor oauth::link_account for two pathsJoseph Warner2013-08-141-1/+13
| | | | PHPBB3-11673
* [feature/oauth] Update link_account to allow for two methods of linkingJoseph Warner2013-08-142-1/+7
| | | | PHPBB3-11673
* [feature/oauth] Fix errors in ucp_auth_linkJoseph Warner2013-08-141-2/+2
| | | | PHPBB3-11673
* [feature/oauth] Start implementing link/unlink actionsJoseph Warner2013-08-141-0/+13
| | | | PHPBB3-11673
* [feature/oauth] Handle hidden fieldsJoseph Warner2013-08-121-0/+13
| | | | PHPBB3-11673
* [feature/oauth] Get the OAuth template in place for ucp_auth_linkJoseph Warner2013-08-121-0/+13
| | | | PHPBB3-11673
* [feature/oauth] Error handling on pageJoseph Warner2013-08-121-4/+22
| | | | PHPBB3-11673
* [feature/oauth] More template workJoseph Warner2013-08-091-0/+3
| | | | PHPBB3-11673
* [feature/oauth] Add method to return necessary data for auth_linkJoseph Warner2013-08-091-1/+10
| | | | PHPBB3-11673
* [feature/oauth] Start building the templateJoseph Warner2013-08-091-0/+28
| | | | PHPBB3-11673
* [feature/oauth] Default auth_link into UCP_PROFILE not UCP_MAINJoseph Warner2013-08-091-1/+1
| | | | PHPBB3-11673
* [feature/oauth] Forgot to have login_link be "in login" in ucpJoseph Warner2013-08-051-0/+34
| | | | PHPBB3-11673
* [feature/oauth] Start general auth linking pageJoseph Warner2013-08-051-0/+27
| | | | PHPBB3-11673
* [feature/oauth] Login_link works with ucp_register nowJoseph Warner2013-07-311-7/+21
| | | | PHPBB3-11673
* [feature/oauth] Fix errors on ucp_login_linkJoseph Warner2013-07-311-5/+4
| | | | PHPBB3-11673
* [feature/oauth] Login_link in registrationJoseph Warner2013-07-312-7/+56
| | | | PHPBB3-11673
* [feature/oauth] Start working on login_link registration supportJoseph Warner2013-07-301-3/+15
| | | | PHPBB3-11673
* [feature/oauth] Works in all tests nowJoseph Warner2013-07-291-7/+14
| | | | PHPBB3-11673
* [feature/oauth] Most of ucp page related to login option should be done nowJoseph Warner2013-07-291-5/+12
| | | | PHPBB3-11673
* [feature/oauth] More work on getting login link workingJoseph Warner2013-07-291-61/+79
| | | | PHPBB3-11673
* [feature/oauth] Properly check that all data needed is availableJoseph Warner2013-07-291-3/+10
| | | | PHPBB3-11673
* [feature/oauth] Login works on login_link now, still does not actually linkJoseph Warner2013-07-291-10/+87
| | | | PHPBB3-11673
* [feature/oauth] Basic checking for data needed in login linkingJoseph Warner2013-07-291-1/+15
| | | | PHPBB3-11673
* [feature/oauth] More work on login linking accountsJoseph Warner2013-07-251-0/+23
| | | | PHPBB3-11673
* [feature/oauth] Template for ucp_login_link startedJoseph Warner2013-07-251-1/+4
| | | | PHPBB3-11673
* [feature/oauth] Some work on login_linkJoseph Warner2013-07-241-0/+3
| | | | PHPBB3-11673
* [feature/oauth] Initial login_link ucp classJoseph Warner2013-07-241-0/+32
| | | | PHPBB3-11673
* Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-131-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error Conflicts: tests/functional/ucp_groups_test.php
| | * [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Up to now the array_map() that turns error messages into the localized output was only ran if the group's color was set. With this patch it'll run the array_map() on the complete error array if it's not empty. PHPBB3-11548
* | | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-111-2/+4
| | | | | | | | | | | | PHPBB3-9657
* | | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-119-27/+50
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | The avatar manager's method localize_errors() shouldn't be called if avatars are disabled in the config. PHPBB3-11602
| * | [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 branch 'develop-olympus' into developAndreas Fischer2013-05-261-0/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11538] Add optional switch as argument to hex colour validation [ticket/11538] Modify test colour values [ticket/11538] Limit comment in acp_groups to 80 characters per line [ticket/11538] Move group ID into abstract test class and add more test cases [ticket/11538] Merge calls to validate_data() in acp_groups [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour [ticket/11538] Use abstract class for functional test cases for group colour [ticket/11538] Add function phpbb_validate_colour for validating colours [ticket/11538] Make sure regex doesn't allow multiple color values [ticket/11538] Add tests for acp group manage page [ticket/11538] Simplify colour value check and remove support for '#' [ticket/11538] Fix incorrect regex and test for duplicate # in color string [ticket/11538] Use regex for testing color value and improve tests [ticket/11538] Make sure group color can't exceed maximum of 6 characters Conflicts: phpBB/includes/functions_user.php phpBB/styles/prosilver/template/ucp_groups_manage.html
| | * [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The value of $optional will decide whether an empty string will be treated as incorrect input or if it is allowed. The optional argument will default to false and therefore treat an empty string as incorrect unless explicitly told to not do so. PHPBB3-11538
| | * [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colourMarc Alexander2013-05-191-1/+1
| | | | | | | | | | | | PHPBB3-11538
| | * [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It will be possible to use this function via the validate_data() function interface that has already been used previously. Thus, this new function will extend the capabilities of validate_data() to checking hex color values. PHPBB3-11538