Changeset 3814656


Ignore:
Timestamp:
09/16/14 08:56:17 (2 days ago)
Author:
Josh <joshms@…>
Branches:
master
Children:
dea4537
Parents:
a64360a (diff), a71d7c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/pcbsd/pcbsd

Files:
2 added
11 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • src-webui/appweb/share/html/include/login.php

    red04adc r03637e4  
    2525      if($_POST['username'] == $username && password_verify($_POST['password'], $password) ) { 
    2626    $_SESSION['username'] = $_POST['username']; 
     27        header('Location:  ' . $_SERVER['PHP_SELF']); 
    2728        $_SESSION['timeout'] = time(); 
    28         header('Location:  ' . $_SERVER['PHP_SELF']); 
    2929      }else { 
    3030          //invalid login 
  • pbi-modules/games/wesnoth/pbi.conf

    r8374584 ra64360a  
    11#!/bin/sh 
    2 # PBING Module Config 
     2# 10.x (5/21/14) PBING Build Configuration 
     3# Generated using EasyPBI 
    34 
    4 # -- Program Base Information -- 
    5 PBI_ORIGIN="games/wesnoth" 
    65PBI_PROGNAME="Wesnoth" 
    7 PBI_PROGWEB="" 
    86PBI_PROGAUTHOR="Wesnoth Team" 
    9  
    10 # -- Additional repo information (optional) -- 
    117PBI_LICENSE="GPL" 
    128PBI_TAGS="game,strategy" 
    139PBI_PROGTYPE="Graphical" 
    14 PBI_CATEGORY="Games" 
    15  
    16 # -- Additional package to install along with ORIGIN 
     10PBI_ORIGIN="games/wesnoth" 
    1711PBI_OTHERPKGS="" 
    18  
    19 # -- Optional related packages to show user 
    2012PBI_PLUGINS="" 
    21  
    22  
    23  
    24 # -- Space delimited list of URLs to screenshots 
    25 PBI_SCREENSHOTS="" 
    26  
    27 # -- Other PBIs which are similar to this PBI 
     13PBI_SCREENSHOTS="http://www.pcbsd.org/appcafe/screenshots/games/wesnoth/screen1.png http://www.pcbsd.org/appcafe/screenshots/games/wesnoth/screen2.png http://www.pcbsd.org/appcafe/screenshots/games/wesnoth/screen3.png http://www.pcbsd.org/appcafe/screenshots/games/wesnoth/screen4.png" 
    2814PBI_RELATED="" 
    2915 
    30 export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
    31 export PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_CATEGORY 
    32 export PBI_OTHERPKGS PBI_PLUGINS 
    33 export PBI_SCREENSHOTS PBI_RELATED 
    34  
     16export PBI_PROGNAME PBI_PROGAUTHOR PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_ORIGIN PBI_OTHERPKGS PBI_PLUGINS PBI_SCREENSHOTS PBI_RELATED 
  • pbi-modules/games/whichwayisup/pbi.conf

    r8374584 ra64360a  
    11#!/bin/sh 
    2 # PBING Module Config 
     2# 10.x (5/21/14) PBING Build Configuration 
     3# Generated using EasyPBI 
    34 
    4 # -- Program Base Information -- 
    5 PBI_ORIGIN="games/whichwayisup" 
    65PBI_PROGNAME="Which Way Is Up" 
    7 PBI_PROGWEB="" 
    86PBI_PROGAUTHOR="Olli Hectigo Etuaho <admin[at]hectigo.net>" 
    9  
    10 # -- Additional repo information (optional) -- 
    11 PBI_LICENSE="" 
    127PBI_TAGS="game,platformer,arcade" 
    138PBI_PROGTYPE="Graphical" 
    14 PBI_CATEGORY="Games" 
    15  
    16 # -- Additional package to install along with ORIGIN 
     9PBI_ORIGIN="games/whichwayisup" 
    1710PBI_OTHERPKGS="" 
    18  
    19 # -- Optional related packages to show user 
    2011PBI_PLUGINS="" 
    21  
    22  
    23  
    24 # -- Space delimited list of URLs to screenshots 
    25 PBI_SCREENSHOTS="" 
    26  
    27 # -- Other PBIs which are similar to this PBI 
     12PBI_SCREENSHOTS="http://www.pcbsd.org/appcafe/screenshots/games/whichwayisup/screen1.png" 
    2813PBI_RELATED="" 
    2914 
    30 export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
    31 export PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_CATEGORY 
    32 export PBI_OTHERPKGS PBI_PLUGINS 
    33 export PBI_SCREENSHOTS PBI_RELATED 
    34  
     15export PBI_PROGNAME PBI_PROGAUTHOR PBI_TAGS PBI_PROGTYPE PBI_ORIGIN PBI_OTHERPKGS PBI_PLUGINS PBI_SCREENSHOTS PBI_RELATED 
Note: See TracChangeset for help on using the changeset viewer.