1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

379 Commits

Author SHA1 Message Date
Oleg Pudeyev
2a92fee06d Merge PR #753 branch 'Senky/ticket/10161' into develop
* Senky/ticket/10161:
  [ticket/10161] added fullstop to the end of sentence
  [ticket/10161] coding-guidelines.html updated
  [ticket/10161] all "e-mail" strings in language files changed to "email"
2012-04-26 22:57:30 -04:00
Nils Adermann
57547c7e20 Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympus
* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
2012-04-20 01:11:00 +02:00
Nils Adermann
6ae68a3eb5 Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop
* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
2012-04-20 01:08:21 +02:00
Dhruv Goel
90fc8fe59f [ticket/10797] language key rank moved to common
Language key RANK moved from memberlist to common.
Removed from mcp language.

PHPBB3-10797
2012-04-20 04:30:42 +05:30
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
Rahul R
db275d0a90 [ticket/10650] Inserted correct utf ELLIPSIS character
Inserted the correct utf-8 ellipsis to the language file.

PHPBB3-10650
2012-04-09 02:51:18 +05:30
Rahul R
303748b02d [ticket/10650] Added space after if and comment
Added space in proper places in database_update.php. Also
corrected language entry of ELLIPSIS to utf8

PHPBB3-10650
2012-04-09 01:43:44 +05:30
Rahul R
2dec700aab [ticket/10650] Added ellipsis to language file
Added ELLIPSIS to language file common.php and also corrected
language explanation of ACP option.

PHPBB3-10650
2012-04-08 22:52:49 +05:30
Oleg Pudeyev
713e7129e2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10508] Marked as read message now less specific.
2012-04-05 15:35:19 -04:00
Oleg Pudeyev
30093d6e86 Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympus
* Fyorl/ticket/10508:
  [ticket/10508] Marked as read message now less specific.
2012-04-05 15:35:12 -04:00
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
Fyorl
0df3f1c5d0 [ticket/10508] Marked as read message now less specific.
Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
2012-04-04 02:51:28 +08:00
Igor Wiedler
27199bb509 [feature/ajax] Generic error handling with a phpbb.alert box
PHPBB3-10270
2012-03-31 02:09:26 +02:00
Callum Macrae
f9ddeacd8e [ticket/10272] Renamed l-err-processing-req to l-timeout-processing-req.
PHPBB3-10272
2012-03-31 02:09:22 +02:00
Callum Macrae
0e55b2393d [ticket/10270] Removed all the inline language and HTML from the JS.
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
420de9c9a0 [ticket/10270] Moved some HTML from the JavaScript to overall_footer.
PHPBB3-10270
2012-03-31 02:09:14 +02:00
Callum Macrae
8a28456f75 [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).
This commit AJAXifies the moderator approval functionality, and adds it to
viewtopic instead of the MCP. This commit has involved some language changes,
which may affect fallbacks.

PHPBB3-10273
2012-03-31 02:00:22 +02:00
David King
a0131b45f5 [ticket/10586] Extension front controller
Handle extension front pages

PHPBB3-10586
2012-03-19 09:12:31 -04: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
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
Oleg Pudeyev
ccf0cf649d [ticket/10535] Delete no longer needed email confirm language entries.
PHPBB3-10535
2012-02-03 16:14:56 -05:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +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
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
Joas Schilling
0734dd3c42 [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
This message was only viewed for 1 second anyway,
as floor($delta / 60) is only 60 for 3600 to 3660,
but the code was limited to $delta <= 3600

PHPBB3-10345
2011-11-25 15:04:31 -05:00
Joas Schilling
f16d72fcfb [ticket/10345] Fix documentation on the new function and the switch
Also do not min/max the value, but throw an error on an invalid Plural rule.

PHPBB3-10345
2011-11-25 15:04:31 -05:00
Joas Schilling
757fcd3e63 [ticket/10345] Add a system to allow multiple plural forms
See http://wiki.phpbb.com/Plural_Rules for explanation and examples.

PHPBB3-10345
2011-11-25 15:04:30 -05:00
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