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
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
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
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
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
50bd60ab1d
Fix relativ link to board on splash page
2014-08-01 16:35:33 +02:00
Tobias Trumm
d308a46c32
Use POSIX timestamp.
2014-07-28 04:32:53 +02:00
Tobias Trumm
c8986663c8
Get timestamp for Shoutbox from the client/browser
...
on systems with no real time clock
2014-07-28 01:35:27 +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
taffy-nay
3af906a62f
Removed thanks button padding.
...
The padding for .button was causing it to display scroll bars. Removing padding: 1em; fixes this.
2014-06-27 17:35:25 +02:00
Matthias Strubel
5af4f40fb3
Merge branch 'hotfix-1.0.1' of github.com:PirateBox-Dev/PirateBoxScripts_Webserver into hotfix-1.0.1
2014-06-23 21:18:07 +02:00
taffy-nay
10b352a876
Removed thanks button padding.
...
The padding for .button was causing it to display scroll bars. Removing padding: 1em; fixes this.
2014-06-17 10:25:05 +01:00
Matthias Strubel
c40cd7bdee
Fixed typo
2014-06-16 19:28:12 +02:00
Matthias Strubel
13eb2243a2
Added German translation
...
Issue #60 multi languages
2014-06-11 13:08:23 +02:00
Matthias Strubel
6b435954a1
Get back to PirateBox-Logo for kareha
2013-11-29 17:44:03 +01:00
dsbrooks
87137b27df
Quick-fix
...
+ body style needed a variable added
2013-11-29 17:43:37 +01:00
dsbrooks
b69632ca41
Custom directory listing
...
Pull Request
Conflicts:
piratebox/piratebox/conf/lighttpd/lighttpd.conf
2013-11-29 17:43:26 +01:00
Matthias Strubel
b6555ae847
Get back to PirateBox-Logo for kareha
2013-08-21 10:19:20 +02:00
Matthias Strubel
e1c6f00f31
Directory-Listing with PirateBox Design now
...
Merge branch 'responsive_design' into release-1.0
Conflicts:
piratebox/piratebox/conf/lighttpd/lighttpd.conf (configuration)
2013-08-21 10:05:15 +02:00
dsbrooks
a29154fbb8
Quick-fix
...
+ body style needed a variable added
2013-08-21 15:05:19 +09:00
dsbrooks
1d659001a9
Pull Request
2013-08-21 14:57:53 +09:00
Matthias Strubel
7b205e0c31
Merge branch 'responsive_design' into development
...
First release version of responsive_design
Conflicts:
piratebox/piratebox/www/redirect.html
2013-08-11 16:23:40 +02:00
dsbrooks
b5484ba742
Changes
...
+ piratebox.conf and psogen.py have been updated to reflect some css
syntax changes
+ index.html has had the 'welcome' section removed in favor of an
'about' link at the top
+ index.html has had some minor restructuring to clean up the code
+ style.css has been cleaned up and reorganized
2013-07-05 17:12:18 +09:00
dsbrooks
be76e2b001
Fixed issue with clearing chat input after sending.
2013-06-05 09:18:42 +09:00
dsbrooks
dfeed8753c
Reworked layout, new chat-gen
...
Reworked the layout, fixing the previously mentioned break when
resizing the window.
Changed the output of psogen.py to better style the chat itself.
2013-06-04 10:29:54 +09:00
Matthias Strubel
3204b44a9b
Prevent Caching in redirect.html
...
that only poisens browser's cache too much.
2013-05-31 12:28:57 +02:00
David Brooks
3a44250a77
Rebuild and design tweaks
...
Rebuilt the main page to move the "Upload" section around depending on
how you were veiwing the page, whether it be mobile or on a desktop.
2013-05-24 09:32:21 +09:00
David Brooks
7de1e2d63f
Revert to original state
...
Reverted the index page back to it's original code from a quick test.
2013-05-23 17:05:25 +09:00
Matthias Strubel
b01cca030c
Initial commit of sent files
2013-05-23 08:52:26 +02:00
Matthias Strubel
43e99b3040
added no-cache flag
2013-04-02 08:19:10 +02:00
Matthias Strubel
8af989f021
first implementation of forban link
2012-12-26 13:32:40 +01:00
Matthias Strubel
710249b0bc
added style css for the JS shoutbox - now colors work
2012-11-27 20:49:39 +01:00
Matthias Strubel
68c60c10a5
now reading the static content-file instead of generating everything
2012-11-04 19:37:47 +01:00
Matthias Strubel
0d3624326d
cleanup
...
central python_lib folder
Add python_lib to python's libpath
2012-11-01 19:39:37 +01:00
Matthias Strubel
1090f1da61
Fix for #16
2012-10-15 16:56:34 +02:00
Matthias Strubel
a05bf7759a
integration new Module for #16 into scripts and startup
2012-09-15 15:22:49 +02:00
Matthias Strubel
8903e32de6
Use new api verywhere in Shoubox-Scripts #16
2012-09-15 15:08:31 +02:00
Matthias Strubel
067d8221b0
More encapsuled function for SB #16
...
use central functions for saving data
2012-09-15 15:01:58 +02:00
Matthias Strubel
f23f3f4f1f
severall fixes aroung shoutbox modules #16
2012-09-13 07:19:16 +02:00
Matthias Strubel
2dba0bf24a
New library for shoutbox stuff
2012-09-11 21:42:37 +02:00
Matthias Strubel
11bbb79003
First implementation of JS Shoutbox #16
2012-08-29 18:41:49 +02:00
Matthias Strubel
39ae07d519
Modifications to say Windows Systems they are connected to the internet
...
;)
2012-08-05 14:59:18 +02:00
Matthias Strubel
4e55d01fdb
finished implementation of Connected client #10
...
First without automatic refresh
2012-07-15 16:09:20 +02:00
Matthias Strubel
27fa4d5aad
Removed not working JS #10
2012-06-16 09:01:55 +02:00
Matthias Strubel
026f1c3c69
simple display of result #10
2012-06-15 18:20:22 +02:00
