Commit graph

145 commits

Author SHA1 Message Date
Nicola Lamacchia 91b5e62ecb Fix variable name typo in bin/piratebox_setup_wlan.sh 2014-11-05 11:09:12 +01: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 31628ff55a Merge branch 'development' of github.com:PirateBox-Dev/PirateBoxScripts_Webserver into development 2014-09-05 08:00:40 +02:00
Matthias Strubel d468917a76 Merge branch 'no_RealTimeClock' of https://github.com/WIStudent/PirateBoxScripts_Webserver into WIStudent-no_RealTimeClock 2014-08-11 18:38:58 +02:00
Matthias Strubel b2b53d61d2 included correct pathes for hosts-mesh file and dnsmasq pid 2014-08-11 18:36:26 +02:00
Tobias Trumm 1256c62c38 Try to add a configuration variable
to enable the use of client timestamps in the chat window. Doesn't work
yet.
2014-08-04 21:46:17 +02:00
Matthias Strubel a85663e46b Distribute Files for DirectoryListing once upon initialization. 2014-08-01 16:57:58 +02:00
Matthias Strubel 4d09cc7f0c Fix favicon 2014-07-12 16:52:35 +02:00
Matthias Strubel b1382377b9 Fixing coding issues 2014-07-06 19:54:21 +02:00
Matthias Strubel d139c9e3fe Merge branch 'denis-d-patch-1' into development
- Fix russian translation
2014-07-03 23:17:03 +02:00
Matthias Strubel 7b068a34c8 Merge branch 'denis-d-patch-1' into hotfix-1.0.1
- Fix russion translation in droopy
2014-07-03 23:16:26 +02:00
denis-d c236bcc5bd Update droopy
Correct Russian translation.
2014-06-29 20:52:45 +04:00
Matthias Strubel 81871fe7b3 Draft for mapping avahi browse results to a hosts file 2014-06-27 22:01:14 +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 f38666803d Fix for duplicate symlinks 2014-06-27 17:41:10 +02:00
Matthias Strubel e85b1ea0e0 fixed missing then 2014-06-27 17:40:45 +02:00
Matthias Strubel 4b1f6dd4ec Fixed typo in generate config script 2014-06-27 17:39:32 +02:00
Matthias Strubel 1c0973815a Disable Using the Shoutbox
Merge branch 'shoutbox_disable' into development
2014-06-27 16:44:19 +02:00
Matthias Strubel b6dabf9643 Including JSON generation feature.
Merge branch 'json_generation' into development
2014-06-27 16:32:40 +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 c2a6378418 Add License header on several scripts
Merge remote-tracking branch 'remotes/origin/licencse_fixes' into development
2014-06-27 16:14:19 +02:00
Matthias Strubel 6f5e1e495a Fix for duplicate symlinks 2014-06-06 10:51:21 +02:00
Matthias Strubel 37a06802da fixed missing then 2014-06-05 15:29:56 +02:00
Matthias Strubel 9d50d004a8 Fixed typo in generate config script 2014-06-05 14:00:23 +02:00
Matthias Strubel f782d8c567 uncommon line mix fixed 2014-06-05 11:14:16 +02:00
Matthias Strubel 3021d2cdd6 uncommon line mix fixed 2014-06-05 11:13:51 +02:00
Matthias Strubel f43c749a6a Cleanup old included shoutbox in droopy, exchanged it with an "include" option. 2014-04-07 10:04:36 +02:00
Matthias Strubel 0756f76dd7 only download kareha-zip file when it is not available 2014-04-07 08:58:44 +02:00
Matthias Strubel 533f61d827 only download kareha-zip file when it is not available 2014-04-07 08:57:45 +02:00
Matthias Strubel af7b0006e0 Ensure Shoutbox File is always writable 2014-04-02 18:52:41 +02:00
Matthias Strubel 6f747bf6e4 Ensure Shoutbox File is always writable 2014-04-02 18:52:01 +02:00
Matthias Strubel 31d025de4b toggle shoutbox read-writable 2014-01-17 17:37:57 +01:00
Matthias Strubel 41f9bb4ffd first version of json generation transfered from LibraryBox 2.0 2014-01-17 17:14:45 +01:00
Matthias Strubel 4a344ec720 2nd bunch of license headers 2014-01-17 16:47:47 +01:00
Matthias Strubel f6429cd241 move chat message to extra config file 2014-01-17 16:41:48 +01:00
Matthias Strubel c73bd097d0 First bunch of license headers and overworked documentations 2014-01-17 16:35: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 ae0eaeb2ca moved Config entry from timesave to piratebox.conf
emptied out the openwrt section in timesave script, which wasn't called anymore

Conflicts:
	piratebox/piratebox/bin/timesave.sh
2013-11-29 17:44:03 +01:00
Matthias Strubel 346ce5b354 install_piratebox.sh now uses schema based generation for redirect.html 2013-11-29 17:44:03 +01:00
Matthias Strubel d975b5e4f4 OVERWORK of calls of "date" and better initialize of timesave file (less error messages)
Conflicts:
	piratebox/piratebox/bin/timesave.sh
2013-11-29 17:44:03 +01:00
Matthias Strubel 0839fbdb85 fix for calling change hostname service 2013-11-29 17:44:03 +01:00
Matthias Strubel 3674f4710e fix for OpenWRT systems 2013-11-29 17:44:03 +01:00
Matthias Strubel 5e3896a4e1 Distribute Files which are responsible for the new design in directory listing 2013-11-29 17:43:43 +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 224f8bb0a4 added option to change hostname via command line
Conflicts:
	piratebox/piratebox/bin/install_piratebox.sh
2013-11-29 17:41:04 +01:00
Matthias Strubel 007ba8806d added temporary-function for changing PirateBox-Hostname
Conflicts:
	piratebox/piratebox/bin/install_piratebox.sh
2013-11-29 17:39:56 +01:00
Matthias Strubel a268c395b5 removal of service
Conflicts:
	CHANGELOG
2013-11-29 17:35:48 +01:00
Matthias Strubel d27237d691 fixed output issue 2013-11-24 14:06:14 +01:00
Matthias Strubel 22d4e80103 Fix on scope - link ip for non openwrt 2013-11-21 21:45:41 +01:00
Matthias Strubel a08a14487b Deliver and generate avahi configuration files 2013-11-07 19:55:31 +01:00