This repository has been archived by the owner on Jul 15, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/3.8.0' into production
- Loading branch information
Showing
707 changed files
with
40,008 additions
and
166,959 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
DONORS | ||
files/usr/share/grase/www/*/templates_c/ | ||
files/usr/share/grase/vendor/ | ||
files/usr/share/grase/www/vendor/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
COMPOSER_FILES = files/usr/share/grase/composer.json files/usr/share/grase/composer.lock files/usr/share/grase/vendor/ | ||
BOWER_FILES = files/usr/share/grase/bower.json | ||
VERSION = $(shell sed -n '/grase-www-portal/s/[^ ]* (//;s/).*//p;q' debian/changelog) | ||
|
||
all: bower composer | ||
#files/usr/share/grase/src/includes/constants.php: debian/changelog | ||
sed -i 's/APPLICATION_VERSION", "[^"]*"/APPLICATION_VERSION", "$(VERSION)"/' files/usr/share/grase/src/includes/constants.php | ||
chmod 0440 sudo/grase-www-portal | ||
|
||
bower: | ||
mkdir -p ext-libs/bower | ||
cp $(BOWER_FILES) ext-libs/bower | ||
cd ext-libs/bower; /usr/local/bin/bower install | ||
|
||
composer: | ||
cd files/usr/share/grase/; /usr/local/bin/composer install | ||
mkdir -p ext-libs/composer | ||
cp -r $(COMPOSER_FILES) ext-libs/composer/ | ||
rm -fr files/usr/share/grase/vendor | ||
|
||
clean: | ||
rm -fr ext-libs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Grase Hotspot | ||
|
||
The GRASE Hotspot is a project that glues individual components together easily, and provides a nice simple interface to administer the hotspot. With a lot of time and effort, most people can follow the tutorials on the internet and setup up MySQL, FreeRadius, CoovaChilli, Squid and any other optional components, and setup a Captive Portal Hotspot. But as soon as one component changes, for example FreeRadius changed how it’s config files are handled, the whole system breaks and the tutorial doesn’t help. | ||
|
||
The GRASE Hotspot takes all the hard work out of keeping the individual components glued together, and provides a nice simple interface to manage the Hotspot and it’s users. As components change, the project is updated so the glue stays together. | ||
|
||
## Installation | ||
|
||
See the Wiki page <https://github.com/GraseHotspot/grase-www-portal/wiki/Installation> | ||
|
||
### grase-www-portal package/repository | ||
|
||
This is the main Grase Hotspot package. It contains the web interface, and depends on the config packages. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,48 @@ | ||
grase-www-portal (3.8.0) purewhite; urgency=low | ||
|
||
[ Tim White ] | ||
* Some report updates | ||
* "Free Access" user auto create and login (TOS style login) | ||
* Auto refresh of sessions page (Fixes #23) | ||
* Change how batches are created to prevent errors and also check for | ||
uniqueness of usernames | ||
* Fix up some database logging | ||
* Added 'Cron' function to delete all users who have no remaining time limit | ||
(append ?deleteoutoftimeusers=1 to the end of the cron url) | ||
* Added 'Cron' function to delete all users who have no remaining data limit | ||
(append ?deleteoutofdatausers=1 to the end of the cron url) | ||
* Fix bug in CRON logging timestamp | ||
* Migrating report charts to Google Chart API | ||
* Fix CRON job that deletes expired users, it was missing users who expired | ||
at the start of the month | ||
* Install and use Composer and Bower to manage external dependencies | ||
* Decrease Admin interval to 10 minutes to allow settings to take effect | ||
sooner | ||
* Added batch deletion | ||
* Removed TCPDF (and print to PDF) due to it being a very specific use case | ||
without customisations. It'll be easier to do pixel perfect layout with CSV | ||
export and mailmerge software. | ||
* Added printing of group users (Fixes #41) | ||
* Ability to customise CSS for printing of tickets | ||
* Added DHCP leases page to see current output of chilli_query | ||
* Hidden Advanced Settings Page | ||
* Make username/password length customisable | ||
* Cleanup old settings | ||
* Use Smarty3 from Composer instead of Debian/Ubuntu packages | ||
* Bring Account comments into sessions page (Fixes #98) | ||
* Fix LAN/WAN display issues (Closes #126) | ||
* Use referrer meta tag to only send Origin, and not the full URL when clicking links to prevent things like MAC addresses from leaking. (Closes #100) | ||
* Simultaneous Use can now be a number instead of a boolean (Closes #3) | ||
* New Login page look | ||
|
||
|
||
-- Tim White <[email protected]> Sun, 10 Jan 2016 19:56:55 +1000 | ||
|
||
grase-www-portal (3.7.7.11) purewhite; urgency=medium | ||
|
||
* Backport Freelogin code (TOS Accept code) | ||
|
||
-- Tim White <[email protected]> Sun, 17 Aug 2014 19:29:55 +1000 | ||
|
||
grase-www-portal (3.7.7.10) purewhite; urgency=medium | ||
|
||
* Actually bump version number | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
This work was packaged for Debian by: | ||
|
||
Timothy White <[email protected]> on Sun, 25 Apr 2010 05:38:26 +0800 | ||
Timothy White <[email protected]> on Sun, 25 Apr 2010 05:38:26 +0800 | ||
|
||
Upstream Author(s): | ||
|
||
Timothy White <[email protected]> | ||
Timothy White <[email protected]> | ||
|
||
Copyright: | ||
|
||
Copyright (C) 2008 Timothy White | ||
Copyright (C) 2008-2014 Timothy White | ||
|
||
License: | ||
|
||
|
@@ -30,7 +30,7 @@ Public License version 3 can be found in '/usr/share/common-licenses/GPL-3'. | |
|
||
The Debian packaging is: | ||
|
||
Copyright (C) 2010 Timothy White <[email protected]> | ||
Copyright (C) 2010 Timothy White <[email protected]> | ||
|
||
and is licensed under the GPL version 3, see above. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ext-libs/composer/vendor/* /usr/share/grase/vendor/ | ||
ext-libs/bower/bower_components/* /usr/share/grase/www/vendor/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,18 +4,9 @@ | |
# m h dom mon dow command | ||
|
||
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin | ||
#MAILTO=[email protected] | ||
#MAILTO= | ||
## NEEDS USERNAME | ||
#@daily root /root/system/install/upgrade_script.sh | ||
#@reboot root /usr/share/grase/www/radmin/scripts/radius_stale > /dev/null | ||
#@daily root /usr/share/grase/www/radmin/scripts/radius_stale > /dev/null | ||
#3 5 1,2 * * root /usr/share/grase/www/radmin/scripts/radius_stale > /dev/null | ||
#17 5 1,2 * * root /usr/share/grase/www/radmin/scripts/radius_monthly_acct | ||
#37 3 3 * * root /usr/share/grase/www/radmin/scripts/radius_old_users | ||
@monthly nobody /usr/share/grase/www/radmin/scripts/mirror_common_apps.sh | ||
#30 2 * * * root /usr/share/grase/www/radmin/scripts/avast_mirror | ||
|
||
@daily root /usr/share/grase/www/radmin/scripts/mysql_backup | ||
@daily root /usr/share/grase/scripts/mysql_backup | ||
|
||
# Most cron scripts have moved to PHP classes actived by cron.php | ||
@hourly nobody wget -q http://127.0.0.1/grase/radmin/cron.php -O - | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
files/* / | ||
sudo/grase-www-portal /etc/sudoers.d/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"directory" : "www/vendor/" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"name": "Grase Hotspot", | ||
"dependencies": { | ||
"bootstrap": "*", | ||
"fontawesome": "*", | ||
"jquery": "<2.*", | ||
"jquery.tablesorter": "*", | ||
"codemirror": "v3.*", | ||
"codemirror-ui": "https://github.com/jagthedrummer/codemirror-ui.git#~0.0.14" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
{ | ||
"repositories": [ | ||
{ | ||
"type": "vcs", | ||
"url": "https://github.com/GraseHotspot/smarty-gettext" | ||
} | ||
], | ||
"require": { | ||
"smarty-gettext/smarty-gettext": "@dev", | ||
"smarty/smarty": "3.1.*" | ||
}, | ||
"autoload": | ||
{ | ||
"psr-4": | ||
{ | ||
"Grase\\": "src/Grase/" | ||
}, | ||
"files": [ | ||
"src/includes/constants.php", | ||
"src/includes/grase-bootstrap.php" | ||
], | ||
"classmap" : ["www/radmin/classes/"] | ||
} | ||
} |
Oops, something went wrong.