414 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Scott Tolksdorf	540c00cb0c	Merge branch 'noHtml' into v3	2017-02-23 10:07:32 -05:00
Scott Tolksdorf	446ae9cbcf	Merge branch 'dualRenderer' into noHtml	2017-02-23 10:07:05 -05:00
Scott Tolksdorf	dc486cfba9	Added nested markdown parsering within blocks	2017-02-23 10:03:04 -05:00
Scott Tolksdorf	a6a1f41e77	Merge branch 'newStyle' into dualRenderer	2017-02-23 09:58:38 -05:00
Scott Tolksdorf	fd567352a4	Moved imgs and fonts into the new style folder	2017-02-23 09:58:10 -05:00
Scott Tolksdorf	a33b1d845d	Styling is finally split, oh boy	2017-02-23 08:33:13 -05:00
Scott Tolksdorf	b20f4ffb46	PHB style should be fully scoped	2017-02-23 08:11:48 -05:00
Scott Tolksdorf	2f69ef3fe8	Removing the old server files	2017-02-23 07:41:55 -05:00
Scott Tolksdorf	1da1f90a35	Backing up the todo	2017-02-18 14:29:16 -05:00
Scott Tolksdorf	bd08858745	Split off the old stlying in a separate file	2017-02-13 00:45:17 -05:00
Scott Tolksdorf	304cd0ffcd	Getting both renderers to play nice	2017-02-12 23:35:19 -05:00
Scott Tolksdorf	b40e5bc4c4	simplifying the issue template, because no one ever actually uses it	2017-02-12 10:21:02 -05:00
Scott Tolksdorf	0663737e1c	moved the old parser and renderer into a depreciated folder	2017-02-04 03:27:10 -05:00
Scott Tolksdorf	307dd2d9ba	Adding newlines to div injection for blocks	2017-02-01 23:54:20 -05:00
Scott Tolksdorf	95c91b6ba8	Merge branch 'styleEditor' into noHtml	2017-01-30 10:48:34 -05:00
Scott Tolksdorf	c8c46725a2	Making the error looks better	2017-01-30 10:48:05 -05:00
Scott Tolksdorf	7001b71d91	Lots of progress with the new editor	2017-01-28 22:19:14 -05:00
Scott Tolksdorf	cbab4f4959	added todo	2017-01-28 16:38:51 -05:00
Scott Tolksdorf	22d9982888	Added support for title description and thumbnail images	2017-01-28 16:38:51 -05:00
Scott Tolksdorf	76ced9ca49	Added comma parsing to the block code	2017-01-28 16:38:51 -05:00
Scott Tolksdorf	b1db8040a4	Added a todo for generic line styling	2017-01-28 16:38:51 -05:00
Scott Tolksdorf	c8b089f7fb	Added new lexer for handling the new block syntax	2017-01-28 16:38:51 -05:00
Scott Tolksdorf	97c0443c76	Fixed bug where new page was storing null brews	2017-01-28 16:38:51 -05:00
Scott Tolksdorf	c470bed591	'Created	2017-01-28 16:38:51 -05:00
Scott Tolksdorf	4593099914	Merge branch 'newAdmin' into v3	2017-01-28 16:36:25 -05:00
Scott Tolksdorf	6030134de2	New brew search finished on admin page	2017-01-28 16:35:48 -05:00
Scott Tolksdorf	7e6f42f062	Merge branch 'search' into newAdmin	2017-01-28 15:39:05 -05:00
Scott Tolksdorf	75111acefb	All tests should be done, phew	2017-01-28 12:25:26 -05:00
Scott Tolksdorf	26bcb3395a	Fixing edge cases in the search tests	2017-01-27 19:47:45 -05:00
Scott Tolksdorf	a826aaffd9	created a brew generator and chai plugin for easier testing	2017-01-27 18:38:51 -05:00
Scott Tolksdorf	8018442f25	Upgrading the brew generation for testing	2017-01-27 10:47:38 -05:00
Scott Tolksdorf	8e58e5aca9	MOved the brews search to its own file, writing out more tests	2017-01-27 10:36:07 -05:00
Scott Tolksdorf	2f82d3875e	Adding a new script from populating the DB with a bunch of random brews	2017-01-27 09:56:44 -05:00
Scott Tolksdorf	efee8ff05c	Basic search is working	2017-01-23 00:35:30 -05:00
Scott Tolksdorf	a405c7cfb2	Stubbing out tests for searching	2017-01-22 13:42:40 -05:00
Scott Tolksdorf	dfcb04fd09	Setting up search tests	2017-01-22 13:42:32 -05:00
Scott Tolksdorf	728277f861	Removing invalid brews is working	2017-01-22 13:41:16 -05:00
Scott Tolksdorf	0878439750	Fixed issue with arrays not being saved	2017-01-22 13:41:08 -05:00
Scott Tolksdorf	e77532acef	Added tests for admin routes, lookup is working	2017-01-22 13:41:00 -05:00
Scott Tolksdorf	cd2eb5fdce	Adding in lookup route	2017-01-22 13:40:39 -05:00
Scott Tolksdorf	37de888f03	Creating a brand new admin page	2017-01-22 13:40:29 -05:00
Scott Tolksdorf	1aa79b32d9	Remove chrome warnings from after rebase	2017-01-22 12:55:00 -05:00
Scott Tolksdorf	894e345a44	Fixed bug where new page loaded null brews sometimes	2017-01-22 12:49:35 -05:00
Scott Tolksdorf	07f249b23e	Local login now working great	2017-01-22 12:49:35 -05:00
Scott Tolksdorf	baaa82ed34	Added in a logout to the user page	2017-01-22 12:49:22 -05:00
Scott Tolksdorf	0d0f0d8eb0	Adding in env configs and aextra protection on dev routes	2017-01-22 12:49:22 -05:00
Scott Tolksdorf	d77fa0a3dc	Backend of local login working	2017-01-22 12:49:22 -05:00
Scott Tolksdorf	a26c4e2092	Cleaned up the admin routes	2017-01-22 12:48:48 -05:00
Scott Tolksdorf	ca40ec5a2d	Added in full test coverage of current spec	2017-01-22 12:47:33 -05:00
Scott Tolksdorf	987363ed41	Fixing the pathing to the build folder	2017-01-22 12:47:33 -05:00