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

2369 commits

Author SHA1 Message Date
Marc Alexander
5289dc52a3 [feature/avatars] Add support for modularized avatars to ucp groups 
This seems to be the last component where the new avatars system was still
missing.

PHPBB3-10018
 2012-11-22 00:00:45 +01:00
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
Marc Alexander
7521c077a9 [feature/avatars] Miscellaenous template fixes 
PHPBB3-10018
 2012-11-18 23:16:37 +01:00
Marc Alexander
959bc183bf [feature/avatars] Handle deletion of avatars 
Previously this wasn't handled correctly if at all.

PHPBB3-10018
 2012-11-18 23:09:09 +01:00
Marc Alexander
5d0a20bbb6 [feature/avatars] Add missing language variables for avatars 
PHPBB3-10018
 2012-11-16 23:07:51 +01:00
Oleg Pudeyev
9c86f70b4a Merge PR #1041 branch 'cyberalien/ticket/11175' into develop 
* cyberalien/ticket/11175:
  [ticket/11175] Add microdata to prosilver
  [ticket/11175] Add microdata to subsilver2
 2012-11-15 22:09:52 -05:00
Nathan Guse
d2187424da Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
 2012-11-14 11:33:24 -06:00
Marc Alexander
b91702665a [feature/avatars] Add barebone gravatar driver 
PHPBB3-10018
 2012-11-13 23:22:56 +01:00
Marc Alexander
5f15c98c1d [ticket/11197] Prefix the css classes for the small arrow with "arrow" 
It does not make sense to have classes named "right" and "left" produce a
small arrow next to text. It should be made clear that an arrow will
appear.

PHPBB3-11197
 2012-11-13 20:57:34 +01:00
Andreas Fischer
607865d97a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10879] Remove arrow icon from attachment link in editor
 2012-11-13 20:36:18 +01:00
Marc Alexander
170967c48a [ticket/10879] Remove arrow icon from attachment link in editor 
If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.

PHPBB3-10879
 2012-11-13 20:26:49 +01:00
Marc Alexander
4c4b82416b [feature/avatars] Replace colon usage with {L_COLON} 
PHPBB3-10018
 2012-11-12 15:08:46 +01:00
Marc Alexander
4c9820d1ca [feature/avatars] add missing html closing tags and fix tabbing 
PHPBB3-10018
 2012-11-12 15:08:36 +01:00
Marc Alexander
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars 
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
 2012-11-12 14:57:28 +01:00
Vjacheslav Trushkin
f72eaa0d95 [ticket/11175] Add microdata to prosilver 
Add breadcrumb microdata to prosilver

PHPBB3-11175
 2012-11-11 11:15:48 +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
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
 2012-11-10 12:27:19 +01:00
Joas Schilling
6e93fee9d2 [feature/soft-delete] Link to delete_topics module when the topic is deleted 
PHPBB3-9567
 2012-11-10 11:55:06 +01:00
Andreas Fischer
d87904ae76 [ticket/10780] Use L_COLON for "download all attachments". 
PHPBB3-10780
 2012-11-10 00:27:37 +01: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
Andreas Fischer
5ae546e02f [ticket/10172] Show prosilver birthday list even if there are no birthdays. 
PHPBB3-10172
 2012-11-09 17:41:53 +01:00
Joas Schilling
1c584ef8ba [feature/soft-delete] Use JS to display softdeleted/ignored posts 
PHPBB3-9567
 2012-11-09 11:46:17 +01:00
Oleg Pudeyev
17c43fcd70 Merge PR #717 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10661] Added   to enumerated recipients (prosilver)
 2012-11-06 20:34:01 -05:00
Oleg Pudeyev
c08b7385c2 Merge PR #717 branch 'NeoAdonis/ticket/10661' into develop-olympus 
* NeoAdonis/ticket/10661:
  [ticket/10661] Added   to enumerated recipients (prosilver)
 2012-11-06 20:33:48 -05:00
Oleg Pudeyev
f941a5cc2d Merge PR #858 branch 'callumacrae/ticket/10947' into develop 
* callumacrae/ticket/10947:
  [ticket/10947] Fixed quickmod autosubmit functionality.
 2012-11-06 12:00:39 -05:00
Joas Schilling
dfcfccf537 [feature/soft-delete] Fix deleting via post editing 
PHPBB3-9567
 2012-11-03 22:53:54 +01:00
Joas Schilling
bed82bf2bd [feature/soft-delete] Invert the logic on confirm box 
Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
 2012-11-01 22:23:35 +01:00
Joas Schilling
8d05dad634 [feature/soft-delete] Display message when the posts are already soft deleted 
PHPBB3-9567
 2012-10-31 21:28:06 +01:00
Joas Schilling
18dec1026a [feature/soft-delete] Fix restoring/approving posts with mcp moderation 
PHPBB3-9567
 2012-10-31 14:09:23 +01:00
Joas Schilling
f0e2d21f8c [feature/soft-delete] Allow to soft delete posts in the MCP quick moderation 
PHPBB3-9567
 2012-10-30 21:46:04 +01:00
Joas Schilling
4a8d38aab1 [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderation 
PHPBB3-9567
 2012-10-27 17:12:34 +02:00
Joas Schilling
7b3d794cad [feature/soft-delete] Display post delete reason if one is given 
PHPBB3-9567
 2012-10-24 19:58:28 +02:00
Joas Schilling
f21fd469bc [feature/soft-delete] Handle soft deleting via Delete Icon 
PHPBB3-9567
 2012-10-24 19:52:16 +02:00
Joas Schilling
e7a137820b [feature/soft-delete] Use correct language when restoring topics in MCP 
PHPBB3-9567
 2012-10-21 22:30:20 +02:00
Nathan Guse
4874226b6e [ticket/11103] Re-add notify method to the UCP preferences 
I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
 2012-10-20 22:11:41 -05: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
883a961720 [ticket/11103] Use e.preventDefault(); 
PHPBB3-11103
 2012-10-18 18:25:26 -05:00
Joas Schilling
ada2d4c91b [ticket/11018] Always display previous/next links if we can display one 
PHPBB3-11018
 2012-10-17 23:33:19 +02:00
Nathan Guse
0d098ae5e5 [ticket/11103] Return false to prevent appending # to the URL 
PHPBB3-11103
 2012-10-16 18:14:06 -05:00
Nathan Guse
3557b39115 [ticket/11103] Hide notifications flyout on a click outside of the list. 
PHPBB3-11103
 2012-10-16 17:31:48 -05:00
Nathan Guse
901739b0c6 [ticket/11103] Fix some style code I missed in prosilver 
PHPBB3-11103
 2012-10-16 17:28:08 -05:00
Nathan Guse
ee00688829 [ticket/11103] Restyling notifications list for prosilver 
PHPBB3-11103
 2012-10-16 16:47:45 -05:00
Nathaniel Guse
c8b66a26ef [ticket/11103] Mark read link if notification has no URL to view it 
Other style stuff

PHPBB3-11103
 2012-10-16 10:51:07 -05:00
Joas Schilling
33073fafbe [feature/soft-delete] Add module for soft deleted topics 
Unapproved/soft deleted posts are posts, that have a different visibility than
the topic. All others will be hidden from the posts list and can be managed
with the topic modules.

PHPBB3-9567
 2012-10-15 15:53:32 +02:00
Nathan Guse
2284a14813 [ticket/11103] If notification display is disabled, show PM Info in header 
PHPBB3-11103
 2012-10-14 13:45:00 -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
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
Joas Schilling
18f77020e5 [feature/soft-delete] Fix several problems in the forum mcp 
PHPBB3-9567
 2012-10-10 23:10:46 +02:00