Commit graph

300 commits

Author SHA1 Message Date
Matthias Strubel 00e220ae2a Fixes in hosts generation 2015-02-09 15:26:59 +01:00
Matthias Strubel 40c4faae33 fixes and config files for webdev 2015-02-04 10:00:27 +01:00
Matthias Strubel b88643ed2c Run even without environment vars 2015-02-04 08:09:44 +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 761e0bf54a Fixes upload-adcanced javascript 2015-01-28 16:09:39 +01:00
Matthias Strubel 8d8e7bfac4 Fixes file-url 2015-01-28 16:07:20 +01:00
Matthias Strubel 389362795b Merge branch 'development' of https://github.com/Liblor/PirateBoxScripts_Webserver into Liblor-development 2015-01-28 12:40:52 +01:00
Matthias Strubel 15d90377cb Merge remote-tracking branch 'origin/irc_server' into development 2015-01-28 12:40:18 +01:00
Matthias Strubel 79ec7555c5 Droopy disabled per default, because there is now a new upload method 2015-01-28 12:37:47 +01:00
Matthias Strubel e895986d91 Merge remote-tracking branch 'remotes/origin/irc_server' into development
Conflicts:
	Makefile
	piratebox/piratebox/init.d/piratebox
	piratebox/piratebox/init.d/piratebox_alt
2015-01-28 12:37:02 +01:00
Matthias Strubel 61f1dca1e0 first bigger testing version 2015-01-28 12:32:50 +01:00
Matthias Strubel 3a920800b2 new envariable for the upload script 2015-01-28 11:18:19 +01:00
daviddarts 1b1afa556b Update motd.txt
Edited and updated the MOTD.
2015-01-16 20:54:42 +04:00
Matthias Strubel 67a43ab78f updated page url 2015-01-16 13:25:11 +01:00
Loris Reiff 4115305f56 [Fix] Shoutbox
Here is a version without the format function (See #97).
Unfortunally I couldn't test it with openwrt, because I have a problem with my mr3020 -.-
But there shouldn't be a problem with this version.
2015-01-10 14:16:48 +01:00
Loris Reiff f180297fb6 Solves merge conflicts
This solves the merge conflicts in the development branch --> #95
2014-12-27 15:10:23 +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
Loris Reiff bc1d1ed23f PEP8
See #83
2014-12-11 17:14:22 +01:00
risca 602ec2492e Bugfix: the scritp distribute_file_into_directory is now working even when the path contain white spaces. 2014-12-10 00:42:44 +01:00
Matthias Strubel 9e44802ba4 Merge pull request #92 from Sjd-Risca/installscript
Install script corrections
2014-12-08 22:23:55 +01:00
risca 46b6500ff6 typo in bash test 2014-12-08 02:38:34 +01:00
risca a8dcaf7f6b typo in bash test 2014-12-08 02:36:24 +01:00
risca 00646cbf96 typo error: the comparison of string in bash require only on "=" 2014-12-08 02:19:53 +01:00
risca 6d534fda7f Dash compatibility issue (many system use dash as default shell) 2014-12-08 02:09:45 +01:00
risca 8fe529c58c typo error: the default parameter of line 31 (src_file) should be a string, not a variable! 2014-12-08 01:54:10 +01:00
Loris Reiff 61e253b2f6 [FIX] Escaping of color
This fixes a XSS-Bug.
Additionally I standardized some indentations (4 spaces).

Cheers :)
Liblor
2014-11-21 19:14:39 +01:00
Loris Reiff e62a50e3c8 Unified HTML-character-escaping
It used to escape the data twice, once in psowrte and once in psogen.
Now, the whole escaping for the ShoutBox is now done in psogen.py

Plus: We forgot to escape color, it's also fixed.

Conflicts:
	piratebox/piratebox/python_lib/psogen.py
	piratebox/piratebox/www/cgi-bin/psowrte.py
2014-11-21 19:02:26 +01:00
Loris Reiff 7dcd8033c7 PEP8
See #83
2014-11-17 19:22:49 +01:00
Loris Reiff 7219036985 PEP8
PEP8 Coding style for message.py
2014-11-11 22:54:29 +01:00
Loris Reiff ea24f6d7a2 Merge branch 'indentation_fix' into hotfix-1.0.2 2014-11-10 22:30:53 +01:00
Loris Reiff f347b96742 [FIX] Consistent use of indentation
Consistent use of 4 spaces for indentation.
2014-11-10 18:32:32 +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
Nicola Lamacchia 0695475c9e Add interactive imageboard system configuration 2014-11-05 11:10:36 +01:00
Nicola Lamacchia 91b5e62ecb Fix variable name typo in bin/piratebox_setup_wlan.sh 2014-11-05 11:09:12 +01:00
Nicola Lamacchia 1a1a3b6826 Fix missing quotes in init.d/piratebox_alt 2014-11-05 11:08:51 +01:00
Loris Reiff d2ab04dce7 Unified HTML-character-escaping
It used to escape the data twice, once in psowrte and once in psogen.
Now, the whole escaping for the ShoutBox is now done in psogen.py
2014-11-01 17:13:04 +01:00
Matthias Strubel b53ca9e774 move "probe" function to the top of the script, that it can be found in any case 2014-10-29 21:29:22 +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
Loris Reiff f21d57737d [fix] XSS in forest.py
The subject string hasn't been escaped, which led to a persistent xss vulnerability.
2014-10-09 18:06:13 +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
stylesuxx 51d3d86c1b Escape the username to prevent js injection 2014-08-31 19:08:40 +02:00
Gilles Coulais b7b333e83a Add en, fr, de properties files and translations. de translations based o, index.de.html 2014-08-29 14:27:09 +02:00
Gilles Coulais e2e07b040b Update l10n key moved to label instead of input 2014-08-29 14:25:05 +02:00
Gilles Coulais 7b7b4f6d09 Add webl10n library
Add data-l10n-id keys in index page
2014-08-29 13:00:16 +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