Commit graph

666 commits

Author SHA1 Message Date
Matthias Strubel 66b840714e Improved handling of timesave script on normal Linux system.
* Delivered the systemd file for restoring the file during boot.
  * Moved date format to piratebox.conf
  * Customize the date format for OpenWrt during build of
    piratebox_ws-img.tar.gz file, like other configuration files
2015-08-23 11:07:04 +02:00
Matthias Strubel d266d746cb Better styling for droopy upload frame 2015-08-23 09:55:49 +02:00
Matthias Strubel c28860d5f8 Removes an unwanted linebreak in the droopy startup 2015-08-22 23:05:30 +02:00
Matthias Strubel 4ba0671cd3 Merge branch 'hotfix-1.0.4' into development
Implementing the changes from hotfix to development branch.

Resolved  Conflicts:
	CHANGELOG
	piratebox/piratebox/bin/board-autoconf.sh
	piratebox/piratebox/bin/droopy (now 1.0.4 version)
	piratebox/piratebox/bin/shoutbox_stuff.sh
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
	piratebox/piratebox/www/generate_204  (stays PHP)
	piratebox/piratebox/www/index.html
2015-08-18 20:10:15 +02:00
Matthias Strubel 20753b020b Merge branch 'master' of github.com:PirateBox-Dev/PirateBoxScripts_Webserver 2015-08-13 19:53:21 +02:00
Matthias Strubel 4c631d5168 Hotfix release 1.0.4
* [New] New feature: /opt/piratebox/bin/board-autoconf.sh for setting up the imageboard
	* [New] Droopy update: Multiple upload
	* [New] Droopy update: In general user/password setting (non configurable via
   		               PirateBox)
	* [New] imageboard: inital dummy page for a not installed board.
	* [New] Send HTTP-Code 204 for Android devices, avoids captive Portal and leaving devices.

	* [Fix] Some script cleanups
	* [Fix] Improved Cachehandling
	* [Fix] Modified index HTML structure for increased stylability
	* [Fix] Droopy update: Language encoding
	* [Fix] Droopy update: Uploaded filepermission can be configured.
                	       PirateBox default: 755
	* [Fix] Fix not refreshing shoutbox after bootup
	* [Fix] Show station count again, after it is enabled

	* [Removed] Droopy update: Include hostname to templates (not needed anymore)
	* [Removed] Droopy update: Field including iframe for shoutbox (not needed anymore)
	* [Removed] Droopy update: iOS fake answer code, which was included in lighttpd since
	                           Piratebox 0.5.x
	* [Removed] exchange_www.sh : This feature is not available anymore, because it breaks
        	                      more then it helps.
	* [Removed] Unnessecary AJAX calls & files from pre 1.0
2015-08-13 19:50:51 +02:00
Matthias Strubel 3bc6242aea Merge pull request #122 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2015-08-09 10:23:09 +02:00
The Gitter Badger afdc1755f7 Added Gitter badge 2015-08-09 08:22:01 +00:00
Matthias Strubel b5f794e877 Fixes not working Python Script for generating 204
Closes #115
2015-08-06 22:09:08 +02:00
Matthias Strubel e5470ccd1f Cleanup unnessecary spacer files 2015-08-06 21:35:22 +02:00
Matthias Strubel 936f26cf17 Display Station count again.
Not the best solution, but worth for the hotfix.

Fixes #121
2015-08-06 21:31:02 +02:00
Matthias Strubel 7333b8a933 Set the Timestamp of the shoutbox generated file with a delay.
The problem is, that the piratebox starts before resetting the
RTC to a saved timestamp. That means the shoubox-gen file
is from the year 1970. That breaks the refresh in the browser.

With the delay, we hopefully get a better timestamp and fix
that issue

Fixes #120
2015-08-06 21:30:18 +02:00
Matthias Strubel 4f26929bbb Remove spacer index.htm and generate first page
kareha.pl doesn't overwrite the file for itself :(

In addition, we use .htm over .html , that tricks kareha and lighttpd
in this problem.
2015-08-06 19:53:19 +02:00
Matthias Strubel aff1bea5a2 Changelog entry for generate_204 patch 2015-08-04 20:37:57 +02:00
Matthias Strubel c19b591c6a Generate the HTTP Resonse with python for 1.0.x PirateBox too
Will avoid Captive Portal message from Android.
Especially some devices tend to leave the PirateBox network,
because they don't receive a 204 from their specific URL.

Closes #115
2015-08-04 20:34:53 +02:00
Matthias Strubel 8c099f2446 Generate default page for forum link
This patch avoids a confusing directory listing. This commits copies
over a simple default index.html that provides links to the
kareha.pl and back to the main page.

Does not copy, if the board is already installed.

Closes  #117
2015-08-04 20:06:11 +02:00
Matthias Strubel 3ab58c5657 Disabling exchange_www.sh - it helped nobody, only breakes stuff. 2015-08-03 20:48:50 +02:00
Matthias Strubel 05edc74203 Added CHANGELOG informations to commit 70823c1e4f 2015-07-30 22:09:48 +02:00
Matthias Strubel 70823c1e4f This commit aligns the Droopy code back to the latest versions.
The PirateBox modifications can be found in:

   https://github.com/PirateBox-Dev/Droopy

It contains the following features from the old PirateBox version
of Droopy:

  - Secured Subdirectory (new directories will fail in styling)
  - Make it possible to launch Droopy on boot time
  - Prevent uploading index.ht* files

New features / bugfixes with the new Droopy version:

  - Multiple upload
  - Fixed language encoding
  - In general user/password setting (non configurable via
    PirateBox)

The following features were not ported to the new version:

  - Include hostname to templates (not needed anymore)
  - Field including iframe for shoutbox (not needed anymore)
  - iOS fake answer code, which was included in lighttpd since
    Piratebox 0.5.x

Known issues:

  - New folders via protected subdirectory feature are not
    created with HEADER.TXT and README.txt (styling will not work).
    That issue is also on 1.0.0-1.0.3 versions
  - HEADER.TXT and README.txt can be uploaded. It will not be
    overwritten, but break styling if the files aren't available.
2015-07-30 21:54:43 +02:00
Matthias Strubel b7a6b709d3 Merge pull request #119 from jessstubenbord/hotfix-1.0.4
Reformatted welcome card & about slightly
2015-07-29 06:38:02 +02:00
Jess Stubenbord 6f3ef8f7cd Edited Authors & Changelog files
Added myself and all of the wonderful things I changed
2015-07-28 23:44:11 +02:00
Jess Stubenbord 2d79bdf8c0 Reformatted about & gave body an id
Shifted the about section in a div so that it is able to be styled as a
card if wanted. Gave the body an id so that individual pages can be
styled differently using a single stylesheet.
2015-07-28 15:00:16 +02:00
Jess Stubenbord 68023815b2 Reformatted welcome card
I wrapped the welcome message in another div so that this card matches
the others in hierarchy (for future styling purposes)
2015-07-28 02:45:54 +02:00
Matthias Strubel 2da5a68773 Improve cache handling of redirect.html and it schema file
Thanks to herr-gabriel

Closed #114
Closed #116
2015-07-27 19:42:42 +02:00
Matthias Strubel c701d79b60 Merge branch 'patch-2' of https://github.com/herr-gabriel/PirateBoxScripts_Webserver into herr-gabriel-patch-1 2015-07-27 19:40:37 +02:00
Matthias Strubel 44c9071215 Fixes a typo , finalizes Backport #118 2015-07-27 19:26:36 +02:00
Matthias Strubel 804627901e Feature: board-autoconf.sh for OpenWrt available
Made the board un-useable, if it is not setup.

 Conflicts:
	CHANGELOG
2015-07-27 19:24:55 +02:00
Nicola Lamacchia fdb686e9ea Add interactive imageboard system configuration 2015-07-27 19:06:26 +02:00
Gabriel Shahzad 67c1ad0d9a Added redirect fix 2015-07-26 12:38:07 +02:00
Gabriel Shahzad d9fa73bbd5 Fixed accidental redirects
Sometimes a user would still be redirected to a cached piratebox.lan site after disconnecting from the piratebox wifi. This has something to do with how different browsers interact with the cache-control meta tag. Adding "pragma" and "expires" tags as well as additional "cache-control" contents fixes that.
2015-07-26 11:24:38 +02:00
Matthias Strubel 68808664ed Merge pull request #113 from til/captive-portal-android-hack
Fake a full internet connection for android devices (fix)
2015-07-19 17:35:55 +02:00
Tilmann Singer 3006508e3b Fake a full internet connection for android devices (fix)
The previous commit included the wrong php file, it needs to be without
file extension.
2015-07-19 17:29:34 +02:00
Matthias Strubel d606f9a5f7 Merge pull request #112 from til/captive-portal-android-hack
Fake a full internet connection for android devices
Closes #59
2015-07-19 16:47:16 +02:00
Tilmann Singer dfb4e57f70 Fake a full internet connection for android devices
This uses a rather ugly hack to enable serving an extension-less php
file, but I couldn't find a better way to do this in the absence of
mod_rewrite.

Tested manually that it works on two different android devices (5.1.1).

Closes #59
2015-07-19 16:32:03 +02:00
Matthias Strubel b60f09d393 Fix spelling.
Closed #106
Merge branch 'deavmi-master' into development
2015-04-07 18:54:35 +02:00
Matthias Strubel 5d6f724bac Merge branch 'master' of https://github.com/deavmi/PirateBoxScripts_Webserver into deavmi-master 2015-04-07 18:54:23 +02:00
Tristan B. Kildaire 118c0067b3 Improved more stuff 2015-04-07 18:18:49 +02:00
Matthias Strubel 88a7938b6a Upload Handler fix 2015-03-11 10:30:10 +01:00
Matthias Strubel 5e98cacd5c Fixes a typo 2015-03-09 19:04:32 +01:00
Matthias Strubel 00e220ae2a Fixes in hosts generation 2015-02-09 15:26:59 +01:00
Matthias Strubel 7935530685 Merge branch 'rework_for_easier_webdev' into development 2015-02-04 10:11:50 +01:00
Matthias Strubel 40c4faae33 fixes and config files for webdev 2015-02-04 10:00:27 +01:00
Matthias Strubel 5ac5597587 Ignore Shared folder and data.pso file 2015-02-04 09:59:41 +01:00
Matthias Strubel b88643ed2c Run even without environment vars 2015-02-04 08:09:44 +01:00
Matthias Strubel e3c6e07088 Merge branch 'folder_tidy_up' into development 2015-01-29 15:39:19 +01:00
Matthias Strubel 9e44776e25 moved CSS 2015-01-29 15:38:04 +01:00
Matthias Strubel 391c2e3647 moved all images to /img folder 2015-01-29 15:34:53 +01:00
Matthias Strubel f6d45a979f Update dev. Branch with changes
Merge branch 'master' into development
2015-01-29 15:26:49 +01:00
Matthias Strubel 407f40f9e7 added forgotten Changelog entry 2015-01-29 15:22:25 +01:00
Matthias Strubel 761e0bf54a Fixes upload-adcanced javascript 2015-01-28 16:09:39 +01:00