Commit graph

64 commits

Author SHA1 Message Date
Matthias Strubel d73750ae7d Added new stuff 2015-01-28 12:39:20 +01:00
Matthias Strubel d5f9ce8d60 Merge branch 'hotfix-1.0.2' into development
Conflicts:
	BuildScripts/RPi_motd.txt
	CHANGELOG
	Makefile
	README.md
	piratebox/piratebox/python_lib/broadcast.py
	piratebox/piratebox/python_lib/discover.py
	piratebox/piratebox/python_lib/messages.py
	piratebox/piratebox/python_lib/psogen.py
	piratebox/piratebox/www/cgi-bin/psowrte.py
2014-12-26 09:56:47 +01:00
Matthias Strubel a98d3d3234 Added new Fixes & authors to changelog
Updated version to 1.0.2
2014-12-26 09:12:51 +01:00
Matthias Strubel 646174bf35 Some documentation cleanups 2014-11-20 20:56:18 +01:00
Matthias Strubel 5e27f1b0b1 Feature: board-autoconf.sh for OpenWrt available
Made the board un-useable, if it is not setup.
2014-11-05 18:53:56 +01:00
Matthias Strubel 771caf963d added note about shoutbox updates 2014-11-02 10:06:55 +01:00
Matthias Strubel e7388d8b6b added fix_probe to Changelog 2014-10-29 21:32:39 +01:00
Matthias Strubel 157e13f925 Corrected wrong permission setup like commented in 3021d2cdd6 2014-10-17 10:00:29 +02:00
Matthias Strubel abebd4234d Merge branch 'hotfix-1.0.1' into development
Conflicts:
	README.md
	piratebox/piratebox/www/index.html
2014-10-10 10:38:36 +02:00
Matthias Strubel 5ac0714525 Fixes XSS in forest.py
Merge branch 'Liblor-hotfix-1.0.2' into hotfix-1.0.1
2014-10-10 10:31:53 +02:00
Matthias Strubel 9697e6e6c3 Update CHANGELOG
added JS injection fix
2014-08-31 21:48:27 +02:00
Matthias Strubel 43baaeb944 Fixing bootup issue on RPi with some USB-wifi-Dongles 2014-08-26 06:46:47 +02:00
Matthias Strubel cdf7957382 added forgotten entries 2014-08-14 20:23:48 +02:00
Matthias Strubel 18be118400 Added note about the updated on box-installer
Testing 1.0.1 RC1 Release
2014-08-14 19:53:23 +02:00
Matthias Strubel 3d4ac04a00 Enable the possibility to get the Time from the client for shoutbox instead of PirateBox-Clock
Merge branch 'WIStudent-no_RealTimeClock' into development
2014-08-11 18:40:41 +02:00
Matthias Strubel 92fff1b45d Fixing customization for Leasefile location on OpenWRT devices 2014-08-01 18:07:50 +02:00
Matthias Strubel a85663e46b Distribute Files for DirectoryListing once upon initialization. 2014-08-01 16:57:58 +02:00
Matthias Strubel c5dc443eea Added fixnote about russion translation 2014-07-03 23:18:01 +02:00
Matthias Strubel 96a2d010d7 Merge branch 'hotfix-1.0.1' into development
Conflicts:
	CHANGELOG
	piratebox/piratebox/bin/distribute_file_into_directory.sh
	piratebox/piratebox/bin/distribute_files.sh
	piratebox/piratebox/conf/piratebox.conf
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
	piratebox/piratebox/src/HEADER.txt
	piratebox/piratebox/src/README.txt
	piratebox/piratebox/www/index.html
2014-06-27 17:50:31 +02:00
Matthias Strubel a04eaf98a8 Added more fixes on depended packages 2014-06-27 17:37:40 +02:00
Matthias Strubel f301358cf2 Added changelog and Version bump from hotfix-1.0.1 branch
Conflicts:
	CHANGELOG
	Makefile
2014-06-27 17:37:09 +02:00
Matthias Strubel 982fc25294 Changlog: documented merged features 2014-06-27 17:27:59 +02:00
Matthias Strubel 67f66c8886 Revert "Merge branch 'php_enabling' into development"
This reverts commit a843f0a867, reversing
changes made to b6dabf9643.
2014-06-27 16:39:07 +02:00
Matthias Strubel a843f0a867 Merge branch 'php_enabling' into development
Conflicts:
	CHANGELOG
2014-06-27 16:36:23 +02:00
Matthias Strubel 7d78cc718c Implementing mesh feature from LibraryBox to PirateBox
- still needs some tweaks mapping mDNS to S-DNS  (make unique name available via non avahi clients)
   - refreshing of dnsmasq cache

Merge branch 'mesh_enabling' into development

Conflicts:
	piratebox/piratebox/bin/generate_config_files.sh
	piratebox/piratebox/conf/piratebox.conf
2014-06-27 16:20:20 +02:00
Matthias Strubel 9906dd9a18 Added more fixes on depended packages 2014-06-27 15:46:11 +02:00
Matthias Strubel 536931928d Added changelog and Version bump 2014-06-23 21:35:49 +02:00
Matthias Strubel 660531eb6f Release PirateBox 1.0
Merge branch 'release-1.0' into stable

Conflicts:
	CHANGELOG
	Makefile
	piratebox/piratebox/bin/install_piratebox.sh
	piratebox/piratebox/conf/lighttpd/lighttpd.conf
2014-05-29 14:14:45 +02:00
Matthias Strubel f6429cd241 move chat message to extra config file 2014-01-17 16:41:48 +01:00
Matthias Strubel 898e98e55f enable / disable file copy into share folder via config 2014-01-17 16:37:23 +01:00
Matthias Strubel 7fdfaf4b86 added imagefile to changelog 2014-01-16 22:55:15 +01:00
Matthias Strubel 5300e5c42a Merge branch 'librarybox_dev' into mesh_enabling
Conflicts:
	CHANGELOG
	piratebox/piratebox/conf/piratebox.conf
2013-11-29 18:01:40 +01:00
Matthias Strubel 0832c31794 updated Changelog for mising points 2013-11-29 17:46:20 +01:00
Matthias Strubel 10d185c7bd Fixed captive Portal detection for iOS7
Conflicts:
	CHANGELOG

Conflicts:
	CHANGELOG
2013-11-29 17:46:17 +01:00
Matthias Strubel abc97d1e44 Enable unescaped blanks in upload-folder variable
Conflicts:
	CHANGELOG
2013-11-29 17:45:52 +01:00
Matthias Strubel 09426f0c8e update of beta3 changes
Conflicts:
	CHANGELOG
2013-11-29 17:45:16 +01:00
Matthias Strubel ae6e171281 Added new directory-Design to CHANGELOG and David Brooks to Authors 2013-11-29 17:44:03 +01:00
Matthias Strubel 7fd7840ff4 Generating lease-file location based on config file. Place it on OpenWRT into /tmp => memory
Conflicts:
	CHANGELOG
2013-11-29 17:42:22 +01:00
Matthias Strubel 3a3aa7c28e added changelog entry
Conflicts:
	CHANGELOG
2013-11-29 17:41:36 +01:00
Matthias Strubel 8821cdc4ac fixed changelog .. 2013-11-29 17:35:57 +01:00
Matthias Strubel a268c395b5 removal of service
Conflicts:
	CHANGELOG
2013-11-29 17:35:48 +01:00
Matthias Strubel a493301464 updated Changelog for mising points 2013-11-10 11:28:56 +01:00
Matthias Strubel 0073803eac Fixed captive Portal detection for iOS7
Conflicts:
	CHANGELOG
2013-09-27 15:41:35 +02:00
Matthias Strubel 7b5ee7e4bc Fixed captive Portal detection for iOS7
Conflicts:
	CHANGELOG
2013-09-27 15:36:31 +02:00
Matthias Strubel b021550c25 Fixed captive Portal detection for iOS7 2013-09-27 15:29:56 +02:00
Matthias Strubel a59d56977d Enable unescaped blanks in upload-folder variable 2013-09-12 20:38:08 +02:00
Matthias Strubel 9673ae2f30 update of beta3 changes 2013-08-26 09:36:49 +02:00
Matthias Strubel c5ae25d7b1 removal of service
Conflicts:
	CHANGELOG
2013-08-26 08:14:50 +02:00
Matthias Strubel 0d0c37f3d4 Generating lease-file location based on config file. Place it on OpenWRT into /tmp => memory
Conflicts:
	CHANGELOG
2013-08-26 08:13:34 +02:00
Matthias Strubel 99f4a97c3c Added new directory-Design to CHANGELOG and David Brooks to Authors 2013-08-21 10:08:11 +02:00