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

501 commits

Author SHA1 Message Date
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
Joas Schilling
8a036fa3e4 [feature/soft-delete] Update restoring feature to use ajax if requested. 
Also fixes the mcp as a hole:
- displayes a success message
- gives a link to the post, if only one was restored

PHPBB3-9657
 2012-08-29 18:42:14 +02: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
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