makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
14995 commits 18 branches 192 tags 206 MiB
Commit graph

312 commits

Author SHA1 Message Date
Nathan Guse
0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-12-07 21:14:39 -06:00
Oleg Pudeyev
1823674514 Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into develop 
* dhruvgoel92/ticket/10771:
  [ticket/10771] fix remember me language
  [ticket/10771] use remember me in ucp
  [ticket/10771] use remember me in acp
  [ticket/10771] changed value in help_faq.php
  [ticket/10771] Using Remember Me instead of autologin or persistent keys
 2012-12-02 11:47:15 -05:00
Hari Sankar R
dacacbbd52 [ticket/10771] Using Remember Me instead of autologin or persistent keys 
Changed language variable LOG_ME_IN's value to
"Remember me"

PHPBB3-10771
 2012-12-02 14:51:27 +05:30
Nathan Guse
61aa53f91a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/config/services.yml
	phpBB/index.php
 2012-11-20 23:19:51 -06:00
Oleg Pudeyev
1a2dfa6d4c Merge PR #1074 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11192] Merge dataProvider arrays because the test is the same now.
  [ticket/11192] Update $value parameter description to support other types.
  [ticket/11192] Mark negative byte numbers as unsupported.
  [ticket/11192] Test strings not converted to int/float before.
  [ticket/11192] Also test strings, e.g. sums returned by the database.
  [ticket/11192] Also test powers of 10 / 1000.
  [ticket/11192] Add tests.
  [ticket/11192] Add Tebibyte to get_formatted_filesize().
 2012-11-16 10:29:22 -05:00
Andreas Fischer
c699b88bc5 [ticket/11192] Add Tebibyte to get_formatted_filesize(). 
PHPBB3-11192
 2012-11-11 14:35:31 +01:00
Nathaniel Guse
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-11-10 10:58:44 -06:00
Nathan Guse
6e7e70a18a [ticket/10780] Replace colon usage in template output with {L_COLON} 
Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.

PHPBB3-10780
 2012-11-10 00:23:03 +01:00
Nathan Guse
6861af22ee [ticket/11103] Message of no notifications if you have none 
PHPBB3-11103
 2012-10-20 19:19:26 -05:00
Nathan Guse
61a1467c90 [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link 
PHPBB3-11103
 2012-10-16 16:47:18 -05:00
Nathan Guse
a48f090338 [ticket/11103] Make sure notifications are marked read when clicking them 
How do we do this? If an item is unread, the URL to view that item will
be the URL to mark it as read (index.php?mark_notification=$id). When the
URL is visited it marks the item as read and redirects them to the correct
URL for the item.

If the item is read, the URL is directly to the item.

Prettify the html output

PHPBB-11103
 2012-10-14 12:35:35 -05:00
Nathan Guse
716635c834 [ticket/11103] Fix some language strings 
Newlines at end of email files

PHPBB3-11103
 2012-10-14 10:58:23 -05:00
Nathan Guse
1b56a1d6be [ticket/11103] Finishing up report post/pm and adding report closed 
PHPBB3-11103
 2012-10-11 22:36:48 -05:00
Nathan Guse
6d53bd4675 [ticket/11103] Finishing up PM Report notifications 
PHPBB3-11103
 2012-10-09 22:28:41 -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
07fb66ac10 [ticket/11103] Do not abbreviate template output 
PHPBB3-11103
 2012-10-04 14:31:00 -05:00
Nathan Guse
48ccc9eb93 [ticket/11103] UCP Notification Options can now be set 
PHPBB3-11103
 2012-09-27 18:25:37 -05:00
Nathaniel Guse
98731b1277 [ticket/11103] Prettify the output for prosilver. 
Create a way to mark items read from the output list.

PHPBB3-11103
 2012-09-20 10:36:11 -05:00
Nathan Guse
7454d5c2d5 [ticket/11103] Topic/Post in queue notification 
Also, bug fixes and cleanup

PHPBB3-11103
 2012-09-15 14:33:15 -05:00
Nathan Guse
05b573ebf7 [ticket/11103] Topic and post dis/approval notifications 
Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
 2012-09-15 13:51:02 -05:00
Nathan Guse
ed1ec8e720 [ticket/11103] Add/Update/Mark Read functions accept an array for the type 
This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
 2012-09-14 16:54:20 -05:00
Nathan Guse
207bbdf48c [ticket/11103] Quote notifications 
PHPBB3-11103
 2012-09-12 23:55:29 -05:00
Nathan Guse
9b1de1e487 [ticket/11103] Add topic ID to view post URL 
PHPBB3-11103
 2012-09-12 21:05:11 -05:00
Nathan Guse
3624d2c50a [ticket/11103] Use the language system, topic notifications 
PHPBB3-11103
 2012-09-09 14:20:14 -05:00
Fyorl
e1a4aa3ea2 [feature/attach-dl] Removed the use of some abbreviations 
PHPBB3-11042
 2012-08-20 21:52:42 +01:00
Fyorl
5bffd9883d [feature/attach-dl] Added links to the templates 
PHPBB3-11042
 2012-08-02 20:47:09 +01:00
Nils Adermann
147a125f69 Merge pull request #914 from EXreaction/ticket/10990 
Ticket/10990
 2012-07-22 16:25:17 -07:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate 
PHPBB3-10990
 2012-07-22 14:32:03 -05:00
Joas Schilling
656d2c34e0 [ticket/11002] Use translating option to rename the Etc/GMT options 
They have the invers offset of their name. So GMT+2 has the offset -7200.
To avoid additional confusion, we simply overwrite their name.

PHPBB3-11002
 2012-07-21 15:18:16 +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
00b5e5345d [feature/new-tz-handling] Fix displaying of "All times are" string 
PHPBB3-9558
 2012-06-18 15:07:44 +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
Oleg Pudeyev
3b6ca178aa Merge PR #721 branch 'rahulr92/ticket/10650' into develop 
* rahulr92/ticket/10650:
  [ticket/10650] Subject is cleared if no permissions exist
  [ticket/10650] Changed apostrophe to utf8 single quote
  [ticket/10650] Moving censoring to before truncation
  [ticket/10650] Added apostrophe in explanation in language file
  [ticket/10650] Inserted correct utf ELLIPSIS character
  [ticket/10650] Added space after if and comment
  [ticket/10650] Added ellipsis to language file
  [ticket/10650] Added href title to subject link
  [ticket/10650] Made use of truncate_string() function
  [ticket/10650] Removed changes from acp_forums.php
  [ticket/10650]Removed incorrect newline
  [ticket/10650] Changed acp option from per forum to global
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list

Conflicts:
	phpBB/install/database_update.php
	phpBB/language/en/common.php
 2012-05-21 23:42:48 -04: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
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