Commit graph

1857 commits

Author SHA1 Message Date
Nathan Guse
c5f280351a [ticket/11103] UCP Notification option grouping
Also add the ability to specify an _EXPLAIN text for the notification option

PHPBB3-11103
2012-10-13 23:52:49 -05:00
Nathan Guse
cb93784126 [ticket/11103] UCP Notification List
PHPBB3-11103
2012-10-13 20:02:38 -05:00
Nathan Guse
94a3dc5ff7 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-12 17:09:12 -05:00
Oleg Pudeyev
59281f1b0a Merge PR #973 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:38 -04:00
Oleg Pudeyev
68641aab93 Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus
* bantu/ticket/11069:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:17 -04:00
Nathaniel Guse
98a7ce2360 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-09 09:38:08 -05:00
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Nathan Guse
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header
PHPBB3-11103
2012-10-05 13:43:03 -05:00
Nathan Guse
07fb66ac10 [ticket/11103] Do not abbreviate template output
PHPBB3-11103
2012-10-04 14:31:00 -05:00
Nathan Guse
ba7289b9d2 [ticket/11103] Use PM Notification Preferences from Notification Options
Remove all PM Notification preferences from UCP Board Preferences

PHPBB3-11103
2012-09-27 19:19:38 -05:00
Nathan Guse
dfb17f444a [ticket/11103] Fix module setup, add explanation to template
PHPBB3-11103
2012-09-27 19:04:47 -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
ae91a0a846 [ticket/11103] Allow grouping of multiple types in ucp notification options
Ability to hide notification types from UCP Notification options
(if users do not have permission to use the notification type, or for
whatever reason they should not see it)

PHPBB3-11103
2012-09-27 10:37:37 -05:00
Nathan Guse
544fbe35f4 [ticket/11103] Some tweaks to the template output
PHPBB3-11103
2012-09-26 22:59:22 -05:00
Nathan Guse
e66117409c [ticket/11103] More work on the UCP Notifications page
PHPBB3-11103
2012-09-26 22:39:12 -05:00
Nathaniel Guse
a8e53bda36 [ticket/11103] Display number of notifications in the [ Notifications ] link
PHPBB3-11103
2012-09-25 10:10:49 -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
661dd09d6f [ticket/11103] Bug fix
PHPBB3-11103
2012-09-16 23:03:00 -05:00
Nathan Guse
b081729f25 [ticket/11103] Revert the changes to functions_display.php
The css we need to apply to avatars can be applied through css rules.
We don't need to be able to specify a class for the img.

PHPBB3-11103
2012-09-15 14:47:58 -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
fc6457140c Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-09-15 12:00:21 -05:00
Andreas Fischer
9a92c45ad3 Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
2012-09-15 18:31:13 +02:00
Nathan Guse
9e5505933a [ticket/11021] Fix the language changes that were lost previously
Change U_HOME to U_SITE_HOME

PHPBB3-11021
2012-09-15 11:28:58 -05:00
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00
Nathan Guse
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME
Check site home url against !== '', not empty

PHPBB3-11021
2012-09-15 10:44:18 -05:00
Nathan Guse
0c56bd45ef [ticket/11021] Better language strings for site home url/text
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
2012-09-15 10:28:37 -05:00
Nathan Guse
aaf6711b44 [ticket/11103] Some tweaks to the notifications output
PHPBB3-11103
2012-09-15 10:15:50 -05:00
Nathan Guse
7589a3093d [ticket/11103] Display all unread notifications by default
Add unread count to the page title

PHPBB3-11103
2012-09-14 18:30:12 -05:00
Nathan Guse
fb0ed78c8f [ticket/11103] Store the item's parent id for marking things read
Mark topics/posts read from the markread() function.

Identify unread items by a grey background in the header (for now)

PHPBB3-11103
2012-09-14 15:59:13 -05:00
Nathan Guse
5502f3c4aa [ticket/11103] Restyle the notification list
Very rough (lots of inline CSS, very ugly)

PHPBB3-11103
2012-09-09 17:20:39 -05:00
Nathan Guse
e45fb0025e [ticket/11103] Output the notifications to the template
For now, just dumping the notifications in the header.

PHPBB3-11103
2012-09-08 12:05:55 -05:00
Andreas Fischer
1128ff1e58 Merge remote-tracking branch 'mvinny/ticket/11065' into develop
* mvinny/ticket/11065:
  [ticket/11065] Close li tag on topic display options at MCP
2012-08-27 01:35:46 +02:00
Vinny
7cf49a810f [ticket/11065] Close li tag on topic display options at MCP
PHPBB3-11065
2012-08-26 20:24:53 -03:00
Andreas Fischer
d0ce637251 Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop
* Fyorl/feature/attach-dl: (75 commits)
  [feature/attach-dl] Removed the use of some abbreviations
  [feature/attach-dl] Changed $files_added checks
  [feature/attach-dl] Renamed $post_id to $post_msg_id
  [feature/attach-dl] Fixed a comment
  [feature/attach-dl] Optimised an sql query
  [feature/attach-dl] Fixed the logic in an sql statement
  [feature/attch-dl] $forum_id cast to int
  [feature/attach-dl] Fixed $file_added to $files_added
  [feature/attach-dl] Moved definition of $archive_name
  [feature/attach-dl] Swapped the order of an if statement
  [feature/attach-dl] Cast variables to int
  [feature/attach-dl] Added $archive_path
  [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
  [feature/attach-dl] Renamed $count to $files_added
  [feature/attach-dl] Removed sprintf() use
  [feature/attach-dl] Removed need for array_keys()
  [feature/attach-dl] Added multiple attachment downloads to PMs
  [feature/attach-dl] Removed reliance on current($row)
  [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
  [feature/attach-dl] Moved PM authentication handling into own function
  ...
2012-08-26 18:56:09 +02:00
Andreas Fischer
c83ca457a0 [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
Regression from 0ceb77fb99.

PHPBB3-11069
2012-08-26 17:20:45 +02:00
Fyorl
e1a4aa3ea2 [feature/attach-dl] Removed the use of some abbreviations
PHPBB3-11042
2012-08-20 21:52:42 +01:00
Fyorl
39676d513e [feature/attach-dl] Added multiple attachment downloads to PMs
PHPBB3-11042
2012-08-14 13:21:00 +01:00
Dhruv Goel
2ba1cef5b0 [ticket/10943] displays searched query in search result
Search backend displays an additional normalized search query just above
the ignored words.

PHPBB3-10943
2012-08-11 02:26:46 +05:30
Andreas Fischer
4b8eac02f0 Merge remote-tracking branch 'mvinny/ticket/11046' into develop
* mvinny/ticket/11046:
  [ticket/11046] Add border-radius for UCP message colours block
2012-08-08 09:30:57 +02:00
Vinny
e716c8fe83 [ticket/11047] Close TOTAL_MESSAGES at ucp_pm_viewfolder.html
This problem only occurs in prosilver
With the variable unclosed, the language key isnt displayed

PHPBB3-11047
2012-08-07 21:20:18 -03:00
Vinny
321b1f1a39 [ticket/11046] Add border-radius for UCP message colours block
PHPBB3-11046
2012-08-07 20:59:34 -03:00
Fyorl
3d68a6953e [feature/attach-dl] Moved download links to bottom of topic
PHPBB3-11042
2012-08-07 12:03:47 +01:00
Fyorl
ee7d9614c0 [feature/attach-dl] Downloading all attachments fully implemented
Added a function to list all available archiving methods and integrated
it with the prosilver style.

Heavy modifications to download/file.php to support archiving and
downloading of multiple files at once.

PHPBB3-11042
2012-08-04 13:18:20 +01:00
Fyorl
5bffd9883d [feature/attach-dl] Added links to the templates
PHPBB3-11042
2012-08-02 20:47:09 +01:00
Andreas Fischer
fa06b779ad Merge remote-tracking branch 'nickvergessen/ticket/11004' into develop
* nickvergessen/ticket/11004:
  [ticket/11004] Always update suggestion button in timezone_preselect_select
  [ticket/11003] Ability to show full list of timezones with JavaScript enabled
  [ticket/11004] Make suggestion button a real button and fix it's value
2012-08-02 12:10:26 +02:00
Matt Friedman
edec4a492e [ticket/11025] Add underline for hover to classes
PHPBB3-11025
2012-07-23 18:47:23 -07:00
Matt Friedman
4ff644890a [ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
PHPBB3-11025
2012-07-23 18:43:28 -07:00
Matt Friedman
8c337a260b [ticket/11025] Replace <b> with <strong> and/or class for semantic styling
PHPBB3-11025
2012-07-23 18:33:32 -07:00
Matt Friedman
eeb7b1bac3 [ticket/11025] Make last topic titles in forum list Bold
This small style tweak will make the truncated last topic titles
shown in the forum list BOLD for better visual impact.

PHPBB3-11025
2012-07-23 17:08:40 -07:00