mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
16,278 Commits 17 Branches 190 Tags
Commit Graph

245 Commits

Author SHA1 Message Date
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
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

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
Nathan Guse
e66117409c [ticket/11103] More work on the UCP Notifications page 
PHPBB3-11103
 2012-09-26 22:39:12 -05:00
Nils Adermann
d866624ea7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10873] Change language for notice about undelivered, deleted PM.
 2012-09-01 16:11:57 +02:00
David King
92761e1f2b [ticket/10873] Change language for notice about undelivered, deleted PM. 
See the ticket for my reasoning.

PHPBB3-10873
 2012-08-21 11:59:44 -04:00
Senky
d0a1c7bf0a [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm 
PHPBB3-10568
 2012-08-02 20:08:49 +02:00
Joas Schilling
81627e2888 [feature/new-tz-handling] Remove additional marking of selected items 
PHPBB3-9558
 2012-07-18 18:59:25 +02:00
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
Andreas Fischer
85ea062a05 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10935] Limit number of PM rules per user to 5000
 2012-06-21 10:31:08 +02:00
Joas Schilling
80fafdeb1a [ticket/10935] Limit number of PM rules per user to 5000 
PHPBB3-10935
 2012-06-20 14:29:48 +02:00
Joas Schilling
66f7d45603 [feature/new-tz-handling] Introduce 2 step timezone selection using javascript 
PHPBB3-9558
 2012-06-18 15:08:57 +02:00
Joas Schilling
50936cb2ef [feature/new-tz-handling] Fix selecting and validating of timezone in UCP 
PHPBB3-9558
 2012-06-18 15:07:12 +02:00
Nils Adermann
5acbf0980d Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' into develop 
* github-dhruvgoel92/feature/delete-auto-logins:
  [feature-delete-auto-logins] adds module to database update
  [feature/delete-auto-logins] fixes style
  [feature/delete-auto-logins] improves styling
  [feature/delete-auto-logins] fixes language entry
  [feature/delete-auto-logins] fix language keys and styling
  [feature/delete-auto-logins] explain persistent keys in the ucp.
  [feature/delete-auto-logins] template added for subsilver2
  [feature/delete-auto-logins] improved styling and fixes language
  [feature/delete-auto-logins] using loop for errors
  [feature/delete-auto-logins] fixes css corners
  [feature/delete-auto-logins] Fixes language entries
  [feature/delete-auto-logins] checks form key
  [feature/delete-auto-logins] Fixes language entries and redirection.
  [feature/delete-auto-logins] User can view/delete auto logins.
 2012-06-11 23:39:09 +02:00
Joas Schilling
8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling 
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
 2012-06-04 18:09:35 +02:00
Dhruv Goel
1cfb84e61e [feature/delete-auto-logins] fixes language entry 
PHPBB3-9647
 2012-05-17 14:02:39 +05:30
Dhruv Goel
9db1ed6e80 [feature/delete-auto-logins] fix language keys and styling 
introduction of language variables instead of hardcoded language.

PHPBB3-9647
 2012-05-17 14:02:36 +05:30
Dhruv Goel
124068b0b1 [feature/delete-auto-logins] explain persistent keys in the ucp. 
a short explaination of persistent keys in edit persistent keys section

PHPBB3-9647
 2012-05-17 14:02:33 +05:30
Dhruv Goel
71f8416480 [feature/delete-auto-logins] improved styling and fixes language 
Table ahs been styled. Date is now formatted properly instead of
the unix timestamp being displayed earlier. fixes small mistake in language
entry

PHPBB3-9647
 2012-05-17 14:02:28 +05:30
Dhruv Goel
dfedc995ed [feature/delete-auto-logins] Fixes language entries 
Fixed language entries so that UI shows persistent login keys instead of
autologin keys.

PHPBB3-9647
 2012-05-17 14:02:20 +05:30
Dhruv Goel
5ce46cc960 [feature/delete-auto-logins] User can view/delete auto logins. 
User has an extra option in UCP->Profile to view the auto logins and
clear them.

PHPBB3-9647
 2012-05-17 14:02:12 +05:30
Oleg Pudeyev
03d3f9adb5 Merge PR #785 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php
 2012-05-11 02:37:25 -04:00
Senky
74e9245df3 [ticket/10835] changing "e-mail" to "email" 
PHPBB3-10835
 2012-05-11 08:09:56 +02:00
Senky
8d15f1b02e [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry 
PHPBB3-10835
 2012-05-07 08:18:50 +02:00
Senky
2dd71f6520 [ticket/10835] fixing misleading message in UCP 
PHPBB3-10835
 2012-05-01 09:52:48 +02:00
Senky
3741e99aab [ticket/10161] all "e-mail" strings in language files changed to "email" 
according to Oleg's comment:
email is preferred by RFCs and probably the way of the future

PHPBB3-10161
 2012-04-15 20:10:51 +02:00