476 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Raelon Masters	9fdd7e25a0	Changed layout from grid to single column	2020-06-12 12:54:12 -04:00
Raelon Masters	1b54820d67	First push of newui	2020-06-11 11:20:32 -04:00
th3r00t	712e0f946c	Merge pull request #42 from th3r00t/mobi ... Now with mobi support!	2020-06-01 09:12:44 -04:00
th3r00t	af03de7ebb	Merge branch 'development' into mobi	2020-06-01 09:12:10 -04:00
Raelon Masters	d740456df5	Started UI Changes	2020-06-01 09:05:28 -04:00
Raelon Masters	c12a32eb01	Fixed improper python shebang	2020-05-31 14:06:54 -04:00
Raelon Masters	60f7184a3a	Fixed improper python shebang	2020-05-31 13:51:25 -04:00
Raelon Masters	7ee9c57ed1	First push with mobi support	2020-05-31 01:20:52 -04:00
th3r00t	8fc153d0e0	Merge pull request #39 from th3r00t/Gorian-patch-1 ... Updated discord and IRC links in readme	2020-05-24 14:16:55 -04:00
th3r00t	9186638da1	Merge pull request #40 from hat/master ... Should we run a separate docker branch permanently without the installer script or with a modified version?	2020-05-15 22:34:59 -04:00
th3r00t	e3bed81af2	Merge branch '0.5.0--docker' into master	2020-05-15 22:10:13 -04:00
Tony	1cc17aac49	Update .env	2020-05-14 18:06:12 -07:00
Tony	61236a19a7	Update README.md	2020-05-14 18:05:37 -07:00
Tony	cf73cb0d71	Upadte README.md ... Add how to import books from the docker container	2020-05-14 18:04:14 -07:00
Tony	4b5ffaaabf	Update README.md ... all steps not correct for Docker to run	2020-05-14 17:19:11 -07:00
Tony Hendrick	4e767bf0d4	update README	2020-05-14 15:38:26 -07:00
Tony Hendrick	d649761e4e	Removing migrate from Dockerfile	2020-05-14 15:20:41 -07:00
Tony Hendrick	2ae26b0e7b	Need to depend_on wand wait for Postgres container	2020-05-14 12:00:53 -07:00
Tony Hendrick	b993fd1945	Merge branch 'master' of github.com:hat/pyShelf	2020-05-14 11:49:58 -07:00
Tony Hendrick	bd60b7a60b	Dockerfile was missing migrations	2020-05-14 11:49:39 -07:00
Tony	1e72276a6b	Update README.md	2020-05-14 11:38:41 -07:00
Tony	f17ecd6e21	Update README.md	2020-05-14 11:32:46 -07:00
Tony	892765189f	Update README.md ... Clean up the Docker section	2020-05-14 11:31:30 -07:00
Tony Hendrick	0876b3953b	docker-compose is now functional ... added a cronjob in the pyShelf container to update the Books directory every 5 minutes went back to using a variable for the exposed port	2020-05-14 11:29:50 -07:00
Tony Hendrick	febacd73bb	Changing config and location of books directory	2020-05-14 10:41:35 -07:00
Layne	00f56288c5	Updated discord and IRC links in readme	2020-05-14 10:10:21 -07:00
Tony Hendrick	9e66fbed26	Adding defaults to config.json	2020-05-13 10:54:51 -07:00
Tony Hendrick	3a19041324	Dockerfile loading homepage, books not showing when in correct folder	2020-05-12 22:28:27 -07:00
Tony Hendrick	9014081bff	Adding docker directory with docker support	2020-05-12 21:38:25 -07:00
Tony Hendrick	245f3d09a8	Change settings.py and config.json to use an external PostgresDB	2020-05-12 15:08:01 -07:00
th3r00t	c96a172458	Merge pull request #38 from th3r00t/development ... Bring docker branch up to date with master, as pushed from version 0.5.0	2020-05-12 16:14:56 -04:00
th3r00t	0d6821a554	Merge branch '0.5.0--docker' into development	2020-05-12 16:14:25 -04:00
th3r00t	545740659c	Update README.md	2020-05-11 22:57:04 -04:00
th3r00t	111b502bdf	Merge pull request #37 from th3r00t/development ... Merge 0.5.0 to stable branch	2020-05-11 22:56:21 -04:00
th3r00t	a08742c7b0	Update README.md	2020-05-11 22:51:07 -04:00
th3r00t	12c19be138	Update README.md	2020-05-11 22:26:25 -04:00
th3r00t	9dc29eccb5	Update README.md	2020-05-11 22:13:47 -04:00
th3r00t	0c1c82f1a4	Update README.md	2020-05-11 21:51:29 -04:00
th3r00t	36c8c86da9	Update README.md	2020-05-11 21:47:07 -04:00
th3r00t	321429e465	Update README.md	2020-05-11 21:38:11 -04:00
th3r00t	84b993853d	Update README.md	2020-05-11 21:37:07 -04:00
Raelon Masters	ac1a166ae5	Merge branch 'development' of github.com:th3r00t/pyShelf into local development	2020-05-11 21:32:12 -04:00
Raelon Masters	a57d92a146	Updated readme with preview images	2020-05-11 21:31:15 -04:00
th3r00t	95cc5fa37d	Update README.md	2020-05-11 20:45:14 -04:00
th3r00t	0cbf559db9	Update README.md	2020-05-11 20:29:19 -04:00
Raelon Masters	090963bb83	Updated readme	2020-05-11 20:24:51 -04:00
th3r00t	66cf8fcba8	Update README.md	2020-05-11 19:25:25 -04:00
Raelon Masters	b2f61df59e	Updated readme	2020-05-11 19:20:37 -04:00
Raelon Masters	8d967a93a9	Removed breakpoints. Installer completes on bare arch install	2020-05-11 18:12:36 -04:00
Raelon Masters	545f747819	Debug psql startup	2020-05-11 16:55:56 -04:00