Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | [ticket/12005] Remove language vars used by PM popup | Lukasz | 2013-11-08 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | PHPBB3-12005 | |||||
* | | | | [ticket/11746] Delete the notification after user is approved & fix language. | Cesar G | 2013-10-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11746 | |||||
* | | | | [ticket/11746] Add "admin activation required" notification. | Cesar G | 2013-10-24 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | PHPBB3-11746 | |||||
* | | | | [ticket/11739] Rename “Remember Me” login keys module | Cesar G | 2013-10-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11739 | |||||
* | | | | [ticket/11837] Replace escaped single quote with utf-8 single quote | Joseph Warner | 2013-09-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11837 | |||||
* | | | | [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED | Joseph Warner | 2013-09-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11837 | |||||
* | | | | Merge pull request #1617 from EXreaction/ticket/11744 | David King | 2013-09-12 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | [ticket/11744] Group join request notification | |||||
| * | | | | [ticket/11744] Group join request notification | Nathan Guse | 2013-07-26 | 1 | -0/+1 | |
| | |_|/ | |/| | | | | | | | | | | PHPBB3-11744 | |||||
* | | | | [feature/oauth] Changes due to code review | Joseph Warner | 2013-08-24 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] Update language constants for ucp_auth_link | Joseph Warner | 2013-08-14 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] Start building the template | Joseph Warner | 2013-08-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] Forgot to have login_link be "in login" in ucp | Joseph Warner | 2013-08-05 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] Start general auth linking page | Joseph Warner | 2013-08-05 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] Reword some of the language text | Joseph Warner | 2013-07-30 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] Properly check that all data needed is available | Joseph Warner | 2013-07-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] Basic checking for data needed in login linking | Joseph Warner | 2013-07-29 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] More work on login linking accounts | Joseph Warner | 2013-07-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11673 | |||||
* | | | | [feature/oauth] Template for ucp_login_link started | Joseph Warner | 2013-07-25 | 1 | -0/+2 | |
|/ / / | | | | | | | | | | PHPBB3-11673 | |||||
* | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-07-13 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com Conflicts: phpBB/language/en/install.php phpBB/language/en/ucp.php | |||||
| * | | | [ticket/11112] Do not change opensource.org link to https | Marc Alexander | 2013-07-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11112 | |||||
| * | | | [ticket/11112] Use https for user-visible links to phpbb.com | Marc Alexander | 2013-07-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-11112 | |||||
* | | | | [ticket/10325] fix language in acp and ucp | Dhruv | 2013-04-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-10325 | |||||
* | | | | [ticket/10325] fix language in acp and ucp | Dhruv | 2013-04-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-10325 | |||||
* | | | | [ticket/10325] fix language key | Dhruv | 2013-04-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-10325 | |||||
* | | | | [ticket/10325] fix language variable | Dhruv | 2013-04-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-10325 | |||||
* | | | | [ticket/10325] fix language | Dhruv | 2013-04-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-10325 | |||||
* | | | | [ticket/10325] trigger error if forgot password option disabled | Dhruv | 2013-04-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | PHPBB3-10325 | |||||
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars | Marc Alexander | 2013-03-04 | 1 | -1/+24 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php | |||||
| * | | | | [ticket/11103] Few more minor language things | Nathan Guse | 2013-02-28 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
| * | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 | Nathaniel Guse | 2013-02-26 | 1 | -1/+0 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php | |||||
| | * \ \ \ | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-02-24 | 1 | -1/+0 | |
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID [ticket/10896] Adds email validation to email settings in ACP Conflicts: phpBB/adm/index.php phpBB/language/en/common.php phpBB/language/en/ucp.php | |||||
| | | * | | | [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID | Nathan Guse | 2013-02-04 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10896 | |||||
| | * | | | | [ticket/11201] Revert WLM dropping because it is still used in China. | Andreas Fischer | 2013-02-04 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows Live Messenger is still in use in china which accounts for ~20% of world population. Revert WLM dropping which has been merged under the assumption that WLM data and features are completely useless. This commit reverts commits - 460470229d972b93ef5a98b0d1d97a2a970d684f - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2. PHPBB3-11201 | |||||
| | * | | | | [ticket/11201] Remove MSN/WLM fields | Joas Schilling | 2013-01-11 | 1 | -1/+0 | |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype uses a different login ID and service, the values in this field are useless. So we can safely remove the field and the links/functions we create. PHPBB3-11201 | |||||
| * | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 | Nathan Guse | 2012-12-07 | 1 | -4/+5 | |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html | |||||
| * | | | | [ticket/11103] Use phpBB Container to load types/methods | Nathaniel Guse | 2012-11-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
| * | | | | [ticket/11103] Use the full class name as the item_type/method | Nathan Guse | 2012-10-20 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is going to require you recreate the db tables. PHPBB3-11103 | |||||
| * | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 | Nathan Guse | 2012-10-18 | 1 | -0/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php | |||||
| * | | | | | [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link | Nathan Guse | 2012-10-16 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
| * | | | | | [ticket/11103] UCP Notification option grouping | Nathan Guse | 2012-10-13 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add the ability to specify an _EXPLAIN text for the notification option PHPBB3-11103 | |||||
| * | | | | | [ticket/11103] UCP Notification List | Nathan Guse | 2012-10-13 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
| * | | | | | [ticket/11103] Working on report notifications (post/pm) | Nathan Guse | 2012-10-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
| * | | | | | [ticket/11103] Move UCP Notification Options to Board Preferences tab | Nathan Guse | 2012-10-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename to "Edit notification options" for consistency PHPBB3-11103 | |||||
| * | | | | | [ticket/11103] Language key needed in the UCP | Nathan Guse | 2012-09-27 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
| * | | | | | [ticket/11103] Fix module setup, add explanation to template | Nathan Guse | 2012-09-27 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
| * | | | | | [ticket/11103] Some tweaks to the template output | Nathan Guse | 2012-09-26 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
| * | | | | | [ticket/11103] More work on the UCP Notifications page | Nathan Guse | 2012-09-26 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103 | |||||
* | | | | | | Merge branch 'develop' into feature/avatars | Marc Alexander | 2012-12-09 | 1 | -4/+5 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php | |||||
| * | | | | | [ticket/10679] Add new permission for changing profile field information | Joas Schilling | 2012-12-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setting is copied from "Can use signature" PHPBB3-10679 | |||||
| * | | | | | [ticket/10771] fix remember me language | Dhruv | 2012-12-02 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10771 |