Skip to content

Commit

Permalink
Merge pull request #460 from marc1706/ticket/449
Browse files Browse the repository at this point in the history 
[ticket/449] Prepare package for 2.1.0-RC2 release
  • Loading branch information
@marc1706
marc1706 committed Feb 7, 2015
2 parents 771fcfe + 3d1ede7 commit 4f5fdeb
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 14 deletions.
6 changes: 3 additions & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"type": "phpbb-extension",
"description": "Adds a portal with several blocks to your forum. You can change the settings, move the blocks, add new blocks and more in the ACP.",
"homepage": "http://www.board3.de",
"version": "2.1.0-rc1",
"time": "2014-11-26 14:23:15",
"version": "2.1.0-rc2",
"time": "2015-02-07 16:41:42",
"license": "GPL-2.0",
"authors": [{
"name": "Marc Alexander",
Expand All @@ -28,7 +28,7 @@
"extra": {
"display-name": "Board3 Portal",
"soft-require": {
"phpbb/phpbb": ">=3.1.2,<3.2.*@dev"
"phpbb/phpbb": ">=3.1.3,<3.2.*@dev"
},
"version-check": {
"host": "board3.de",
Expand Down
25 changes: 25 additions & 0 deletions migrations/v210_rc2.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php
/**
*
* @package Board3 Portal v2.1
* @copyright (c) 2015 Board3 Group ( www.board3.de )
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/

namespace board3\portal\migrations;

class v210_rc2 extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array('\board3\portal\migrations\v210_rc1');
}

public function update_data()
{
return array(
array('config.update', array('board3_portal_version', '2.1.0-rc2')),
);
}
}
8 changes: 4 additions & 4 deletions styles/prosilver/template/portal/modules/clock_side.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
<div class="portal-clock">
<div class="portal-clock-back">
<div class="portal-clock-back-upper">
<img class="portal-clock-spacer-up" alt="" /><div class="portal-clock-back-hours-up"></div>
<div class="portal-clock-spacer-up"></div><div class="portal-clock-back-hours-up"></div>
<div class="portal-clock-back-minutes-up-left" ></div><div class="portal-clock-back-minutes-up-right"></div>
<div class="portal-clock-back-seconds-up-left"></div><div class="portal-clock-back-seconds-up-right"></div>
</div>
<div class="portal-clock-back-lower">
<img class="portal-clock-spacer-down" alt="" /><div class="portal-clock-back-hours-down"></div>
<div class="portal-clock-spacer-down"></div><div class="portal-clock-back-hours-down"></div>
<div class="portal-clock-back-minutes-down-left"></div><div class="portal-clock-back-minutes-down-right"></div>
<div class="portal-clock-back-seconds-down-left"></div><div class="portal-clock-back-seconds-down-right"></div>
</div>
</div>
<div class="portal-clock-front">
<div class="portal-clock-front-upper">
<img class="portal-clock-spacer-up" alt="" /><div class="portal-clock-front-hours-up"></div>
<div class="portal-clock-spacer-up"></div><div class="portal-clock-front-hours-up"></div>
<div class="portal-clock-front-minutes-up-left"></div><div class="portal-clock-front-minutes-up-right"></div>
<div class="portal-clock-front-seconds-up-left"></div><div class="portal-clock-front-seconds-up-right"></div>
</div>
<div class="portal-clock-front-lower">
<img class="portal-clock-spacer-down" alt="" /><div class="portal-clock-front-hours-down"></div>
<div class="portal-clock-spacer-down"></div><div class="portal-clock-front-hours-down"></div>
<div class="portal-clock-front-minutes-down-left"></div><div class="portal-clock-front-minutes-down-right"></div>
<div class="portal-clock-front-seconds-down-left"></div><div class="portal-clock-front-seconds-down-right"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion styles/prosilver/template/portal/portal_body.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</div>

<!--// board3 Portal by www.board3.de //-->
<div class="copyright">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2014 Board3 Group</div>
<div class="copyright">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2015 Board3 Group</div>

<!-- INCLUDEJS portal/assets/jquery.getscrollbarwidth.js -->
<!-- INCLUDEJS portal/assets/portal.js -->
Expand Down
2 changes: 1 addition & 1 deletion styles/prosilver/theme/portal.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ a.portal-forumtitle {
}

.portal-side-wrapper {
border-left: 0;
border-left: 0 !important;
width: 100%;
}

Expand Down
8 changes: 4 additions & 4 deletions styles/subsilver2/template/portal/modules/clock_side.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
<div id="portal-clock">
<div id="portal-clock-back">
<div id="portal-clock-back-upper">
<img class="portal-clock-spacer-up" /><div id="portal-clock-back-hours-up"></div>
<div class="portal-clock-spacer-up"></div><div id="portal-clock-back-hours-up"></div>
<div id="portal-clock-back-minutes-up-left" ></div><div id="portal-clock-back-minutes-up-right"></div>
<div id="portal-clock-back-seconds-up-left"></div><div id="portal-clock-back-seconds-up-right"></div>
</div>
<div id="portal-clock-back-lower">
<img class="portal-clock-spacer-down" /><div id="portal-clock-back-hours-down"></div>
<div class="portal-clock-spacer-down"></div><div id="portal-clock-back-hours-down"></div>
<div id="portal-clock-back-minutes-down-left"></div><div id="portal-clock-back-minutes-down-right"></div>
<div id="portal-clock-back-seconds-down-left"></div><div id="portal-clock-back-seconds-down-right"></div>
</div>
</div>
<div id="portal-clock-front">
<div id="portal-clock-front-upper">
<img class="portal-clock-spacer-up" /><div id="portal-clock-front-hours-up"></div>
<div class="portal-clock-spacer-up"></div><div id="portal-clock-front-hours-up"></div>
<div id="portal-clock-front-minutes-up-left"></div><div id="portal-clock-front-minutes-up-right"></div>
<div id="portal-clock-front-seconds-up-left"></div><div id="portal-clock-front-seconds-up-right"></div>
</div>
<div id="portal-clock-front-lower">
<img class="portal-clock-spacer-down" /><div id="portal-clock-front-hours-down"></div>
<div class="portal-clock-spacer-down"></div><div id="portal-clock-front-hours-down"></div>
<div id="portal-clock-front-minutes-down-left"></div><div id="portal-clock-front-minutes-down-right"></div>
<div id="portal-clock-front-seconds-down-left"></div><div id="portal-clock-front-seconds-down-right"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion styles/subsilver2/template/portal/portal_body.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@
<!--// board3 Portal by www.board3.de //-->
<!-- please keep this credits visible, thank you! -->
<br />
<div class="copyright" align="center">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2014 Board3 Group</div>
<div class="copyright" align="center">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2015 Board3 Group</div>
<br />
<!-- INCLUDE overall_footer.html -->

0 comments on commit 4f5fdeb

Please sign in to comment.