1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00

218 Commits

Author SHA1 Message Date
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
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
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
Joas Schilling
14af18cb1b [ticket/9361] View correct error messages when editing account information
Currently the "current password" is only checked, when you change something.
This means you get "Your profile has been updated." although you enter a wrong
password. I also added proper error messages, when you leave the confirm fields
empty, and sorted them in the order of the field appearances on the html page.

PHPBB3-9361
2011-11-14 18:54:12 +01:00
Andreas Fischer
c49dce2be3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
2011-06-09 12:47:27 +02:00
Andreas Fischer
f7578e29b3 Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympus
* naderman/ticket/10005:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
2011-06-09 12:47:26 +02:00
Nils Adermann
a30ec6e052 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
2011-06-05 01:58:52 +02:00
Nils Adermann
7b10f859de [ticket/10005] Add validation of dropdown custom profile field values
PHPBB3-10005
2011-06-02 08:49:59 +02:00
Joas Schilling
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful.
PHPBB3-10158
2011-05-23 12:03:04 +02:00
Henry Sudhof
d779e1267d #50985 - fix XML export of private messages sent to deleted users
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10329 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-13 14:03:45 +00:00
Henry Sudhof
bf63d6cf10 rollback; will be in 3.0.7
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10138 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-11 14:38:23 +00:00
Henry Sudhof
e4e59b3b65 #50985
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10136 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-11 13:53:56 +00:00
Meik Sievertsen
6cd6a907c7 Separate PM Reply and PM Reply to all in prosilver.
Style changes by dhn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9919 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-04 14:15:13 +00:00
Nils Adermann
00e81e704d fix mcp sorting for pm_reports, and some minor language changes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9830 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-22 13:33:54 +00:00
Marek A. R
1bc805f4ad #47665
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9784 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-18 23:15:25 +00:00
Meik Sievertsen
433de350c0 - [Feature] New "Newly Registered Users" group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts.
- [Feature] Ability to define if the "Newly Registered Users" group will be assigned as the default group to newly registered users.

As a coincidence also Bug #46535 got fixed.
Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-20 18:45:16 +00:00
Joas Schilling
d85a5ad036 Fix bug #46785 - Hide avatars if type disabled and give global option to turn on/off
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9632 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 22:03:19 +00:00
Joas Schilling
d978dae5a1 Fix bug #19945 - Wrong description in UCP group managment implicates missing feature
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9613 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-18 11:01:37 +00:00