| Commit message (Collapse) | Author | Age | Files | Lines |
| ... | |
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-12251
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-12236
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-12237
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* github-nickvergessen/ticket/12235:
[ticket/12235] Convert WLM to custom profile field
[ticket/12187] Do not make clickable when using as contact field
[ticket/12187] Split generate_profile_fields_template() into 2 methods
[ticket/12187] Remove user_website field
[ticket/12187] Remove user_website functionality
[ticket/12187] Convert website field data to custom profile field
[ticket/12187] Add URL type for profile fields
[ticket/12234] Replace ICQ with custom profile field
[ticket/12233] Update schema file
[ticket/12233] Add images back to subsilver2
[ticket/12233] Allow profile fields to be contact fields
Conflicts:
phpBB/adm/style/acp_prune_users.html
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-12235
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-12187
|
| | |/ / / /
| | | | |
| | | | |
| | | | | |
PHPBB3-12234
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-12227
|
| |/ / / /
| | | |
| | | |
| | | | |
PHPBB3-12226
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-12005
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11746
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11746
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11739
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11837
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11837
|
| |\ \ \ \
| | | | |
| | | | | |
[ticket/11744] Group join request notification
|
| | | |_|/
| |/| |
| | | |
| | | | |
PHPBB3-11744
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11673
|
| |/ / /
| | |
| | |
| | | |
PHPBB3-11673
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11112
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-11112
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10325
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10325
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10325
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10325
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10325
|
| | | | |
| | | |
| | | |
| | | | |
PHPBB3-10325
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
phpBB/install/database_update.php
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11103
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
phpBB/install/database_update.php
|
| | | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-10896
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
phpBB/install/database_update.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
|
| | | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11103
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is going to require you recreate the db tables.
PHPBB3-11103
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
phpBB/includes/functions.php
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11103
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also add the ability to specify an _EXPLAIN text for the notification option
PHPBB3-11103
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-11103
|