foocorp:gnu-fm.git
5 years agoabsolute require_once paths
Jonas Haraldsson [Sat, 13 Apr 2013 08:27:37 +0000 (10:27 +0200)]
absolute require_once paths

5 years agodelete 1.x/install.php
Jonas Haraldsson [Sat, 13 Apr 2013 07:59:59 +0000 (09:59 +0200)]
delete 1.x/install.php

5 years agoDelete files
Jonas Haraldsson [Fri, 12 Apr 2013 09:02:58 +0000 (11:02 +0200)]
Delete files

1.x/AUTHORS: all names can be found in gnu-fm/AUTHORS

5 years agoUse 2.0 scrobble-utils.php for 1.2
Jonas Haraldsson [Fri, 12 Apr 2013 08:31:32 +0000 (10:31 +0200)]
Use 2.0 scrobble-utils.php for 1.2

Changed 1.2 nowplaying to use 2.0 functions
Changed 1.2 scrobble to use 2.0 functions
Move useridFromSID function to temp-utils.php for now
Delete 1.x/scrobble-utils.php

5 years agodelete duplicate file
Jonas Haraldsson [Fri, 12 Apr 2013 07:26:52 +0000 (09:26 +0200)]
delete duplicate file

5 years agodelted files
Jonas Haraldsson [Fri, 12 Apr 2013 07:22:21 +0000 (09:22 +0200)]
delted files

5 years ago1.2 nowplaying and scobbling now working
Jonas Haraldsson [Thu, 11 Apr 2013 21:32:03 +0000 (23:32 +0200)]
1.2 nowplaying and scobbling now working

5 years agofix stats.php
Jonas Haraldsson [Thu, 11 Apr 2013 20:50:27 +0000 (22:50 +0200)]
fix stats.php

5 years agofix display.php, remove duplicate files
Jonas Haraldsson [Thu, 11 Apr 2013 20:46:25 +0000 (22:46 +0200)]
fix display.php, remove duplicate files

5 years agoHandshake now working
Jonas Haraldsson [Thu, 11 Apr 2013 20:33:17 +0000 (22:33 +0200)]
Handshake now working

Added 1.x handshake check to nixtape/index.php
Deleted 1.x/database.php
Deleted 1.x/index.php

5 years agocopy gnukebox files into nixtape/1.x dir
Jonas Haraldsson [Thu, 11 Apr 2013 20:11:38 +0000 (22:11 +0200)]
copy gnukebox files into nixtape/1.x dir

5 years agofix doc markdown
Jonas Haraldsson [Thu, 11 Apr 2013 19:16:32 +0000 (21:16 +0200)]
fix doc markdown

5 years agoadd libre.fm api_key to clientcodes array
Jonas Haraldsson [Tue, 9 Apr 2013 18:55:29 +0000 (20:55 +0200)]
add libre.fm api_key to clientcodes array

5 years agoadd TODO
Jonas Haraldsson [Tue, 9 Apr 2013 17:46:15 +0000 (19:46 +0200)]
add TODO

We need to clean up expired scrobble sessions somewhere in nixtape,
currently only done in gnukebox and that will eventually go away

5 years agoAdd gnufm_key to config
Jonas Haraldsson [Tue, 9 Apr 2013 17:29:10 +0000 (19:29 +0200)]
Add gnufm_key to config

Add $gnufm_key = 'default_gnufm_32_char_identifier' to config.php,
and use it when getting a scrobble session id in login.php and when
scrobbling from the website player.
This lets us re-use the session id we set at login time, and avoid
creating another session id for the player.

5 years agoMoved getScrobbleSessionID()
Jonas Haraldsson [Tue, 9 Apr 2013 17:25:44 +0000 (19:25 +0200)]
Moved getScrobbleSessionID()

Moved scrobbleutils.php::getScrobbleSessionID() to
Server::getScrobbleSession()
Added expire_limit parameter to Server::getScrobbleSession()
Changed User::getScrobbleSession to use Server::getScrobbleSession()
Changed login.php to use Server::getScrobbleSession()

5 years agoMerge branch 'player-2.0'
Jonas Haraldsson [Mon, 8 Apr 2013 16:41:04 +0000 (18:41 +0200)]
Merge branch 'player-2.0'

5 years agoplayer.js now use 2.0 api only
Jonas Haraldsson [Mon, 25 Feb 2013 09:28:31 +0000 (10:28 +0100)]
player.js now use 2.0 api only

5 years agofix inconsistent param names
Jonas Haraldsson [Sun, 7 Apr 2013 16:03:06 +0000 (18:03 +0200)]
fix inconsistent param names

5 years agoMerge branch '2.0-scrobble' into clean-2.0-scrobble
Jonas Haraldsson [Sun, 7 Apr 2013 16:00:29 +0000 (18:00 +0200)]
Merge branch '2.0-scrobble' into clean-2.0-scrobble

Conflicts resolved:
nixtape/api/TrackXML.php

5 years agoRe-enable recommdended artist cloud
Jonas Haraldsson [Sun, 31 Mar 2013 22:02:40 +0000 (00:02 +0200)]
Re-enable recommdended artist cloud

Put a limit of 1000 in the $otherArtists sql query in $artist->getSimilar,
which should make it quick enough.

5 years agodisable recommended artist cloud to speed up page
Jonas Haraldsson [Sun, 31 Mar 2013 19:23:52 +0000 (21:23 +0200)]
disable recommended artist cloud to speed up page

5 years agosmarty2 compat
Jonas Haraldsson [Fri, 29 Mar 2013 20:16:06 +0000 (21:16 +0100)]
smarty2 compat

5 years agosmarty2 compat
Jonas Haraldsson [Fri, 29 Mar 2013 20:05:11 +0000 (21:05 +0100)]
smarty2 compat

5 years agodebug
Jonas Haraldsson [Fri, 29 Mar 2013 19:58:17 +0000 (20:58 +0100)]
debug

5 years agolimit to 7 days
Jonas Haraldsson [Fri, 29 Mar 2013 19:27:40 +0000 (20:27 +0100)]
limit to 7 days

5 years agoadd temp limit on slow query
Jonas Haraldsson [Fri, 29 Mar 2013 18:58:55 +0000 (19:58 +0100)]
add temp limit on slow query

5 years agofix unban action
Jonas Haraldsson [Fri, 29 Mar 2013 17:09:30 +0000 (18:09 +0100)]
fix unban action

5 years agosmarty2 compat
Jonas Haraldsson [Fri, 29 Mar 2013 16:17:30 +0000 (17:17 +0100)]
smarty2 compat

5 years agosmarty2 compat
Jonas Haraldsson [Fri, 29 Mar 2013 16:04:35 +0000 (17:04 +0100)]
smarty2 compat

5 years agotry to fix smarty2 compat
Jonas Haraldsson [Fri, 29 Mar 2013 15:46:10 +0000 (16:46 +0100)]
try to fix smarty2 compat

5 years agoenable table headers
Jonas Haraldsson [Fri, 29 Mar 2013 12:59:54 +0000 (13:59 +0100)]
enable table headers

5 years agolibrary rewrite rules
Jonas Haraldsson [Fri, 29 Mar 2013 12:59:09 +0000 (13:59 +0100)]
library rewrite rules

5 years agoadd library to user_menu, but comment out for now
Jonas Haraldsson [Fri, 29 Mar 2013 12:47:39 +0000 (13:47 +0100)]
add library to user_menu, but comment out for now

5 years agoMerge branch 'master' into clean-library
Jonas Haraldsson [Fri, 29 Mar 2013 09:14:36 +0000 (10:14 +0100)]
Merge branch 'master' into clean-library

5 years agofix docs
Jonas Haraldsson [Thu, 28 Mar 2013 14:33:59 +0000 (15:33 +0100)]
fix docs

5 years agoMerge branch 'phpdoc'
Jonas Haraldsson [Thu, 28 Mar 2013 14:16:17 +0000 (15:16 +0100)]
Merge branch 'phpdoc'

5 years agophpdoc instructions
Jonas Haraldsson [Thu, 28 Mar 2013 14:12:21 +0000 (15:12 +0100)]
phpdoc instructions

5 years agoMerge branch 'merge62'
Mike Sheldon [Wed, 27 Mar 2013 23:04:54 +0000 (23:04 +0000)]
Merge branch 'merge62'

5 years agounbreak callback url with single param
Jonas Haraldsson [Wed, 27 Mar 2013 19:26:21 +0000 (20:26 +0100)]
unbreak callback url with single param

5 years agolibrary clean-up
Jonas Haraldsson [Sun, 24 Mar 2013 10:33:34 +0000 (11:33 +0100)]
library clean-up

5 years agolibrary section
Jonas Haraldsson [Sun, 24 Mar 2013 09:49:04 +0000 (10:49 +0100)]
library section

5 years agoMerge commit 'refs/merge-requests/62' of git://gitorious.org/foocorp/gnu-fm into...
Mike Sheldon [Sat, 23 Mar 2013 20:14:59 +0000 (20:14 +0000)]
Merge commit 'refs/merge-requests/62' of git://gitorious.org/foocorp/gnu-fm into merge62

5 years agoremove unused rewrite rules
Jonas Haraldsson [Sat, 23 Mar 2013 11:05:29 +0000 (12:05 +0100)]
remove unused rewrite rules

5 years agomove user-journal, broken and unused
Jonas Haraldsson [Sat, 23 Mar 2013 10:59:43 +0000 (11:59 +0100)]
move user-journal, broken and unused

5 years agosubheader changes
Jonas Haraldsson [Sat, 23 Mar 2013 10:57:24 +0000 (11:57 +0100)]
subheader changes

5 years agorevert showbio change
Jonas Haraldsson [Sat, 23 Mar 2013 10:28:03 +0000 (11:28 +0100)]
revert showbio change

5 years agoMove unused files
Jonas Haraldsson [Sat, 23 Mar 2013 10:20:46 +0000 (11:20 +0100)]
Move unused files

Move unused files into gnu-fm/old, as having them in
gnu-fm/{nixtape,gnukebox} wastes time for new devs and is also potentially unsafe

5 years agoUser header
Jonas Haraldsson [Sat, 23 Mar 2013 10:03:25 +0000 (11:03 +0100)]
User header

Rename maxiprofile.tpl to user-header.tpl
Instead of doing $smarty->assign(headerfile, '<header>.tpl') in php
files, we add the tpl file as a subheader parameter when including header.tpl
in page template.
It makes it easier to keep track of what templates are loaded when
modifying a theme.

Change header.tpl to also take a showbio parameter, if true it will
display a users bio.

5 years agoMerge commit 'refs/merge-requests/63' of git://gitorious.org/foocorp/gnu-fm into...
Jonas Haraldsson [Sat, 16 Mar 2013 12:28:25 +0000 (13:28 +0100)]
Merge commit 'refs/merge-requests/63' of git://gitorious.org/foocorp/gnu-fm into merge-requests/63

5 years agoAdd empty nixtape/themes/gnufm/config/theme.conf to avoid PHP Fatal error: Uncaught...
Simó Albert i Beltran [Sat, 16 Mar 2013 11:59:37 +0000 (12:59 +0100)]
Add empty nixtape/themes/gnufm/config/theme.conf to avoid PHP Fatal error:  Uncaught exception 'SmartyException' with message 'Unable to read config file 'theme.conf'' in /usr/share/php/smarty3/sysplugins/smarty_internal_resource_file.php:68

5 years agoalbum radio
Jonas Haraldsson [Thu, 14 Mar 2013 16:14:21 +0000 (17:14 +0100)]
album radio

librefm://artist/foo/album/bar

5 years agoimport-jamendo.py only sets track as streamable if it exists in Jamendo mirror.
Simó Albert i Beltran [Tue, 12 Mar 2013 17:19:17 +0000 (18:19 +0100)]
import-jamendo.py only sets track as streamable if it exists in Jamendo mirror.

5 years agoAdd free_license method in import-jamendo.py
Simó Albert i Beltran [Tue, 12 Mar 2013 17:10:50 +0000 (18:10 +0100)]
Add free_license method in import-jamendo.py

5 years agotheme-wide config
Jonas Haraldsson [Sat, 9 Mar 2013 16:42:57 +0000 (17:42 +0100)]
theme-wide config

set config_dir in templating.php
try to load nixtape/themes/gnufm/config/theme.conf in header.tpl

theme.conf can f.ex be used to set theme-wide css classes

theme.conf:
myclass = "foo"

my.tpl:
<span class="{#myclass#}">span with foo class</span>

5 years agodownload-jamendo.py
Jonas Haraldsson [Fri, 8 Mar 2013 21:19:41 +0000 (22:19 +0100)]
download-jamendo.py

Check for correct mime-type and retry 5 times
Rename downloaded file to .ign after 5 failed retries, and skip download
the next time script is run

5 years agodownload-jamendo.py
Jonas Haraldsson [Wed, 6 Mar 2013 18:29:03 +0000 (19:29 +0100)]
download-jamendo.py

add a 1 second delay between new requests to be nice to server

5 years agodownload-jamendo.py
Jonas Haraldsson [Wed, 6 Mar 2013 13:23:44 +0000 (14:23 +0100)]
download-jamendo.py

Redownload file if less than 1024 bytes
Remove and recreate symlink if already exist for file getting downloaded

5 years agoMerge commit 'refs/merge-requests/57' of git://gitorious.org/foocorp/gnu-fm into...
Jonas Haraldsson [Wed, 6 Mar 2013 13:02:19 +0000 (14:02 +0100)]
Merge commit 'refs/merge-requests/57' of git://gitorious.org/foocorp/gnu-fm into merge-requests/57

5 years agoClean up addTags, removeTag
Jonas Haraldsson [Mon, 25 Feb 2013 18:07:37 +0000 (19:07 +0100)]
Clean up addTags, removeTag

addTags return True if any tags were added, False if no tag was added.
removeTag return True if tag was removed, False if not.

5 years agoClean up ban/unban
Jonas Haraldsson [Mon, 25 Feb 2013 13:50:40 +0000 (14:50 +0100)]
Clean up ban/unban

Bind sql parameters in Track->isLoved function
Added Track->isBanned function.
Moved sql from api/TrackXML.php functions into data/Track.php
functions.
ban/unban calls now only return True if a row is added/deleted
from Banned_Tracks table, False in any other case.

5 years agoClean up love/unlove
Jonas Haraldsson [Mon, 25 Feb 2013 13:28:00 +0000 (14:28 +0100)]
Clean up love/unlove

Moved sql from api/TrackXML.php functions into data/Track.php functions.
love/unlove calls now only return True if a row is added/deleted from
Loved_Tracks table, False in any other case.

5 years agoyear in license
Jonas Haraldsson [Sun, 24 Feb 2013 21:20:00 +0000 (22:20 +0100)]
year in license

5 years agodocs
Jonas Haraldsson [Sun, 24 Feb 2013 20:33:45 +0000 (21:33 +0100)]
docs

5 years agotype conversion
Jonas Haraldsson [Sun, 24 Feb 2013 20:22:52 +0000 (21:22 +0100)]
type conversion

5 years agolibrary.removescrobble
Jonas Haraldsson [Sun, 24 Feb 2013 19:53:46 +0000 (20:53 +0100)]
library.removescrobble

5 years agoremove TODO
Jonas Haraldsson [Sat, 23 Feb 2013 23:12:41 +0000 (00:12 +0100)]
remove TODO

5 years agoplayer.tpl clean-up
Jonas Haraldsson [Sat, 23 Feb 2013 12:45:45 +0000 (13:45 +0100)]
player.tpl clean-up

Moved most js into player.js
Moved css into modern.css
Replaced jquery placeholdr plugin with html5 placeholder attribute
Display loading message while waiting for player to get ready
Display player problems box by default, hide it in js

5 years agotypo
Jonas Haraldsson [Fri, 22 Feb 2013 20:21:35 +0000 (21:21 +0100)]
typo

5 years agoset streaming to true when tuning
Jonas Haraldsson [Fri, 22 Feb 2013 19:50:14 +0000 (20:50 +0100)]
set streaming to true when tuning

If we are on a track page streaming is not set to true by default and player
would not auto-fetch more tracks

5 years agochange from .toggle to .slideToggle for boxes
Jonas Haraldsson [Fri, 22 Feb 2013 19:41:19 +0000 (20:41 +0100)]
change from .toggle to .slideToggle for boxes

5 years agomove playlist to bottom
Jonas Haraldsson [Fri, 22 Feb 2013 19:40:12 +0000 (20:40 +0100)]
move playlist to bottom

5 years agoreplace progress-bar with progress-slider
Jonas Haraldsson [Fri, 22 Feb 2013 18:39:55 +0000 (19:39 +0100)]
replace progress-bar with progress-slider

5 years agofix for logged in users
Jonas Haraldsson [Fri, 22 Feb 2013 12:12:17 +0000 (13:12 +0100)]
fix for logged in users

5 years agono need for sk in request
Jonas Haraldsson [Fri, 22 Feb 2013 12:04:34 +0000 (13:04 +0100)]
no need for sk in request

5 years agorename function to trackGetTopTags
Jonas Haraldsson [Fri, 22 Feb 2013 12:03:29 +0000 (13:03 +0100)]
rename function to trackGetTopTags

5 years agomove getTrackTopTags to updateProgress
Jonas Haraldsson [Fri, 22 Feb 2013 12:00:19 +0000 (13:00 +0100)]
move getTrackTopTags to updateProgress

5 years agotune button title attributes
Jonas Haraldsson [Fri, 22 Feb 2013 11:35:35 +0000 (12:35 +0100)]
tune button title attributes

5 years agostop printing tags if tags_length > max_length
Jonas Haraldsson [Thu, 21 Feb 2013 19:53:07 +0000 (20:53 +0100)]
stop printing tags if tags_length > max_length

5 years agotunebutton css
Jonas Haraldsson [Thu, 21 Feb 2013 18:00:27 +0000 (19:00 +0100)]
tunebutton css

5 years agoclickable artistname for logged in users
Jonas Haraldsson [Thu, 21 Feb 2013 16:17:42 +0000 (17:17 +0100)]
clickable artistname for logged in users

clicking on artistname tunes to artist station

5 years agoclickable tags for logged in users
Jonas Haraldsson [Thu, 21 Feb 2013 15:45:42 +0000 (16:45 +0100)]
clickable tags for logged in users

clicking a tag tunes to station for that tag

5 years agoenable tuning for logged in users
Jonas Haraldsson [Thu, 21 Feb 2013 15:12:01 +0000 (16:12 +0100)]
enable tuning for logged in users

5 years agoset station for logged in users
Jonas Haraldsson [Thu, 21 Feb 2013 13:34:04 +0000 (14:34 +0100)]
set station for logged in users

5 years agomove js block to player.tpl
Jonas Haraldsson [Thu, 21 Feb 2013 13:32:04 +0000 (14:32 +0100)]
move js block to player.tpl

5 years agoremove() instead of replaceWith("")
Jonas Haraldsson [Thu, 21 Feb 2013 12:49:34 +0000 (13:49 +0100)]
remove() instead of replaceWith("")

5 years agomove js code block to player.tpl
Jonas Haraldsson [Thu, 21 Feb 2013 12:46:22 +0000 (13:46 +0100)]
move js code block to player.tpl

5 years agoremove version in js file names
Jonas Haraldsson [Thu, 21 Feb 2013 11:41:38 +0000 (12:41 +0100)]
remove version in js file names

To avoid having to edit templates on js libs upgrades, versions can be
found in js lib itself

5 years agoupdate js libs
Jonas Haraldsson [Thu, 21 Feb 2013 11:38:35 +0000 (12:38 +0100)]
update js libs

5 years agocheck if no xmlresponse
Jonas Haraldsson [Tue, 19 Feb 2013 17:55:25 +0000 (18:55 +0100)]
check if no xmlresponse

5 years agouser-connections.php: connect to remote gnufm
Jonas Haraldsson [Tue, 19 Feb 2013 17:44:30 +0000 (18:44 +0100)]
user-connections.php: connect to remote gnufm

$gnufm_key need to be set in nixtape/config.php for it to show up

5 years agotypo
Jonas Haraldsson [Mon, 18 Feb 2013 23:24:20 +0000 (00:24 +0100)]
typo

5 years agobind parameters
Jonas Haraldsson [Mon, 18 Feb 2013 23:24:01 +0000 (00:24 +0100)]
bind parameters

5 years agogettopfans ws methods
Jonas Haraldsson [Mon, 18 Feb 2013 23:23:42 +0000 (00:23 +0100)]
gettopfans ws methods

5 years agofix docs
Jonas Haraldsson [Mon, 18 Feb 2013 23:23:16 +0000 (00:23 +0100)]
fix docs

5 years agoartist/track getTopListeners
Jonas Haraldsson [Mon, 18 Feb 2013 23:22:31 +0000 (00:22 +0100)]
artist/track getTopListeners

5 years agoServer.php: getTopListeners
Jonas Haraldsson [Mon, 18 Feb 2013 23:21:13 +0000 (00:21 +0100)]
Server.php: getTopListeners

5 years agounstring null
Jonas Haraldsson [Mon, 18 Feb 2013 16:32:16 +0000 (17:32 +0100)]
unstring null

5 years agoResolve conflicts between merge 51 and HEAD
Mike Sheldon [Sun, 17 Feb 2013 21:37:18 +0000 (21:37 +0000)]
Resolve conflicts between merge 51 and HEAD

5 years agoMerge commit 'refs/merge-requests/51' of git://gitorious.org/foocorp/gnu-fm into...
Mike Sheldon [Sun, 17 Feb 2013 21:28:15 +0000 (21:28 +0000)]
Merge commit 'refs/merge-requests/51' of git://gitorious.org/foocorp/gnu-fm into merge51