piratebox-mirror/PirateBoxScripts_Webserver
2
1
Fork 0
mirror of https://github.com/PirateBox-Dev/PirateBoxScripts_Webserver.git synced 2023-12-14 07:22:58 +01:00
Code Issues Releases Wiki Activity
666 commits 21 branches 34 tags 3.3 MiB
Commit graph

666 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthias Strubel 8d8e7bfac4 Fixes file-url 2015-01-28 16:07:20 +01:00
Matthias Strubel 1c98c4c240 Fixed Shoutbox (Dev) #98 
Fixed #97

Merge branch 'Liblor-development' into development
 2015-01-28 12:41:31 +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 d73750ae7d Added new stuff 2015-01-28 12:39:20 +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 67183dc7f7 Merge branch 'jQueryUpload' into development 2015-01-28 12:33:35 +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
Matthias Strubel 1cf6b168f4 Merge pull request #96 from Liblor/development 
Solves merge conflicts in python files
 2014-12-27 20:01:01 +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
Matthias Strubel 6626cbc08b Merge branch 'hotfix-1.0.2' - Hotfix 1.0.2 release 
* [Fix] Settings for correct permission of shoutbox files
 * [Fix] Broken probe function in some shells
 * [Fix] Issues with Python scripts on some plattforms
 * [Fix] Fixes in installation script
 * [Fix] Distribute files did not work with folder containing whitespaces
 2014-12-26 09:14:05 +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 3c2c50e34a Merge pull request #94 from Liblor/development 
PEP8
 2014-12-11 19:00:22 +01:00
Matthias Strubel a4103dee68 Merge pull request #93 from Sjd-Risca/hotfix-1.0.2 
Bugfix: the scritp "distribute_file_into_directory.dh" is now working even when the path contain spaces.
 2014-12-11 19:00:11 +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
risca 3ae5c4d016 Now the file path of the install.sh script is absolute, therefore it will be possible to launch the script also from other path like: 
/bin/bash /home/myuser/PirateBoxScripts_Webserver-master/piratebox/install.sh
This also corrects a wrong path on line 47 that was causing the install script to fail.
 2014-12-08 01:15:49 +01:00
risca 530b050964 Now the path is absolute, therefore the install.sh script could be launched by any path, eg. the following will work as well: 
/bin/bash/ /home/myuser/PirateBoxScripts_Webserver-master/piratebox/install.sh
Also line 36 and line 47 where pointing to incompatible launching path (the first was in PirateBoxScripts_Webserver-master/piratebox, the second just in PirateBoxScripts_Webserver-master/).
 2014-12-08 01:13:57 +01:00
Matthias Strubel 4e43cc6794 Merge pull request #87 from Liblor/hotfix-1.0.2 
Unified HTML-character-escaping
 2014-11-21 21:24:58 +01:00
Matthias Strubel 8c79377c6d Merge pull request #88 from Liblor/development 
[FIX] Escaping of color
 2014-11-21 21:24:18 +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
Matthias Strubel 646174bf35 Some documentation cleanups 2014-11-20 20:56:18 +01:00
Matthias Strubel 2a72bad074 Merge branch 'hotfix-1.0.2' of github.com:PirateBox-Dev/PirateBoxScripts_Webserver into hotfix-1.0.2 2014-11-20 20:34:38 +01:00
Matthias Strubel 83b7de9829 Merge pull request #86 from Liblor/development 
PEP8
Fixes #86
 2014-11-17 19:27:44 +01:00
Loris Reiff 7dcd8033c7 PEP8 
See #83
 2014-11-17 19:22:49 +01:00
Matthias Strubel cf97374266 Merge pull request #85 from Liblor/development 
PEP8 - Coding style for message.py
Refers to #83
 2014-11-13 20:55:20 +01:00
Loris Reiff 7219036985 PEP8 
PEP8 Coding style for message.py
 2014-11-11 22:54:29 +01:00
Matthias Strubel dbadab0bdb Merge pull request #84 from Liblor/hotfix-1.0.2 
[Fix] indentation error
 2014-11-10 22:53:03 +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
Matthias Strubel 594c6ee551 Merge branch 'nicolalamacchia-development' into developmentt push origin development 
- Fixing some missing quotes
  - Typo in Varaible
  - New Feature: Interactive imageboard setup
 2014-11-05 18:47:30 +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
Matthias Strubel 2f2f8014f8 Merge branch 'development' of github.com:PirateBox-Dev/PirateBoxScripts_Webserver into development 2014-11-02 10:09:14 +01:00
Matthias Strubel 771caf963d added note about shoutbox updates 2014-11-02 10:06:55 +01:00