Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: BRL-CAD/web
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2bc1ff2852ce
Choose a base ref
...
head repository: BRL-CAD/web
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac681e1b6620
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Feb 26, 2015

  1. Copy the full SHA
    dbcb3c8 View commit details
  2. brlcad skin

    brlcad committed Feb 26, 2015
    Copy the full SHA
    1e0c685 View commit details
  3. ws

    brlcad committed Feb 26, 2015
    Copy the full SHA
    fac9a64 View commit details
  4. sync current files

    brlcad committed Feb 26, 2015
    Copy the full SHA
    ac681e1 View commit details
5 changes: 1 addition & 4 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
RewriteEngine On
RewriteRule ^wiki/?(.*)$ /w/index.php?title=$1 [L,QSA]
RewriteRule ^rss.xml$ /d/rss.xml
RewriteRule ^$ /wp [L]

Options MultiViews



Binary file added favicon.ico
Binary file not shown.
3 changes: 3 additions & 0 deletions refresh_site.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php
exec('git pull');
?>
4 changes: 2 additions & 2 deletions w/LocalSettings.php
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
# ini_set( 'memory_limit', '20M' );

include_once ($IP . '/extensions/di/iwDrupal.php');
# include_once ($IP . '/skins/brlcad/brlcad.php');
include_once ($IP . '/skins/brlcad/brlcad.php');
# include_once ($IP . '/skins/Brlcadnew.php');


@@ -120,7 +120,7 @@

## Default skin: you can change the default skin. Use the internal symbolic
## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
$wgDefaultSkin = 'modern';
$wgDefaultSkin = 'brlcad';

# logo for certain error pages
$wgLogo = '../images/logo/BRL-CAD_256x212.png';
Binary file added w/images/thumb/1/1f/Tools.svg/64px-Tools.svg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions wp/.htaccess
Original file line number Diff line number Diff line change
@@ -7,4 +7,5 @@ RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule . /wp/index.php [L]
</IfModule>

# END WordPress