CouchPotatoServer

Author	SHA1	Message	Date
Ruud	f46cda99ce	Merge branch 'develop'	2015-02-22 17:42:37 +01:00
Ruud	a96e924916	Merge branch 'develop'	2015-02-22 16:24:17 +01:00
Ruud	55288ad648	Merge branch 'develop'	2015-02-18 17:21:39 +01:00
Ruud	a9e62c4461	Merge branch 'develop'	2015-02-16 16:24:21 +01:00
Ruud	0088584a50	Revert "Merge branch 'desktop' of github.com:RuudBurger/CouchPotatoServer" This reverts commit `40cd1b4e08`, reversing changes made to `5b1dd68675`.	2015-02-16 16:23:02 +01:00
Ruud	a4dff7a331	Merge branch 'develop'	2015-02-15 12:04:35 +01:00
Ruud	40cd1b4e08	Merge branch 'desktop' of github.com:RuudBurger/CouchPotatoServer	2015-02-15 12:04:30 +01:00
Ruud	5b1dd68675	Merge branch 'develop'	2015-01-17 13:04:58 +01:00
Ruud	4603b0c3b9	Merge branch 'develop'	2015-01-14 17:01:25 +01:00
Ruud	568e42e2f3	Merge branch 'develop'	2015-01-11 00:28:44 +01:00
Ruud	4929e7bbcc	Merge branch 'master' of github.com:RuudBurger/CouchPotatoServer	2015-01-10 12:31:29 +01:00
Ruud	38ee0ebe7b	Merge branch 'develop'	2015-01-10 12:26:47 +01:00
Ruud	9964d9591b	Merge branch 'develop'	2015-01-08 16:57:03 +01:00
Ruud	2f5526d57e	Merge branch 'develop'	2015-01-02 18:54:36 +01:00
Ruud	0288cc8848	Merge branch 'develop'	2014-12-22 22:02:05 +01:00
Ruud	739d668261	Merge branch 'develop'	2014-12-21 14:48:58 +01:00
Ruud	f450f2d1e3	Merge branch 'develop'	2014-12-20 21:45:25 +01:00
Ruud	a2be29c3b2	Merge branch 'develop'	2014-12-20 20:14:11 +01:00
Ruud	8770ab6696	Merge branch 'develop'	2014-12-20 19:10:04 +01:00
Ruud	aea673ddcd	Merge branch 'develop'	2014-12-19 14:16:28 +01:00
Ruud	f9fa87ce1d	Merge branch 'develop'	2014-12-19 09:12:19 +01:00
Ruud	ac65775743	Merge branch 'develop'	2014-12-01 12:58:18 +01:00
Ruud	cd55966575	One up!	2014-11-09 13:50:52 +01:00
Ruud	5873a5c8e2	Force include lxml	2014-11-09 13:50:43 +01:00
Ruud	32163b3951	Merge branch 'master' into desktop	2014-11-09 10:27:35 +01:00
Ruud	e0cc86b51c	Merge branch 'develop'	2014-11-09 10:27:12 +01:00
Ruud	7ec64e202b	Merge branch 'develop'	2014-10-20 21:05:14 +02:00
Ruud	da97b62c44	Merge branch 'develop'	2014-10-19 22:42:00 +02:00
Ruud	1fb031ff40	Merge branch 'develop'	2014-10-12 16:41:56 +02:00
Ruud	86edf5eb04	Exclude libs	2014-10-12 16:19:27 +02:00
Ruud	92f9743d3c	Merge branch 'master' into desktop	2014-10-11 23:01:02 +02:00
Ruud	1b151fbd97	Merge branch 'develop'	2014-10-11 22:59:53 +02:00
Ruud	0567504394	One up!	2014-10-11 22:46:45 +02:00
Ruud	c8a3b64624	Set black icon for mac	2014-10-11 22:45:31 +02:00
Ruud	c657d6d70b	Merge branch 'master' into desktop Conflicts: couchpotato/core/database.py	2014-10-11 19:34:46 +02:00
Ruud	d307d343e5	Merge branch 'develop'	2014-10-11 19:33:06 +02:00
Ruud	f2ab59e384	Merge branch 'develop'	2014-10-11 14:38:21 +02:00
Ruud	55f201040b	Merge branch 'develop'	2014-10-09 23:10:52 +02:00
Ruud	476a5cc3dd	Merge branch 'develop'	2014-10-08 23:08:33 +02:00
Ruud	342a4ad885	Merge branch 'develop'	2014-10-08 23:00:37 +02:00
Ruud	12159a1b7b	Merge branch 'develop'	2014-10-08 22:54:41 +02:00
Ruud	b773f7b71c	Merge branch 'develop'	2014-10-07 23:09:44 +02:00
Ruud	41aba6b19c	Merge branch 'develop'	2014-10-07 09:30:07 +02:00
Ruud	96def8563b	Merge branch 'develop'	2014-10-05 11:16:06 +02:00
Ruud	bf46a937c0	Merge branch 'develop'	2014-10-04 22:57:51 +02:00
Ruud	2edb6caa97	Merge branch 'develop'	2014-10-04 22:19:37 +02:00
Ruud	9e125a361a	Merge branch 'develop'	2014-10-04 15:43:01 +02:00
Ruud	2252ed710c	Merge branch 'develop'	2014-09-29 16:25:19 +02:00
Ruud	07a790e9b2	Merge branch 'develop'	2014-09-25 22:32:38 +02:00
Ruud	bb6fefd010	Merge branch 'develop'	2014-09-23 14:54:21 +02:00
Ruud	55e489cc51	Mark faulty movies done	2014-09-19 00:14:52 +02:00
Ruud	7fe5a271dc	Make sure original_folder isn't empty fix #3747	2014-09-18 22:00:59 +02:00
Ruud	ea92c503bb	Merge branch 'develop'	2014-09-18 21:44:35 +02:00
Ruud	6942126b7f	Merge branch 'develop'	2014-09-18 17:58:48 +02:00
Ruud	a6d37bf9c2	Merge branch 'develop'	2014-09-18 17:51:25 +02:00
Ruud	37c6bc7612	Merge branch 'develop'	2014-09-18 17:48:04 +02:00
Ruud	d6a264aaed	Merge branch 'develop'	2014-09-03 16:47:48 +02:00
Ruud	108f3292c3	Merge branch 'develop'	2014-09-01 23:07:12 +02:00
Ruud	fc60727e82	Merge branch 'develop'	2014-09-01 13:40:19 +02:00
Ruud	49cd8fbc2c	Merge branch 'develop'	2014-09-01 13:32:39 +02:00
Ruud	1991792291	Remove ending seperator	2014-08-27 22:04:33 +02:00
Ruud	29290022e6	Merge branch 'develop'	2014-08-27 19:56:17 +02:00
Ruud	04aa2e5fa4	Merge branch 'develop' Conflicts: couchpotato/core/database.py	2014-08-16 13:30:37 +02:00
Ruud	6772b9d965	Don't migrate when db is closed	2014-07-17 23:09:26 +02:00
Ruud	5df14d67e1	One up	2014-07-17 22:28:32 +02:00
Ruud	73abd1f022	Merge branch 'refs/heads/master' into desktop	2014-07-17 22:27:23 +02:00
Ruud	e75a8529c9	Try fix migration failure from 2.5.1	2014-07-17 22:26:23 +02:00
Ruud	07a7f8cbcf	Change fanart api url	2014-07-16 10:32:02 +02:00
Ruud	9b35a0fb20	Only trigger onClose when it's set	2014-07-08 21:21:22 +02:00
Ruud	0622e6e5ab	One up	2014-06-29 23:16:09 +02:00
Ruud	f16931906f	Don't remove pyc files when using desktop updater	2014-06-29 23:15:36 +02:00
Ruud	68dcba8853	One up 2/2	2014-06-29 21:56:51 +02:00
Ruud	ae8f66df1a	Exit main loop on crash	2014-06-29 21:56:39 +02:00
Ruud	5237ead5cb	Merge branch 'refs/heads/develop' into desktop	2014-06-29 17:01:47 +02:00
Ruud	45b2dff6d2	Merge branch 'refs/heads/develop'	2014-06-29 11:01:09 +02:00
Ruud	30d56b5d2c	Merge branch 'refs/heads/develop'	2014-06-29 00:02:55 +02:00
Ruud	5ff6824ae9	Merge branch 'refs/heads/develop'	2014-06-25 18:26:10 +02:00
Ruud	0210859155	Merge branch 'refs/heads/develop'	2014-06-25 09:17:12 +02:00
Ruud	665478db13	Merge branch 'refs/heads/develop'	2014-06-23 23:45:03 +02:00
Ruud	84c366ab54	Merge branch 'master' of github.com:RuudBurger/CouchPotatoServer	2014-06-23 20:47:30 +02:00
Ruud	908e5eae77	Merge branch 'refs/heads/develop'	2014-06-23 20:47:06 +02:00
Ruud	c4aaa10308	One up	2014-06-23 20:00:06 +02:00
Ruud	d10536a829	Remove path from getOptions	2014-06-23 20:00:00 +02:00
Ruud	1e7fa82e11	Merge branch 'refs/heads/develop' into desktop	2014-06-23 19:01:58 +02:00
Ruud	1d448f3d9c	Merge branch 'refs/heads/develop'	2014-06-23 14:29:20 +02:00
Ruud	338b5f427a	Merge branch 'refs/heads/develop'	2014-06-23 13:37:50 +02:00
Ruud	59e3e73c4c	Merge branch 'refs/heads/develop'	2014-06-23 01:19:05 +02:00
Ruud	cb2614127c	Merge branch 'refs/heads/develop'	2014-06-22 21:14:44 +02:00
Ruud	fdbd826917	Merge branch 'refs/heads/develop'	2014-06-22 20:35:30 +02:00
Ruud	31daf4915e	Merge branch 'refs/heads/develop'	2014-06-20 21:31:48 +02:00
Ruud	4ca7691afd	Merge branch 'refs/heads/develop'	2014-06-20 21:08:33 +02:00
Ruud	64d3ecd9b8	Merge branch 'refs/heads/develop'	2014-06-20 14:52:15 +02:00
Ruud	d55df3240f	Merge branch 'refs/heads/develop'	2014-06-20 14:14:26 +02:00
Ruud	52214e4938	Merge branch 'refs/heads/develop'	2014-06-20 12:22:13 +02:00
Ruud	b45307e493	Merge branch 'refs/heads/develop'	2014-06-11 23:51:05 +02:00
Ruud	4320369448	Merge branch 'refs/heads/develop'	2014-06-11 10:15:31 +02:00
Ruud	f560dc093c	Merge branch 'refs/heads/develop'	2014-06-10 22:54:14 +02:00
Ruud	d26a2b1480	Merge branch 'refs/heads/develop'	2014-06-07 20:44:49 +02:00
Ruud	e11b07b559	Don't save profile order twice	2014-06-06 17:26:45 +02:00
Ruud	b6ee8ef4d4	Merge branch 'refs/heads/develop'	2014-06-06 11:24:24 +02:00
Ruud	f80559d380	Merge branch 'refs/heads/develop'	2014-06-03 22:31:20 +02:00
Ruud	8530b00e7b	Merge branch 'refs/heads/develop'	2014-06-03 17:18:11 +02:00
Ruud	5851e1e69f	Merge branch 'refs/heads/develop'	2014-06-02 23:51:01 +02:00
Ruud	686bfd62eb	Merge branch 'refs/heads/develop'	2014-06-02 15:10:29 +02:00
Ruud	9b82603c26	Merge branch 'refs/heads/develop'	2014-06-02 14:20:50 +02:00
Ruud	f41792915f	Merge branch 'refs/heads/develop'	2014-06-02 12:59:47 +02:00
Ruud	2fa77fb610	Merge branch 'refs/heads/develop'	2014-06-02 10:40:07 +02:00
Ruud	e64d0e33fc	Merge branch 'refs/heads/develop'	2014-06-01 14:31:39 +02:00
Ruud	b168643600	Merge branch 'refs/heads/develop' Conflicts: couchpotato/core/helpers/variable.py	2014-05-31 22:50:02 +02:00
Ruud	240283405e	variable 'year' referenced before assignment	2014-05-07 11:50:36 +02:00
Ruud	b69f8b7ed5	Files not properly send to sabnzbd	2014-03-19 22:33:14 +01:00
Ruud	fbccba77a7	64Bit installer setup	2014-03-16 13:00:09 +01:00
Ruud	d3efda74b2	One up	2014-03-16 09:44:44 +01:00
Ruud	66b849cb29	Merge branch 'refs/heads/master' into desktop Conflicts: version.py	2014-03-16 09:43:32 +01:00
Ruud	b19f98ef5b	Merge branch 'refs/heads/develop'	2014-03-15 12:35:28 +01:00
Ruud	c389790cf2	Merge branch 'refs/heads/develop'	2014-03-03 22:19:29 +01:00
Ruud	d7445dfa80	Merge branch 'refs/heads/develop'	2014-02-26 14:00:56 +01:00
Ruud	36782768a4	Merge branch 'refs/heads/develop'	2014-02-25 21:37:29 +01:00
Ruud	2c9d487614	Update build url	2014-02-25 21:20:59 +01:00
Ruud	b9a724c8bb	Merge branch 'refs/heads/develop'	2014-02-16 09:43:03 +01:00
Ruud	68d826ca1c	Merge branch 'refs/heads/develop'	2014-02-15 19:48:07 +01:00
Ruud	d6921882e1	Merge branch 'refs/heads/develop'	2014-02-14 19:39:47 +01:00
Ruud	2cfff73486	Merge branch 'refs/heads/develop'	2014-01-18 19:54:32 +01:00
Ruud	0c7dda8d44	Merge branch 'refs/heads/develop'	2014-01-17 23:17:41 +01:00
Ruud	dbaa377770	version.master	2014-01-17 16:29:29 +01:00
Ruud	47d2b81d1c	Merge branch 'refs/heads/develop'	2014-01-17 16:28:59 +01:00
Ruud	f79fcda27f	Small one up	2013-11-17 21:22:24 +01:00
Ruud	cdbcad2238	Merge branch 'refs/heads/develop' into desktop	2013-11-17 21:20:30 +01:00
Ruud	5d913e87c3	One up!	2013-11-17 20:20:18 +01:00
Ruud	16f02bda27	Merge branch 'refs/heads/develop' into desktop	2013-11-17 20:03:22 +01:00
Ruud	8d108b92bf	One Up	2013-09-23 21:48:12 +02:00
Ruud	46783028b1	Merge branch 'refs/heads/develop' into desktop	2013-09-23 21:36:45 +02:00
Ruud	d08c7c57a8	One up!	2013-09-20 17:46:54 +02:00
Ruud	eeeb845ef3	Simplify string before checking on imdb	2013-09-20 17:30:11 +02:00
Ruud	651a063f94	Fix about submenu	2013-09-20 16:33:01 +02:00
Ruud	f20aaa2d9d	Hide IE clear button on search	2013-09-20 16:23:42 +02:00
Ruud	ba925ec191	Merge branch 'refs/heads/develop' into desktop Conflicts: couchpotato/core/plugins/suggestion/main.py	2013-09-20 16:12:40 +02:00
Ruud	3b7376fd18	One up	2013-07-06 01:01:26 +02:00
Ruud	c31b10c798	Ignore current suggested results	2013-07-06 00:49:11 +02:00
Ruud	acda664686	Merge branch 'refs/heads/develop' into desktop Conflicts: version.py	2013-07-05 22:43:54 +02:00
Ruud	e2852407ea	One up	2013-06-03 22:22:44 +02:00
Ruud	88e738c6cd	Don't show double updater name	2013-06-03 22:22:35 +02:00
Ruud	eaae8bdb0b	Merge branch 'refs/heads/develop' into desktop	2013-06-03 22:00:21 +02:00
Ruud	821f68909d	One up	2013-05-05 21:19:10 +02:00
Ruud	2b8dfed475	Merge branch 'refs/heads/master' into desktop Conflicts: version.py	2013-05-05 20:31:28 +02:00
Ruud	607b5ea766	Run exe after install	2013-03-19 21:22:07 +01:00
Ruud	88579cd71a	One up	2013-03-19 20:52:07 +01:00
Ruud	6c57316ce6	Use https for changelog	2013-03-19 20:46:00 +01:00
Ruud	6702683da3	Merge branch 'refs/heads/develop' into desktop	2013-03-19 20:34:38 +01:00
Ruud	1ed58586a1	Force install install in AppData Add images to installer	2013-03-18 23:56:54 +01:00
Ruud	f08ccd4fd8	One up installer	2013-03-17 22:34:04 +01:00
Ruud	312562a9f5	Merge branch 'refs/heads/develop' into desktop Conflicts: version.py	2013-03-17 16:42:53 +01:00
Ruud	9e260a89af	One up	2013-01-26 14:51:39 +01:00
Ruud	d233e4d22e	Merge branch 'refs/heads/develop' into desktop	2013-01-26 13:54:56 +01:00
Ruud	23893dbcb9	Merge branch 'refs/heads/develop' into desktop	2013-01-25 20:13:58 +01:00
Ruud	506871b506	One up	2013-01-23 23:10:55 +01:00
Ruud	6115917660	Merge branch 'refs/heads/develop' into desktop Conflicts: version.py	2013-01-23 22:57:07 +01:00
Ruud	21df8819d3	Merge branch 'refs/heads/develop' into desktop	2013-01-23 22:55:09 +01:00
Ruud	fb3f3e11f6	Merge branch 'refs/heads/develop' into desktop	2013-01-22 21:40:40 +01:00
Ruud	178c8942c3	Merge branch 'refs/heads/develop' into desktop	2013-01-14 19:54:22 +01:00
Ruud	51e747049d	One up	2013-01-07 23:10:42 +01:00
Ruud	0582f7d694	Urlencode spotweb id. fix #1213	2013-01-07 23:10:06 +01:00
Ruud	fa7cac7538	Merge branch 'refs/heads/develop' into desktop	2013-01-07 22:41:55 +01:00
Ruud	9a314cfbc4	One up	2012-12-29 00:03:45 +01:00
Ruud	5941d0bf77	Add version to update url	2012-12-29 00:03:36 +01:00
Ruud	d326c1c25c	Merge branch 'refs/heads/master' into desktop Conflicts: version.py	2012-12-28 23:31:08 +01:00
Ruud	96472a9a8f	One up	2012-12-16 23:51:58 +01:00
Ruud	27252561e2	Merge branch 'refs/heads/develop' into desktop	2012-12-16 23:51:24 +01:00
Ruud	c9e732651f	One up	2012-12-01 12:16:58 +01:00
Ruud	7849e7170d	Uninstall only create files, no wildcard .	2012-12-01 12:16:51 +01:00
Ruud	087894eb4e	Merge branch 'refs/heads/develop' into desktop Conflicts: version.py	2012-12-01 11:50:08 +01:00
Ruud	25f1b8c7a7	Fedora init fix #1009	2012-11-02 18:32:15 +01:00
Ruud	e71da1f14d	Use proper description for binary build. fix #1005	2012-11-02 18:24:13 +01:00
Ruud	938b14ba18	One up installer	2012-10-29 20:45:17 +01:00
Ruud	d6522d8f38	One up installer	2012-10-27 18:49:44 +02:00
Ruud	78eab890e7	Merge branch 'refs/heads/develop' into desktop	2012-10-27 18:25:36 +02:00
Ruud	1a56191f83	Don't unzip	2012-10-27 18:22:50 +02:00
Ruud	41c0f34d95	Properly restart	2012-10-27 18:22:40 +02:00
Ruud	37bf205d7a	Merge branch 'refs/heads/develop' into desktop Conflicts: version.py	2012-10-27 11:56:57 +02:00
Ruud	aa1fa3eb9a	Add description	2012-09-19 15:42:33 +02:00
Ruud	0e2f8a612c	Extract zip after build, for testing	2012-09-19 15:29:07 +02:00
Ruud	465e7b2abc	Merge branch 'refs/heads/develop' into desktop	2012-09-16 12:36:17 +02:00
Ruud	578fb45785	Installer 1 up	2012-09-16 11:35:56 +02:00
Ruud	96995bbbe5	Merge branch 'refs/heads/develop' into desktop Conflicts: version.py	2012-09-16 10:45:19 +02:00
Ruud	4cfdafebbc	Merge branch 'refs/heads/develop' into desktop	2012-09-14 13:15:47 +02:00
Ruud	b97acb8ef5	Merge branch 'refs/heads/develop' into desktop	2012-09-14 13:08:19 +02:00
Ruud	d68d2dfdb6	Updated installer	2012-09-09 21:48:38 +02:00
Ruud	39b269a454	Merge branch 'refs/heads/develop' into desktop	2012-09-09 17:32:47 +02:00
Ruud	ac081d3e10	Getting ready for build	2012-09-09 17:28:23 +02:00
Ruud	5d4efb60cf	Merge branch 'refs/heads/develop' into desktop	2012-09-08 16:01:49 +02:00
Ruud	cc408b980c	Merge branch 'refs/heads/develop' into desktop Conflicts: couchpotato/core/_base/updater/main.py	2012-08-05 16:18:35 +02:00
Ruud	59590b3ac9	Merge branch 'refs/heads/develop' into desktop Conflicts: couchpotato/core/_base/updater/main.py	2012-07-14 00:35:00 +02:00
Ruud	ff759dacf3	Merge branch 'refs/heads/develop' into desktop Conflicts: couchpotato/core/_base/updater/main.py	2012-07-11 22:43:45 +02:00
Ruud	a328e44130	Merge branch 'desktop' of github.com:RuudBurger/CouchPotatoServer into desktop	2012-05-15 23:23:56 +02:00
Ruud	7924cac5f9	Update installer version	2012-05-15 23:21:24 +02:00
Ruud	1cef3b0c93	remove --nogit tag	2012-05-15 23:21:24 +02:00
Ruud	3cd59edc8b	Import errors File icon	2012-05-15 23:21:24 +02:00
Ruud	0d624af01d	Working PNG	2012-05-15 23:21:24 +02:00
Ruud	a09132570c	Change branch to desktop	2012-05-15 23:21:14 +02:00
Ruud	ee3fc38432	Better setup	2012-05-15 23:21:14 +02:00
Ruud	dbf0192c8e	Inno setup, start	2012-05-15 23:21:14 +02:00
Ruud	6962cfc3f5	new Desktop runner	2012-05-15 23:21:14 +02:00
Ruud	e096ec3b5b	Desktop files	2012-05-15 23:20:05 +02:00
Ruud	b30a74ae0c	Merge branch 'refs/heads/develop' into desktop	2012-05-15 23:15:17 +02:00
Ruud	978eeb16c9	Update installer version	2012-05-15 23:14:20 +02:00
Ruud	e5c9d91657	Merge branch 'refs/heads/develop' into desktop	2012-05-15 22:27:22 +02:00
Ruud	fa81c3a07a	Merge branch 'refs/heads/develop' into desktop Conflicts: version.py	2012-05-14 22:00:02 +02:00
Ruud	9cdd520d41	Merge branch 'refs/heads/develop' into desktop	2012-05-14 20:22:55 +02:00
Ruud	55d7898771	Merge branch 'refs/heads/develop' into desktop	2012-05-13 12:56:45 +02:00
Ruud	b8256bef97	Merge branch 'refs/heads/develop' into desktop	2012-05-12 00:35:52 +02:00
Ruud	5be9dc0b4a	Merge branch 'refs/heads/develop' into desktop	2012-05-09 22:20:53 +02:00
Ruud	7d0be0cefb	remove --nogit tag	2012-05-07 22:55:54 +02:00
Ruud	f7ce1edb13	Merge branch 'refs/heads/develop' into desktop	2012-05-07 22:44:01 +02:00
Ruud	5ad9280b60	Merge branch 'refs/heads/develop' into desktop	2012-05-07 22:27:55 +02:00
Ruud	2b353f1b20	Merge branch 'refs/heads/develop' into desktop	2012-05-04 17:29:15 +02:00
Ruud	75ab90b87b	Merge branch 'refs/heads/develop' into desktop	2012-05-02 21:40:19 +02:00
Ruud	0219296120	Import errors File icon	2012-05-02 21:34:45 +02:00
Ruud	20032b3a31	Working PNG	2012-05-01 07:35:44 +02:00
Ruud	ea9e9a8c90	Updater base	2012-05-01 07:35:27 +02:00
Ruud	f7b0ee145b	Change branch to desktop	2012-04-30 21:37:04 +02:00
Ruud	cc866738ee	Merge branch 'refs/heads/develop' into desktop	2012-04-30 21:32:56 +02:00
Ruud	eadccf6e33	Merge branch 'refs/heads/develop' into desktop	2012-04-29 00:00:25 +02:00
Ruud	b70b66e567	Merge branch 'refs/heads/develop' into desktop	2012-04-28 23:14:59 +02:00
Ruud	5b6792dc20	Merge branch 'refs/heads/develop' into desktop Conflicts: CouchPotato.py couchpotato/core/plugins/renamer/main.py couchpotato/core/plugins/trailer/__init__.py	2012-04-07 21:35:36 +02:00
Ruud	f498e7343a	Better setup	2012-02-25 01:48:58 +01:00
Ruud	6962f441e6	Inno setup, start	2012-02-21 18:50:34 +01:00
Ruud	1def62b1b1	new Desktop runner	2012-02-19 17:13:37 +01:00
Ruud	a4a4a6a185	Merge branch 'refs/heads/develop' into desktop Conflicts: CouchPotato.py	2012-02-19 13:14:56 +01:00
Ruud	d4c9469c1a	Remove nfo when not renaming as .orig.nfo	2012-02-19 12:53:55 +01:00
Ruud	3e2d4c5d7b	Initial trailer support	2012-02-19 12:48:54 +01:00
Ruud	d03f711d69	kwargs in file.download for urlopen	2012-02-19 12:45:22 +01:00
Ruud	44dd8d9b96	Merge lists, not overwrite	2012-02-19 12:37:25 +01:00
Ruud	549a3be0d8	Merge branch 'refs/heads/develop' into desktop	2012-02-12 00:10:56 +01:00
Ruud	1bb2edf8ec	Merge branch 'refs/heads/develop' into desktop	2012-02-11 23:33:14 +01:00
Ruud	84c6f36315	Desktop files	2012-02-11 23:06:14 +01:00

1 changed files with 1 additions and 1 deletions

									
										version.py
									
		+1
		-1
	
												View File
												
					@@ -1,2 +1,2 @@

					VERSION = None

					VERSION = None

					BRANCH = 'develop'

					BRANCH = 'master'

`@@ -1,2 +1,2 @@`
	`VERSION = None`	`VERSION = None`
	`BRANCH = 'develop'`	`BRANCH = 'master'`

Compare commits

235 Commits

develop ... master

Compare commits

235 Commits develop ... master

235 Commits

develop ... master