6078 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jamie.Rees	13b6bee0eb	bundling changes	2017-04-07 14:37:44 +01:00
Jamie.Rees	9305e3a66a	stuff	2017-04-07 14:15:07 +01:00
Jamie.Rees	7b6e5fd431	Move app into wwwroot	2017-04-07 14:09:09 +01:00
Jamie.Rees	24c4ae2192	put uglify back in!	2017-04-07 14:00:24 +01:00
Jamie.Rees	4cf5a31fed	update node again...	2017-04-07 13:56:10 +01:00
Jamie.Rees	831e19e283	Update node	2017-04-07 13:51:32 +01:00
Jamie.Rees	ecd7725cf6	wrong line	2017-04-07 13:45:14 +01:00
Jamie.Rees	9d982cbcb9	Matt is helping	2017-04-07 13:40:46 +01:00
Jamie.Rees	d040d06976	changes	2017-04-07 13:27:13 +01:00
Jamie	8ce7ff07fc	Update StringCipher.cs	2017-04-06 21:55:44 +01:00
tidusjar	1e4f0d9e1b	revert	2017-04-06 21:49:44 +01:00
tidusjar	bb2e5a4c1c	small tweaks	2017-04-06 21:47:09 +01:00
tidusjar	92266c7a58	Upgrade to .Net Standard 1.6	2017-04-06 21:31:54 +01:00
Jamie	e33b54b8e7	Merge pull request #1351 from tidusjar/dev ... More fixes for the newsletter. This is final.	2017-04-06 21:17:13 +01:00
tidusjar	2e5e113743	Revert "Merge branch 'DotNetCore' into dev" ... This reverts commit 90827aa7f9, reversing changes made to 205f72a83d.	2017-04-06 21:15:47 +01:00
tidusjar	ab67ff692c	Merge branch 'dev' of https://github.com/tidusjar/Ombi into dev	2017-04-06 21:13:27 +01:00
tidusjar	f051bebd3e	Fixed the migration number and order by the added date for the newsletter #1264	2017-04-06 21:13:09 +01:00
Jamie	023ad680e2	Merge pull request #1350 from tidusjar/dev ... Dev	2017-04-06 20:51:51 +01:00
Jamie	90827aa7f9	Merge branch 'DotNetCore' into dev	2017-04-06 20:51:46 +01:00
Jamie	6a9e3fdc85	Merge pull request #1349 from tidusjar/dev ... Some Emby Newsletter fixes!	2017-04-06 20:50:55 +01:00
tidusjar	205f72a83d	Forgot this change	2017-04-06 20:50:14 +01:00
tidusjar	e22dac963a	Also fixed the issue for the Emby Newsletter where episodes were not getting added :(	2017-04-06 20:50:03 +01:00
Jamie	a386d233dc	Merge pull request #1348 from tidusjar/dev ... #1264 "They may take our lives, but they'll never take our freedom!"	2017-04-06 20:36:44 +01:00
tidusjar	d53864fef1	#1264 "They may take our lives, but they'll never take our freedom!"	2017-04-06 20:35:57 +01:00
Jamie.Rees	c4fcc4f2f2	more borken build	2017-04-06 16:30:58 +01:00
Jamie.Rees	b7f63ed1ce	Started adding requesting	2017-04-06 14:51:18 +01:00
tidusjar	e80f0bc601	Done the movie searching	2017-04-05 22:26:56 +01:00
tidusjar	1c301f2c54	#865	2017-04-04 23:07:13 +01:00
tidusjar	9e004dc57b	updates	2017-04-04 21:45:06 +01:00
tidusjar	33e6831902	more	2017-04-04 21:38:25 +01:00
tidusjar	148aac8fac	moar	2017-04-04 21:31:41 +01:00
tidusjar	1ab9b5a7cc	small changes	2017-04-04 21:21:24 +01:00
Jamie	4cf0ffac2f	Update gulpfile.js	2017-04-04 18:07:22 +01:00
Jamie	760a304798	Update gulpfile.js	2017-04-04 18:00:49 +01:00
Jamie	d41b4585cf	Update gulpfile.js	2017-04-04 17:52:18 +01:00
Jamie	01f2c6dd2e	Update gulpfile.js	2017-04-04 17:46:46 +01:00
Jamie	a1d60f7d41	Update appveyor.yml	2017-04-04 17:39:32 +01:00
Jamie	f3522920ab	Update gulpfile.js	2017-04-04 17:39:08 +01:00
Jamie	c47db8a659	Update appveyor.yml	2017-04-04 17:37:27 +01:00
Jamie	109aa7ced5	Update appveyor.yml	2017-04-04 17:31:26 +01:00
Jamie	45ecc8d4c2	Update appveyor.yml	2017-04-04 17:12:10 +01:00
Jamie	cfa07a3d4e	Update appveyor.yml	2017-04-04 17:05:50 +01:00
Jamie.Rees	767c69e137	styling	2017-04-04 16:30:50 +01:00
Jamie.Rees	e0250921a4	MOre changes	2017-04-04 15:48:49 +01:00
Jamie.Rees	71c84eb360	spacing	2017-04-04 12:55:24 +01:00
Jamie.Rees	5b68c4c5e4	try again	2017-04-04 12:52:30 +01:00
Jamie.Rees	41e91efb84	more	2017-04-04 12:48:01 +01:00
Jamie.Rees	6949a4128c	again	2017-04-04 12:37:32 +01:00
Jamie.Rees	4338b6783e	anbother	2017-04-04 12:31:15 +01:00
Jamie.Rees	0b43eab684	another	2017-04-04 12:20:15 +01:00