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
370 commits 21 branches 34 tags 3.3 MiB
Commit graph

247 commits

Author SHA1 Message Date
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 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
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
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
Chris Jung 5f9d4cbb69 Update hosts 
Typos corrected
 2014-06-27 17:34:29 +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 cbb55ce4d8 Enable PHP FastCGI within PirateBox and install it 
Merge branch 'php' into development
 2014-06-27 16:41:14 +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 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 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
Matthias Strubel a3e0ba2094 Closes #63 
Thank you
Merge branch 'taffy-nay-patch-1' into hotfix-1.0.1
 2014-06-17 13:29:38 +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 2d1b987d21 typo in hosts 
Merge branch 'campino2k-patch-1' into hotfix-1.0.1
 2014-06-15 01:00:53 +02:00
Chris Jung 38fe658ae3 Update hosts 
Typos corrected
 2014-06-14 13:25:31 +02:00
Matthias Strubel 37d168a952 Merge branch 'development' of github.com:PirateBox-Dev/PirateBoxScripts_Webserver into development 2014-06-11 13:12:44 +02:00
Matthias Strubel 13eb2243a2 Added German translation 
Issue #60 multi languages
 2014-06-11 13:08:23 +02:00
Matthias Strubel 1221435887 Fixing wrong link path to board out of shared folder 2014-06-09 08:34:43 +02:00
Matthias Strubel 129251582b Force the user to change the password, because he has to edit the file anyway. 
(remove leading # )
 2014-06-06 10:54:21 +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 696917d50d added configuration for fast-cgi server running php-cgi daemon forked by lighttpd 2014-01-17 17:33:20 +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 01d10be31e 3rd bunch of license headers 2014-01-17 16:52:26 +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 898e98e55f enable / disable file copy into share folder via config 2014-01-17 16:37:23 +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 98d1061a8a deliver sample configuration of minidlna within PirateBox release 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