mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 06:26:22 +01:00
Code Issues Releases Wiki Activity
18,332 Commits 10 Branches 193 Tags
f4317bc864f9c19a15de83ea30cb46a04c95a295
Commit Graph

268 Commits

Author SHA1 Message Date
Joseph Warner
3c6c1ec5f2 [ticket/11837] Replace escaped single quote with utf-8 single quote 
PHPBB3-11837
 2013-09-13 16:26:30 -04:00
Joseph Warner
b7ab068bbc [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED 
PHPBB3-11837
 2013-09-13 11:48:31 -04:00
David King
d629738675 Merge pull request #1617 from EXreaction/ticket/11744 
[ticket/11744] Group join request notification
 2013-09-12 21:24:11 -07:00
Joseph Warner
a8ffbce99f [feature/oauth] Changes due to code review 
PHPBB3-11673
 2013-08-24 22:04:04 -04:00
Joseph Warner
d13a1788f0 [feature/oauth] Update language constants for ucp_auth_link 
PHPBB3-11673
 2013-08-14 17:08:08 -04:00
Joseph Warner
deb62d51fe [feature/oauth] Start building the template 
PHPBB3-11673
 2013-08-09 05:12:57 -04:00
Joseph Warner
4683c37682 [feature/oauth] Forgot to have login_link be "in login" in ucp 
PHPBB3-11673
 2013-08-05 17:35:44 -04:00
Joseph Warner
baa3a750c4 [feature/oauth] Start general auth linking page 
PHPBB3-11673
 2013-08-05 15:38:03 -04:00
Joseph Warner
c5515eaf54 [feature/oauth] Reword some of the language text 
PHPBB3-11673
 2013-07-30 14:16:44 -04:00
Joseph Warner
c09bda10fc [feature/oauth] Properly check that all data needed is available 
PHPBB3-11673
 2013-07-29 13:11:15 -04:00
Joseph Warner
75206c74be [feature/oauth] Basic checking for data needed in login linking 
PHPBB3-11673
 2013-07-29 11:58:47 -04:00
Nathan Guse
e0ef10128b [ticket/11744] Group join request notification 
PHPBB3-11744
 2013-07-26 10:26:52 -05:00
Joseph Warner
59852b5997 [feature/oauth] More work on login linking accounts 
PHPBB3-11673
 2013-07-25 14:53:19 -04:00
Joseph Warner
317a71a838 [feature/oauth] Template for ucp_login_link started 
PHPBB3-11673
 2013-07-25 12:49:54 -04:00
Nils Adermann
0ef95a7009 Merge branch 'develop-olympus' into develop 
* 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
 2013-07-13 13:16:58 -04:00
Marc Alexander
ee3d4199bb [ticket/11112] Do not change opensource.org link to https 
PHPBB3-11112
 2013-07-12 22:40:55 -04:00
Marc Alexander
07eadac2f6 [ticket/11112] Use https for user-visible links to phpbb.com 
PHPBB3-11112
 2013-07-12 16:24:27 -04:00
Dhruv
a90a0b087c [ticket/10325] fix language in acp and ucp 
PHPBB3-10325
 2013-04-30 22:59:32 +05:30
Dhruv
d242b7a1a5 [ticket/10325] fix language in acp and ucp 
PHPBB3-10325
 2013-04-25 21:05:02 +05:30
Dhruv
c048067bbd [ticket/10325] fix language key 
PHPBB3-10325
 2013-04-25 21:01:21 +05:30
Dhruv
f1e615c429 [ticket/10325] fix language variable 
PHPBB3-10325
 2013-04-25 21:01:19 +05:30
Dhruv
f8012cc239 [ticket/10325] fix language 
PHPBB3-10325
 2013-04-25 21:00:14 +05:30
Dhruv
c6e9bd13a7 [ticket/10325] trigger error if forgot password option disabled 
PHPBB3-10325
 2013-04-25 20:39:50 +05:30
Marc Alexander
d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars 
Conflicts:
	phpBB/install/database_update.php
 2013-03-04 00:22:15 +01:00
Nathan Guse
db5a05418d [ticket/11103] Few more minor language things 
PHPBB3-11103
 2013-02-28 17:48:46 -06:00
Nathaniel Guse
a01da0c1ee Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/database_update.php
 2013-02-26 15:32:27 -06:00
Nils Adermann
5361a14c1e Merge branch 'develop-olympus' into develop 
* 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
 2013-02-24 17:42:14 +01:00
Nathan Guse
5aec7600a6 [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID 
PHPBB3-10896
 2013-02-04 23:13:47 -06:00
Andreas Fischer
336187151a [ticket/11201] Revert WLM dropping because it is still used in China. 
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
 - 460470229d
 - 9affd6f7e7
which have been merged by d59431691c.

PHPBB3-11201
 2013-02-04 01:31:43 +01:00
Joas Schilling
9affd6f7e7 [ticket/11201] Remove MSN/WLM fields 
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
 2013-01-11 14:32:44 +01:00
Marc Alexander
1aae72961a Merge branch 'develop' into feature/avatars 
Conflicts:
	phpBB/install/database_update.php
 2012-12-09 21:02:31 +01:00
Nathan Guse
0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-12-07 21:14:39 -06:00
Joas Schilling
4103c99a86 [ticket/10679] Add new permission for changing profile field information 
The setting is copied from "Can use signature"

PHPBB3-10679
 2012-12-06 15:10:29 +01:00
Dhruv
37f2841af2 [ticket/10771] fix remember me language 
PHPBB3-10771
 2012-12-02 15:40:25 +05:30
Dhruv
619e15378d [ticket/10771] use remember me in ucp 
PHPBB3-10771
 2012-12-02 14:51:31 +05:30
Marc Alexander
0abec06b09 [feature/avatars] Change gravatar explain as discussed in PR 
PHPBB3-10018
 2012-11-25 21:16:21 +01:00
Marc Alexander
5d0a20bbb6 [feature/avatars] Add missing language variables for avatars 
PHPBB3-10018
 2012-11-16 23:07:51 +01:00
Nathaniel Guse
f09ee16252 [ticket/11103] Use phpBB Container to load types/methods 
PHPBB3-11103
 2012-11-09 07:40:08 -06:00
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method 
This is going to require you recreate the db tables.

PHPBB3-11103
 2012-10-20 20:58:53 -05:00
Nathan Guse
3f27890a5e Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions.php
 2012-10-18 18:23:22 -05:00
Oleg Pudeyev
0a260f80af Merge PR #918 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
 2012-10-17 22:31:35 -04:00
Oleg Pudeyev
bd44088757 Merge PR #918 branch 'Senky/ticket/10568' into develop-olympus 
* Senky/ticket/10568:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
 2012-10-17 22:10:49 -04:00
Nathan Guse
61a1467c90 [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link 
PHPBB3-11103
 2012-10-16 16:47:18 -05:00
Nathan Guse
c5f280351a [ticket/11103] UCP Notification option grouping 
Also add the ability to specify an _EXPLAIN text for the notification option

PHPBB3-11103
 2012-10-13 23:52:49 -05:00
Nathan Guse
cb93784126 [ticket/11103] UCP Notification List 
PHPBB3-11103
 2012-10-13 20:02:38 -05:00
Nathan Guse
b33e527394 [ticket/11103] Working on report notifications (post/pm) 
PHPBB3-11103
 2012-10-09 22:02:49 -05:00
Nathan Guse
948bd69495 [ticket/11103] Move UCP Notification Options to Board Preferences tab 
Also rename to "Edit notification options" for consistency

PHPBB3-11103
 2012-10-05 13:54:27 -05:00
Nathan Guse
521992215c [ticket/11103] Language key needed in the UCP 
PHPBB3-11103
 2012-09-27 19:08:22 -05:00
Nathan Guse
dfb17f444a [ticket/11103] Fix module setup, add explanation to template 
PHPBB3-11103
 2012-09-27 19:04:47 -05:00
Nathan Guse
544fbe35f4 [ticket/11103] Some tweaks to the template output 
PHPBB3-11103
 2012-09-26 22:59:22 -05:00