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

2025 Commits

Author SHA1 Message Date
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
Dhruv Goel
cf556f92c9 [ticket/10308] fixes language variable name
Language variable has be renamed for better understanding

PHPBB3-10308
2012-05-10 22:54:29 +05:30
Dhruv Goel
faf232219e [ticket/10308] renames language key to USER_NO_POSTS_DELETE
language key renamed to make its usability more clearer.

PHPBB3-10308
2012-05-10 22:51:08 +05:30
Dhruv Goel
59177a86c4 [ticket/10308] fix language and user's total posts
language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
2012-05-10 22:50:13 +05:30
Dhruv Goel
8f7e85604b [ticket/10308] fixes language entity.
Language key has been changed and has been made more specific to
avoid conflicts

PHPBB3-10308
2012-05-10 22:49:24 +05:30
Dhruv Goel
239e6016a3 [ticket/10308] Displays message to user if there are no posts.
While deletng the user, if the user has no posts in addition to the
options being disabled an added message is displayed.

PHPBB3-10308
2012-05-10 22:48:32 +05:30
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
b83fa0349a [ticket/10847] fixing all misspelled "dependant" to "dependent"
PHPBB3-10847
2012-04-30 21:55:24 +02:00
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
riadhchtara
00172afa53 [ticket/10813] Installer now checks json extension
Installer now checks json extension and cannot continue without it.
Changes are made in phpBB/install/install_install.php where the
checking for json is added and to phpBB/language/en/install.php where
2 new keys for the messages that would be displayed are also added.

PHPBB3-10813
2012-04-19 17:09:56 -04:00
Dhruv Goel
249d8ede12 [ticket/10797] user rank is displayed in mcp_warn.php
When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.

PHPBB3-10797
2012-04-16 01:24:10 +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
bab32bd56a [ticket/10650] Changed apostrophe to utf8 single quote
The apostrophe in language entry DISPLAY_LAST_SUBJECT_EXPLAIN
was changed to utf8 single quote character.

PHPBB3-10650
2012-04-11 06:23:56 +05:30
Rahul R
6661c92dd3 [ticket/10650] Added apostrophe in explanation in language file
A missing apostrophe was added to the language file entry
of DISPLAY_LAST_SUBJECT_EXPLAIN

PHPBB3-10650
2012-04-09 03:22:35 +05:30
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
Rahul R
c524236ef6 [ticket/10650] Changed acp option from per forum to global
Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.

PHPBB3-10650
2012-04-08 10:34:44 +05:30
Rahul
492c27a693 [ticket/10650] Changed language files and forumlist
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
2012-04-08 10:32:59 +05:30
Rahul
9b30bd6392 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-08 10:32:19 +05:30
Oleg Pudeyev
e5ed5e033a Merge PR #718 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10764] FAQ now mentions Area51 instead of SourceForge
  [ticket/10764] FAQ now mentions GitHub instead of SourceForge
2012-04-07 22:24:24 -04:00
Adonais Romero González
04bb44ce33 [ticket/10764] FAQ now mentions Area51 instead of SourceForge
The answer of the question "Why isn't X feature available?" in
the FAQ now mentions Area51 instead of SourceForge and GitHub
as the way to handle feature requests.

PHPBB3-10764
2012-04-05 20:22:00 -05:00
Adonais Romero González
293f66d4ed [ticket/10764] FAQ now mentions GitHub instead of SourceForge
The answer of the question "Why isn't X feature available?" in the
FAQ now mentions GitHub instead of SourceForge as the way to handle
feature requests.

PHPBB3-10764
2012-04-05 19:03:08 -05:00
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
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
2012-04-04 19:23:05 -04:00
David King
b1fb34a4d7 Merge remote-tracking branch 'rahulr92/ticket/10650' into develop 2012-04-04 16:41:28 -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
Rahul
01e6254ccc [ticket/10650] Changed language files and forumlist
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
2012-04-05 00:45:50 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
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
rxu
bf0a3ddaca Merge pull request #670 from imkingdavid/feature/qrpreview
[feature/qrpreview] Preview from Quick Reply
2012-04-01 11:28:47 -07:00
David King
26a999c83c Merge remote-tracking branch 'brunoais/ticket/10705' into develop 2012-03-31 13:49:49 -04:00
Igor Wiedler
1d4253319c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10675] Add disk full language string when posting attachments
2012-03-31 19:29:56 +02:00
Igor Wiedler
3477b5e5a8 Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus
* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
2012-03-31 19:27:19 +02:00
Richard Foote
b8b342be2d [Ticket/10675] Correct language string ATTACH_DISK_FULL
Add period to ATTACH_DISK_FULL language string

PHPBB3-10675
2012-03-31 12:46:44 -04:00
Vjacheslav Trushkin
0540509f14 [feature/merging-style-components] Renaming "delete" to "uninstall" for styles
Changing from "delete" to "uninstall" in acp_styles to avoid confusing users

PHPBB3-10632
2012-03-31 17:58:17 +03:00
Vjacheslav Trushkin
398a6c8045 Merge branch 'develop' into feature/merging-style-components
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
2012-03-31 10:43:06 +03:00
David King
a7045e6572 [feature/qrpreview] Preview from Quick Reply
PHPBB3-10726
2012-03-30 21:43:00 -04: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