Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1ac8615
Fixed undefined index notices.
jklmnn Sep 23, 2015
8e1f316
Added pdo db_connector.php.
jklmnn Sep 24, 2015
de9c622
modified: .gitignore
r4mp Sep 24, 2015
f3ce8dc
qr-code generation added
r4mp Sep 24, 2015
458100c
Completed db connector according to current api.
jklmnn Sep 25, 2015
d1f7d01
replaced old database connectors in api.php with db_connector.
jklmnn Sep 25, 2015
7044f87
Fixed misleading status codes on multiple items.
jklmnn Sep 25, 2015
f5bec8c
generate QR code as base64 string instead as file
r4mp Sep 26, 2015
c45b420
fixed indents
r4mp Sep 26, 2015
ab174d9
fixed typo
r4mp Sep 26, 2015
3e49707
removed unused entry
r4mp Sep 26, 2015
81ace1c
Merge pull request #55 from r4mp/devel
jklmnn Sep 26, 2015
d016063
Create postinst.sh
J-8 Sep 26, 2015
3b569d1
Create update.sql
J-8 Sep 26, 2015
a26d65c
Create UPDATE.php
J-8 Sep 26, 2015
17a1df6
Update UPDATE.php
J-8 Sep 27, 2015
604a7eb
Fixed constant already defined notices.
jklmnn Sep 27, 2015
e794d22
Typo.
jklmnn Sep 30, 2015
d75fafe
Update README.md
Nov 25, 2015
2b7db66
Update README.md
Nov 26, 2015
bec584b
Merged
MalteKiefer Nov 26, 2015
de5583b
Merge pull request #73 from GroundApps/juanito003-master
Nov 26, 2015
8499a8b
Update README.md
Nov 26, 2015
85aaca0
Adding Docker support for easy deploying
Lertsenem Dec 20, 2015
bf06577
Merge branch 'docker' into devel
Lertsenem Dec 20, 2015
a2c54a8
Adding php-pdo_sqlite
Lertsenem Dec 21, 2015
08e1c1a
Typo causes warning
Lertsenem Dec 21, 2015
6edda84
Correction on entrypoint for hashed key
Lertsenem Dec 21, 2015
af431ef
Docker: persist sqlite file with volume
Lertsenem Dec 21, 2015
4df71c5
Update README with Docker instructions
Lertsenem Dec 21, 2015
f10e15d
Merge pull request #75 from Lertsenem/master
MalteKiefer Dec 21, 2015
6d491de
some fixes and cleanup + bootstrap ui
the0ne Apr 7, 2016
ac5ef9d
added viewport directive to support mobile device browsers
the0ne Apr 8, 2016
f5b0bfb
improving rwd compliance
the0ne Apr 8, 2016
a3209fa
updated css for improved layout and tap handling
the0ne Apr 11, 2016
d1ef743
webgui: add new element on enter button
the0ne Apr 21, 2016
9f0a87f
Merge pull request #78 from the0ne/devel
MalteKiefer Jun 3, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ $RECYCLE.BIN/
Network Trash Folder
Temporary Items
.apdisk

3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lib/phpqrcode-git"]
path = lib/phpqrcode-git
url = git://git.code.sf.net/p/phpqrcode/git
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Options All -Indexes
DirectoryIndex api.php
DirectoryIndex index.php
1 change: 1 addition & 0 deletions CONSTANTS.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
define('API_ERROR_DELETE', 6003);
define('API_ERROR_SAVE', 6004);
define('API_ERROR_CLEAR', 6005);
define('API_ERROR_LIST', 6006);
?>
30 changes: 30 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
FROM alpine

RUN apk update \
&& apk add \
nginx \
php-fpm \
php-json \
php-pdo \
php-pdo_sqlite \
&& rm -rf /var/cache/apk/*

COPY . /shoppinglist

VOLUME [ "/shoppinglist/data" ]

RUN chown -R nginx:www-data /shoppinglist/ \
&& chown -R nginx:www-data /shoppinglist/data/

# Copy scripts
COPY docker/nginx.conf /etc/nginx/
COPY docker/php-fpm.conf /etc/php/
COPY docker/entrypoint.sh /


EXPOSE 80

ENV API_KEY=""


CMD [ "/entrypoint.sh" ]
Loading