aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-1078-372/+383
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * [ticket/10780] Use L_COLON for "download all attachments".Andreas Fischer2012-11-102-3/+3
| | | | | | | | PHPBB3-10780
| * [ticket/10780] Replace colon usage in template output with {L_COLON}Nathan Guse2012-11-1072-353/+353
| | | | | | | | | | | | | | 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
| * [ticket/10172] Show prosilver birthday list even if there are no birthdays.Andreas Fischer2012-11-091-1/+1
| | | | | | | | PHPBB3-10172
| * Merge PR #717 branch 'develop-olympus' into developOleg Pudeyev2012-11-061-3/+3
| |\ | | | | | | | | | | | | * develop-olympus: [ticket/10661] Added   to enumerated recipients (prosilver)
| | * Merge PR #717 branch 'NeoAdonis/ticket/10661' into develop-olympusOleg Pudeyev2012-11-061-3/+3
| | |\ | | | | | | | | | | | | | | | | * NeoAdonis/ticket/10661: [ticket/10661] Added   to enumerated recipients (prosilver)
| | | * [ticket/10661] Added   to enumerated recipients (prosilver)Adonais Romero González2012-04-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing   to enumerated recipients after IF statements to see if it is a group or not (to_recipient.IS_GROUP and bcc_recipient.ISGROUP), in posting_editor template in prosilver style. PHPBB3-10661
| * | | Merge PR #858 branch 'callumacrae/ticket/10947' into developOleg Pudeyev2012-11-061-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10947: [ticket/10947] Fixed quickmod autosubmit functionality.
| | * | | [ticket/10947] Fixed quickmod autosubmit functionality.Callum Macrae2012-06-201-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10947
| * | | | [ticket/11018] Always display previous/next links if we can display oneJoas Schilling2012-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11018
| * | | | [ticket/11018] Fix minor issues with CSS in prosilverJoas Schilling2012-10-172-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11018
| * | | | [ticket/11018] Attempt to fix li.pagination alignment issueDrae2012-10-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is somewhat kludgy fix for the vertical alignment issue for pagination contained within a linklist parented li element. Tested and doesn't seem to impact anything else negatively. May need further browser testing. PHPBB3-11018
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-063-3/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11135] Full replacement of credit link to https Conflicts: phpBB/install/convertors/convert_phpbb20.php
| | * | | [ticket/11135] Full replacement of credit link to httpsVinny2012-10-053-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11135
| | * | | [ticket/10943] displays searched query in search resultDhruv Goel2012-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search backend displays an additional normalized search query just above the ignored words. PHPBB3-10943
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-152-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Fix the language changes that were lost previously
| | * | | | [ticket/11021] Fix the language changes that were lost previouslyNathan Guse2012-09-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change U_HOME to U_SITE_HOME PHPBB3-11021
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-152-4/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | [ticket/11021] Use L_SITE_HOME instead of L_HOMENathan Guse2012-09-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check site home url against !== '', not empty PHPBB3-11021
| | * | | | [ticket/11021] Better language strings for site home url/textNathan Guse2012-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | [ticket/11021] Add the option to specify a Site home URL and textNathan Guse2012-07-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11021
* | | | | | [feature/soft-delete] Use a beautiful recycle icon for softdeleted topicsJoas Schilling2012-11-102-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Link to delete_topics module when the topic is deletedJoas Schilling2012-11-102-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Use JS to display softdeleted/ignored postsJoas Schilling2012-11-092-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Fix deleting via post editingJoas Schilling2012-11-032-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Invert the logic on confirm boxJoas Schilling2012-11-012-49/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permanent delete is now the checkbox rather then softdelete. PHPBB3-9567
* | | | | | [feature/soft-delete] Display message when the posts are already soft deletedJoas Schilling2012-10-311-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Fix restoring/approving posts with mcp moderationJoas Schilling2012-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Allow to soft delete posts in the MCP quick moderationJoas Schilling2012-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderationJoas Schilling2012-10-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Display post delete reason if one is givenJoas Schilling2012-10-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Handle soft deleting via Delete IconJoas Schilling2012-10-241-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Use correct language when restoring topics in MCPJoas Schilling2012-10-212-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Add module for soft deleted topicsJoas Schilling2012-10-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | [feature/soft-delete] Fix several problems in the forum mcpJoas Schilling2012-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | [feature/soft-delete] Update restoring feature to use ajax if requested.Joas Schilling2012-08-292-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes the mcp as a hole: - displayes a success message - gives a link to the post, if only one was restored PHPBB3-9657
* | | | | | [feature/soft-delete] Fix displaying of "deleted post" note in viewtopicJoas Schilling2012-08-292-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | [feature/soft-delete] Remove imageset/ which was created by merge conflictJoas Schilling2012-08-292-117/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have imagesets in 3.1 anymore. PHPBB3-9657
* | | | | | [feature/soft-delete] Fix some small bugsJosh Woody2012-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To wit: using non-existing constant POST_DELETED in posting.php; first test post was initially unapproved; soft delete checkbox appeared at post time Links pointing to the wrong place. PHPBB3-9657
* | | | | | [feature/soft-delete] Add unit tests for the phpbb_visibility classJosh Woody2012-08-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unit tests for the phpbb_visibility class. Adjust the phpbb_visibility class to pass those unit tests. The changes are pretty small, actually. PHPBB3-9657
* | | | | | [feature/soft-delete] Implement the ability to soft-delete and restore postsJosh Woody2012-08-296-1/+132
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The soft delete feature seems to work. Tests are pending. A real icon is pending. Add the permissions and the interface to soft-delete posts. Also able to restore posts via the MCP queue PHPBB3-9657
* | | | | Merge remote-tracking branch 'mvinny/ticket/11065' into developAndreas Fischer2012-08-271-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/11065: [ticket/11065] Close li tag on topic display options at MCP
| * | | | | [ticket/11065] Close li tag on topic display options at MCPVinny2012-08-261-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11065
* | | | | | Merge remote-tracking branch 'Fyorl/feature/attach-dl' into developAndreas Fischer2012-08-263-7/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | [feature/attach-dl] Removed the use of some abbreviationsFyorl2012-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11042
| * | | | | | [feature/attach-dl] Added multiple attachment downloads to PMsFyorl2012-08-141-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11042
| * | | | | | [feature/attach-dl] Moved download links to bottom of topicFyorl2012-08-071-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11042
| * | | | | | [feature/attach-dl] Downloading all attachments fully implementedFyorl2012-08-042-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | [feature/attach-dl] Added links to the templatesFyorl2012-08-021-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11042
* | | | | | Merge remote-tracking branch 'mvinny/ticket/11046' into developAndreas Fischer2012-08-081-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/11046: [ticket/11046] Add border-radius for UCP message colours block