1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

249 Commits

Author SHA1 Message Date
Joas Schilling
1dfb52b805 Merge branch 'develop-olympus' into develop 2011-10-30 16:12:22 +01:00
Joas Schilling
a63490f744 Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympus 2011-10-30 16:10:45 +01:00
Marc Alexander
75a44a6970 [ticket/9778] Replaced "Find a member" with "Enter username"
When clicking on the "Users and groups" tab in the ACP, the user is
able to either enter the username of the member he wants to manage
or click on "Find a member" below the input field. Unfortunately,
the label for the input field is also "Find a member", which leads
some users to the idea that they can search for users using that
input field. By changing the label to "Enter username" this should
be clear to the user.

PHPBB3-9778
2011-10-30 15:46:52 +01:00
Nils Adermann
c5ee92c3f2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
2011-10-14 02:49:15 +02:00
Andreas Fischer
29a23ae217 [ticket/10278] Return with a timeout error when fread() or fgets() time out.
PHPBB3-10278
2011-08-25 20:34:01 +02:00
Nils Adermann
19925ad059 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10237] Also display login-box on subscribing
  [ticket/10237] Handle watching and unwatching the same way.
  [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions

Conflicts:
	phpBB/includes/functions_display.php
2011-07-16 21:57:16 -04:00
Joas Schilling
773561f862 [ticket/10237] Handle watching and unwatching the same way.
Also add some information to the confirm-box (forum_name / topic title)

PHPBB3-10237
2011-07-11 19:24:40 +02:00
Joas Schilling
b2a65ac76d [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
PHPBB3-10237
2011-07-07 12:40:35 +02:00
Andreas Fischer
09776d2302 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:55 +02:00
Andreas Fischer
e0ce73e3b8 Merge remote-tracking branch 'p/ticket/9630' into develop-olympus
* p/ticket/9630:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:31 +02:00
Oleg Pudeyev
7cbbb301e1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
  [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
2011-05-09 22:28:35 -04:00
Andreas Fischer
ccb78f74a4 [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
PHPBB3-9999
2011-05-09 23:20:17 +02:00
Oleg Pudeyev
c651948cb3 [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
PHPBB3-9630
2011-05-02 23:54:35 -04:00
Andreas Fischer
67fa589ba2 [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
PHPBB3-8802
2011-03-10 16:47:00 +01:00
Andreas Fischer
dfbd8f7de9 [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
Clicking "Mark forums read" when not browsing on the index page only marks
all subforums (and sub-sub forums etc.) read, topics in the current forum have
to marked seperately by clicking the "Mark topics read" link.

Let's indicate this circumstance by using the word "subforums".

PHPBB3-8802
2011-03-10 16:28:46 +01:00
Chris Smith
dd1532a72c [ticket/9752] Mark unused language variable as such.
PHPBB3-9752
2010-11-07 02:16:56 +00:00
narqelion
576de284a7 [ticket/9752] Change reference to 'confirmation code' to be more generic.
Related to 71b35a924f7a5f517e8d07d975582c27813f5797

PHPBB3-9752
2010-11-07 02:15:33 +00:00
rxu
257e264af7 [ticket/9478] Validate maximum number of allowed recipients per PM value.
Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8).

PHPBB3-9478
2010-10-25 21:47:13 +02:00
Joas Schilling
954b3c3484 [ticket/7720] Fix alternative image-description for unread posts.
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.

PHPBB3-7720
2010-07-14 20:55:07 +02:00
Nils Adermann
8f91e6ce8b Merge branch 'ticket/nickvergessen/9135' into develop-olympus
* ticket/nickvergessen/9135:
  [ticket/9135] Fix report-icon for moderators in PM folders.
2010-05-30 14:58:30 +02:00
Joas Schilling
9e24993855 [ticket/9135] Fix report-icon for moderators in PM folders.
There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users.

PHPBB3-9135
2010-05-26 01:38:19 +02:00
Andreas Fischer
327f9afbc0 [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
No longer use LDAP_NO_SERVER_CONNECTION in case ldap_search() fails.
Add and use LDAP_SEARCH_FAILED instead, so users can tell the difference
between ldap_connect() failing and ldap_search() failing.

PHPBB3-8792
2010-05-16 23:05:13 +02:00
Andreas Fischer
64b4a8bd44 No longer needed, as of r10480.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10481 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-07 00:50:21 +00:00
Joas Schilling
7a1b507fa6 Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.
Authorised by: bantu


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10441 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 15:57:10 +00:00
Andreas Fischer
ad7e3ccf4c Integrate active topics feed. Some language adjustments and rearrangements.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10382 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-27 00:48:52 +00:00
Meik Sievertsen
4739c7ba39 [Feature] Added new functionality to inactive users module:
- Ability to set users per page.
- Ability to sort by posts/number of reminders/last reminded date.
- Show number of posts and ability to search posts.
- Show number of reminders sent to user.
- Show date of last reminder sent to user.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9845 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-24 11:13:32 +00:00
Ruslan Uzdenov
51748b00ed Fix bug #46765 - View unread posts
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9755 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-14 14:46:38 +00:00
Meik Sievertsen
1c0df0dc91 revert r9653 because it does not work as advertised (a load of bugs and not really what we wanted... back to the drawing board ;))
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9674 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-25 17:57:57 +00:00
Ruslan Uzdenov
bfcf6a1de5 Fix bug #46765 - View unread posts
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9653 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-22 14:36:04 +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
0d626d77bf Fix bug #46865 - Add unapproved topic icon for moderators on forum list
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9635 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-20 16:51:01 +00:00
Andreas Fischer
6e884de000 Follow coding guidelines for language strings (Related to r9575, Bug #46875 - Patch for acp/board by Raimon).
Authorised by: naderman

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9631 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 15:30:38 +00:00
Meik Sievertsen
863d7a7614 First ATOM Feed commit/integration
- Idea and original RSS Feed 2.0 MOD (Version 1.0.8/9) by leviatan21

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9575 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-12 14:41:03 +00:00
Meik Sievertsen
9134cb2175 remove hardcoded size unit for PHP_SIZE_OVERRUN error (Bug #29935)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9464 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-17 15:52:40 +00:00
Meik Sievertsen
93b3103c31 Use L_EMAIL variants consistently... also added comments for translators to indicate where which variant is used (Bug #39495)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9452 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-17 13:05:11 +00:00
Meik Sievertsen
d4a7d7a8ad Use "less than a minute ago" instead of "0 minutes ago"
Use "Sent: {DATE}" in pm's, instead of "Sent at: {DATE}"

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9162 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-03 11:18:31 +00:00
Meik Sievertsen
a752a424de [Change] Performance increase for format_date() (Bug #37575 - Patch by BartVB)
[Change] Changed prosilver date separator from 'on' to '»'
[Feature] Added 'AGO' setting to relative date strings. For example: posted 14 minutes ago. (Patch by BartVB)
[Fix] Extend vertical line for last post column if no posts in forum (Bug #37125)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9136 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-30 14:36:59 +00:00
Meik Sievertsen
7ded9151f7 two tiny glitches in language file
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9046 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-02 16:19:11 +00:00
Chris Smith
a203d52e4f Small language fixes, one for r8989
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9001 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-11 16:35:27 +00:00
Meik Sievertsen
94f0047a9b Add two standard language items - #30885
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8989 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 15:31:56 +00:00
Chris Smith
92c759456d Small language fix (#32795) and tiny bug fix
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8949 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 21:29:05 +00:00
Meik Sievertsen
54af1cb64a nullar/singular/plural substitution support. At the moment only the added language entry supports this... we may change other language entries later to support this new "approach". Idea from SHS` and Ashe originally.
More to come... (yes, 3.0.x branch, no mistake)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8800 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-31 21:47:26 +00:00
Henry Sudhof
f56391d5f7 as per evil3, some more anti-CSRF
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8775 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-21 15:41:12 +00:00
Meik Sievertsen
da65cd1397 only some space/tab changes as well as removing my debug code from the template file. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8761 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-16 13:03:00 +00:00
Henry Sudhof
e47f088fa5 better strings for NO_MODERATORS/NO_ADMINISTRATORS
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8736 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-31 09:58:48 +00:00
Henry Sudhof
6a47f198ff Wow, a new time zone at this time and age. #30545
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8704 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-28 16:51:01 +00:00
Henry Sudhof
fc12c00219 And more new features for reasonable paranoia.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8555 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-15 14:10:11 +00:00
Henry Sudhof
976e83351a #24105 - Quite compliacted lang changes, translators will complain :|
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8474 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-03-27 13:17:58 +00:00
Meik Sievertsen
6accc46024 some language/style/code fixes (refer to the diff of the changelog)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8389 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-23 13:18:33 +00:00
Meik Sievertsen
9114de0a0f "short" variant of locked to be placed "behind" a button.
git-svn-id: file:///svn/phpbb/trunk@8230 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-06 14:55:23 +00:00