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

94 commits

Author SHA1 Message Date
Matthias Strubel
f301358cf2 Added changelog and Version bump from hotfix-1.0.1 branch 
Conflicts:
	CHANGELOG
	Makefile
 2014-06-27 17:37:09 +02:00
Matthias Strubel
982fc25294 Changlog: documented merged features 2014-06-27 17:27:59 +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
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
9906dd9a18 Added more fixes on depended packages 2014-06-27 15:46:11 +02:00
Matthias Strubel
536931928d Added changelog and Version bump 2014-06-23 21:35:49 +02:00
Matthias Strubel
660531eb6f Release PirateBox 1.0 
Merge branch 'release-1.0' into stable

Conflicts:
	CHANGELOG
	Makefile
	piratebox/piratebox/bin/install_piratebox.sh
	piratebox/piratebox/conf/lighttpd/lighttpd.conf
 2014-05-29 14:14:45 +02: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
7fdfaf4b86 added imagefile to changelog 2014-01-16 22:55: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
0832c31794 updated Changelog for mising points 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
Matthias Strubel
09426f0c8e update of beta3 changes 
Conflicts:
	CHANGELOG
 2013-11-29 17:45:16 +01:00
Matthias Strubel
ae6e171281 Added new directory-Design to CHANGELOG and David Brooks to Authors 2013-11-29 17:44:03 +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
3a3aa7c28e added changelog entry 
Conflicts:
	CHANGELOG
 2013-11-29 17:41:36 +01:00
Matthias Strubel
8821cdc4ac fixed changelog .. 2013-11-29 17:35:57 +01:00
Matthias Strubel
a268c395b5 removal of service 
Conflicts:
	CHANGELOG
 2013-11-29 17:35:48 +01:00
Matthias Strubel
a493301464 updated Changelog for mising points 2013-11-10 11:28:56 +01:00
Matthias Strubel
0073803eac Fixed captive Portal detection for iOS7 
Conflicts:
	CHANGELOG
 2013-09-27 15:41:35 +02:00
Matthias Strubel
7b5ee7e4bc Fixed captive Portal detection for iOS7 
Conflicts:
	CHANGELOG
 2013-09-27 15:36:31 +02:00
Matthias Strubel
b021550c25 Fixed captive Portal detection for iOS7 2013-09-27 15:29:56 +02:00
Matthias Strubel
a59d56977d Enable unescaped blanks in upload-folder variable 2013-09-12 20:38:08 +02:00
Matthias Strubel
9673ae2f30 update of beta3 changes 2013-08-26 09:36:49 +02:00
Matthias Strubel
c5ae25d7b1 removal of service 
Conflicts:
	CHANGELOG
 2013-08-26 08:14:50 +02:00
Matthias Strubel
0d0c37f3d4 Generating lease-file location based on config file. Place it on OpenWRT into /tmp => memory 
Conflicts:
	CHANGELOG
 2013-08-26 08:13:34 +02:00
Matthias Strubel
99f4a97c3c Added new directory-Design to CHANGELOG and David Brooks to Authors 2013-08-21 10:08:11 +02:00
Matthias Strubel
de0bdcf110 Merge branch 'change_hostname' into development 2013-08-11 17:13:30 +02:00
Matthias Strubel
1f4b863bc3 Merge branch 'change_hostname' into release-1.0 
Conflicts:
	CHANGELOG
 2013-08-11 17:10:59 +02:00
Matthias Strubel
5a5f3acce9 Generating lease-file location based on config file. Place it on OpenWRT into /tmp => memory 2013-08-11 17:09:03 +02:00
Matthias Strubel
6cba62f519 Documentation 2013-08-11 16:39:21 +02:00
Matthias Strubel
119fa6f086 fixed changelog .. 2013-08-11 16:28:27 +02:00
Matthias Strubel
ff42872fd5 removal of service 2013-08-11 16:27:01 +02:00
Matthias Strubel
73a6d606e5 added responsive design to changelog 2013-08-11 16:26:45 +02:00
Matthias Strubel
66b31067ae Merge remote-tracking branch 'origin/change_hostname' into librarybox_dev 
Conflicts:
	CHANGELOG
 2013-08-02 07:57:39 +02:00
Matthias Strubel
010bcc93f0 Added fix to changelog 2013-07-30 17:17:57 +02:00
Matthias Strubel
f48a6b78e6 added changelog entry 2013-07-10 16:13:12 +02:00
Matthias Strubel
f609d21a57 Merge branch 'mime_type_issues' into development 
Conflicts:
	.gitignore
	Makefile
	README
	piratebox/piratebox/init.d/piratebox_alt
 2013-07-10 16:05:48 +02:00
Matthias Strubel
e8ccc27169 first changes for PHP enabling 2013-07-10 15:47:42 +02:00
Matthias Strubel
21a7e29040 Created changelog to keep track of changes in releases 2013-06-10 19:10:02 +02:00
Matthias Strubel
7b8c852ad2 Created changelog to keep track of changes in releases 2013-06-10 19:08:04 +02:00