makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
32130 commits 18 branches 192 tags 207 MiB
Commit graph

333 commits

Author SHA1 Message Date
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
Nathan
b25efd744d [ticket/8323] Only disable administrative deactivated accounts from receiving PMs 
Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation)

PHPBB3-8323
 2012-07-10 17:41:27 -05:00
Nathan
c38bb4254a [ticket/8323] Do not allow sending of Private Messages to users who are banned 
PHPBB3-8323
 2012-07-10 12:34:38 -05:00
Nathan
05452b9ec0 [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages 
PHPBB3-8323
 2012-07-10 12:34:37 -05: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
Oleg Pudeyev
e8e5d2b2c0 [feature/new-tz-handling] Removed DST and numeric timezone-related language. 
PHPBB3-9558
 2012-03-14 22:57:31 -04:00
Oleg Pudeyev
da8009603d [feature/new-tz-handling] Preselect a timezone in registration. 
Use Javascript to obtain client's timezone offset and select the
first timezone in our list with that offset.

Changes for prosilver only. The javascript file should be shared
between styles.

PHPBB3-9558
 2012-03-14 22:57:31 -04:00
Oleg Pudeyev
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop 
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
 2012-02-03 16:21:51 -05:00
Unknown
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2012-01-02 19:10:27 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
David King
d73c3a297e [ticket/10535] Removed email confirm from UCP, removed unused language entries 
PHPBB3-10535
 2011-12-15 23:15:24 +00:00
Joas Schilling
3788326d71 [ticket/10345] Remove more useless 0-cases 
PHPBB3-10345
 2011-11-25 15:10:51 -05:00
Joas Schilling
7da6826a67 [ticket/10345] Remove some unused 0 cases 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
c4aa8d8401 [ticket/10345] Fix some last use cases of sprintf() to use $user->lang() 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places. 
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.

PHPBB3-10345
 2011-11-25 15:10:49 -05:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places 
PHPBB3-10345
 2011-11-25 15:10:44 -05:00
Andreas Fischer
2761a993ff Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9361] View correct error messages when editing account information
 2011-11-14 19:01:15 +01:00