Commit Graph

428 Commits

Author SHA1 Message Date
rembo10 d1d45c21d4 Added ability to delete single history items 2014-04-08 20:17:57 -07:00
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 d3c48970ae Add option to manage->force actions to process a single directory, or specify a different parent folder to run force pp on 2014-04-05 21:52:51 -07:00
rembo10 1580f5c22e Added a little text to the config file for OR words 2014-04-05 16:14:55 -07:00
rembo10 91b596fb0f Some bug fixes and styling changes 2014-04-04 21:06:07 -07:00
rembo10 d79dc8f1ab Most work done to get the ability to choose which release you want 2014-04-04 18:11:20 -07:00
Bas Stottelaar f3d192c548 Update GitHub version detection.
When working in a seperate branch, Headphones keeps telling I'm 0 commits behind. This patch looks at the
'behind_by' key instead of 'total_commit', which is what is desired. The case with -1 is now obsolete.

The web interface now respects the 'headphones.COMMITS_BEHIND' property.
2014-04-04 15:01:18 +02: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
rembo10 8ccb7f2f16 Added override-float back in 2014-04-01 18:18:41 -07:00
rembo10 a48babfa09 Easily track develop branch if.... on the develop branch 2014-04-01 13:56:45 -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
rembo10 ad1c4851b1 Merge remote-tracking branch 'gotson/pushover-override' into develop 2014-03-31 16:53:41 -07:00
rembo10 5a1a6d1b57 Merge remote-tracking branch 'gotson/artist-sort' into develop 2014-03-31 16:53:21 -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
gotson 3dc515507c Save datatable sort for Artist view 2014-03-31 15:44:30 +08:00
gotson d0ae36ac56 Request Songkick data over HTTPS, to avoid conflicts when Headphones is running over HTTPS or behind a HTTPS reverse-proxy 2014-03-31 12:51:00 +08:00
rembo10 e69e391a33 Minor fix to handle empty songkick location on artist.html 2014-03-28 11:16:17 -07:00
rembo10 84aa80c93e Couple fixes for the songkick pull request from gitson 2014-03-28 11:12:59 -07: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
rembo10 863ad41f7c Limit concert display to next 5 only 2014-03-27 20:25:34 -07:00
rembo10 fb4558e431 Brought back 'The' in front of artist names in the index 2014-03-27 20:13:39 -07:00
rembo10 1e683f9aa9 Merge remote-tracking branch 'opcon/pushbullet_api' into develop 2014-03-27 19:23:30 -07:00
rembo10 0fc242451a Merge remote-tracking branch 'maiis/master' into develop 2014-03-27 19:20:21 -07: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
Emmanuel Vuigner 81e13e5f68 remove console warning 2014-03-01 01:10:47 +00:00
Emmanuel Vuigner 1027009c15 remove conflict file 2014-03-01 00:44:55 +00: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 8c4a93239b adding retina logo and favicon, adding retina search icon 2014-01-28 01:10:46 -07: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