Commit Graph

163 Commits

Author SHA1 Message Date
rembo10 7240db2567 Took out automatic torrage links, now grab either the magnet or torrent file, depending on settings, also, allow headphones to open magnet links if the blackhole option is set 2014-04-08 15:14:38 -07:00
rembo10 ea1e01d417 Merge remote-tracking branch 'NovaXeros/master' into develop
Conflicts:
	headphones/searcher.py
	headphones/webserve.py
2014-04-08 12:31:18 -07:00
NovaXeros 9416d185e7 Added LMS config options 2014-04-08 02:07:28 +01:00
rembo10 1580f5c22e Added a little text to the config file for OR words 2014-04-05 16:14:55 -07:00
rembo10 799aa5c26a Added option to replace existing folders instead of creating duplicates 2014-04-03 22:12:48 -07:00
rembo10 acad25c534 Initial changes to get 'prefer torrents' option working 2014-04-03 15:29:53 -07:00
Bas Stottelaar 31ed56bcc9 Merge with rembo10/develop 2014-04-01 09:41:48 +02:00
rembo10 11b5c9ced1 Merge conflict from basilfx/multicore merge 2014-03-31 16:57:48 -07:00
Bas Stottelaar 9872e9a1a3 Update WebUI to enable/disable Growl notifications 2014-04-01 00:36:02 +02:00
Bas Stottelaar b51a2eb4e3 Added switches in WebUI to enable/disable multi-core 2014-03-31 21:14:50 +02:00
gotson 88a2d364f6 Pushbutton API token override 2014-03-31 17:46:18 +08:00
rembo10 1d949badae Fixed merge conflicts from gotson songkick pull request 2014-03-28 10:35:02 -07:00
rembo10 df9432163e Reverted commit 2e64968 which added a new post processing dir 2014-03-28 10:16:41 -07:00
gotson 96bc2b835c Songkick is now optional 2014-03-28 18:06:32 +08:00
gotson 44acaf7599 Songkick API key now properly stored in config.ini (and empty by default)
Added possibility to filter Songkick results per location (so far using a metro-area id)
2014-03-28 17:37:19 +08:00
Patrick Yates 8ed040a24e More descriptive api key label 2014-03-08 18:55:58 +11:00
Patrick Yates 6f7f472478 Added PushBullet notification support 2014-03-08 10:50:52 +11:00
rembo10 fb80889d8e Added a Notifications tab 2014-02-27 18:33:38 -08:00
rembo10 c113d8f9aa Fixed some merge conflicts with the songkick merge from maiis 2014-02-27 18:24:47 -08:00
rembo10 e0425f83a2 Merge remote-tracking branch 'pastudan/master' into develop 2014-02-27 18:20:49 -08:00
rembo10 2e64968502 Fixed merged conflicts with postprocessing merge from echel0n, fixed some tabs->whitespace, fixed screwed up merge conflict resolution from pushalot merge 2014-02-27 18:16:20 -08:00
rembo10 b8f3a81512 Merge conflicts with pushalot merge 2014-02-27 18:11:03 -08:00
rembo10 1ff1e1fe0b Fixed some merge conflicts i webserve.py from the echel0n plex merge 2014-02-27 18:07:31 -08:00
Dan Pastusek 635c23dfc9 convert all icons to font-awesome vector based / retina compatible icons
Conflicts:
	data/interfaces/default/artist.html
2014-02-15 01:54:55 +00:00
Emmanuel Vuigner 424c53f6fb add songkick upcoming concerts on ArtistPage 2014-02-13 22:44:36 +00:00
Dan Pastusek 1c9f323e7e convert all icons to font-awesome vector based / retina compatible icons 2014-01-28 00:10:41 -07:00
Justin Tabish d4a5afea8b Added ability to set a seperate post-processing folder 2014-01-21 15:01:41 -08:00
Justin Tabish 5db9002bc4 Pushalot Service Added 2014-01-21 08:46:57 -08:00
Justin Tabish ec0fd92b80 Added Plex Media Server and Client Update Library and Notification functions. 2014-01-21 04:40:45 -08:00
theguardian 7108398099 Added Twitter as a notification option. 2014-01-15 13:07:45 -08:00
rembo10 31cdb095dc Took off a little of the transmission_host description text 2014-01-13 10:32:32 +00:00
rembo10 251c55d84c Merge remote-tracking branch 'Qt-dev/master' into develop 2014-01-13 10:31:22 +00:00
rembo10 6ffacc2fe9 Merge remote-tracking branch 'seif/omgwtfnzbs' into develop 2013-12-19 16:33:26 +00:00
rembo10 883b316f84 Merge remote-tracking branch 'theguardian/master' into develop 2013-12-19 16:24:08 +00:00
theguardian 5d41a3adb9 Fixed libraryscan to ignore unmatchable tracks unless something changes that makes them matchable.
Fixed some persistent bugs that were bothering me regarding newartists, etc
2013-12-13 17:00:59 -08:00
rembo10 8ded4b6edc Merge remote-tracking branch 'theguardian/master' into develop 2013-11-25 11:53:37 +01:00
quentin b872966011 Added the possibility to make it work with transmission in a different subfolder 2013-11-05 14:50:34 +01:00
Seif Attar 8f4d048859 Add omgwtfnzbs search provider 2013-10-13 00:56:30 +01:00
theguardian 75a5f86cde Added user inputs for MusicBrainz Update Interval & Album Age to ignore. 2013-10-02 10:18:14 -07:00
rembo10 8a6c37bcf6 Added piratebay proxy url to config page 2013-09-23 18:44:11 +05:30
rembo10 2e1c9d7f84 Added file permissions & folder permissions to config page 2013-09-08 15:03:23 +05:30
rembo10 b8c2ad9c73 Merge remote-tracking branch 'bakie/feature/use_underscores' into develop 2013-08-24 10:26:36 +05:30
rembo10 e115d266ac Merge branch 'bug-fixes' into develop 2013-08-24 10:20:09 +05:30
rembo10 7502959310 Changed waffles passkey to password input type 2013-08-24 10:19:02 +05:30
rembo10 ea1d86b6b1 Added https options to web interface 2013-08-24 10:13:51 +05:30
Bakie 0b22e5fde6 use underscores during rename and move 2013-08-11 17:19:15 +02:00
rembo10 0c6b91bf86 For symmetry: changed Blackhole -> Black Hole in the config 2013-07-31 21:56:06 +05:30
rembo10 3769d5191f Cleaned up the config page formatting 2013-07-28 01:39:43 +05:30
rembo10 717d6b63bd Merged torrent-fixes branch and fixed some merge conflicts 2013-07-27 23:15:36 +05:30
rembo10 934bdd790b Got rid of uTorrent option in the config (not ready yet but want to get the Transmission option out). Also added a little description to explain how you can use the Music Download Directory with Transmission 2013-07-27 17:41:08 +05:30