yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 18:29:40 +02:00
Code Issues Releases Wiki Activity
4565 commits 4 branches 18 tags 116 MiB
Commit graph

2191 commits

Author SHA1 Message Date
Afterster
f2f5bd530b Remove scrub_in from password verification (fix #1033) 2015-12-04 07:27:37 +01:00
Afterster
7179403b94 Update sql script to latest db changes 
Update CHANGELOG.md
Fix vainfo tvshow parsing if music catalog selected
 2015-12-03 23:25:37 +01:00
Afterster
cb769a5c8d Add log message in case of transcode process error 
Fix code style
 2015-12-03 22:07:57 +01:00
Afterster
0a76c2ac4b Merge branch 'preserved_whitespace' of https://github.com/DanielMaly/ampache into DanielMaly-preserved_whitespace 2015-12-03 21:51:09 +01:00
Nick Lanham
1aaf01ae98 Support an ampache=1 argument on getAlbum.view 
- For now just adds playcounts.  Could add other info in the future
- Right now only getAlbum.view, but other views that return song info could support this too.
 2015-12-02 22:57:58 +00:00
Afterster
9c3637b879 Change license from GPLv2 to AGPLv3 2015-12-02 20:46:34 +01:00
wagnered
b440eb2aad cleaned merge info from vainfo.class.php. 2015-11-28 21:13:27 -08:00
Daniel Maly
6c0f34fa96 Added 'album tag' option in song search 2015-11-28 22:14:56 +01:00
Afterster
289ca0cc8c Merge branch 'develop' 
Conflicts:
	lib/class/tvshow.class.php
	lib/class/vainfo.class.php
	modules/plugins/Tvdb/Tvdb.plugin.php
 2015-11-28 09:56:41 +01:00
wagnered
81b2aef0f9 Revert change of table/column tvshow.overview back to tvshow.summary. 
Revert dependent classes to insert/update tvshow.summary.
Modified Tmdb and Tvdb plugins to carry tvhow overview as tvshow_summary
to maintain separation of tvshow summary and tvshow_episode summary.
 2015-11-26 21:24:41 -08:00
wagnered
72273dbd20 Changed tvshow.summary to tvshow.overview to remove 
conflict with tvshow_episode.summary.
Modified edit dialog and update functions to edit tvshow.overview.
Modified tvdb and tmdb plugins to reflect change to tvshow.overview.
Fixed Vainfo::_parse_filename after regression tests exposed bug.
 2015-11-24 11:56:21 -08:00
Afterster
21c486eb50 Fix vainfo trim on unknown tags 2015-11-22 16:18:19 +01:00
René Bigler
e96b0ff073 [BUGFIX] Fix some metadata errors 2015-11-19 23:27:34 +01:00
René Bigler
69a4a5f1f4 [FEATURE] Enable Composer autoloading for lib 2015-11-19 20:08:48 +01:00
Afterster
a340c30872 Update code style script with new checks 2015-11-18 22:39:49 +01:00
Afterster
f7cd0b43be Merge branch 'feature/customMetadata' of https://github.com/Razrael/ampache into Razrael-feature/customMetadata 
Conflicts:
	lib/class/core.class.php
	lib/class/song.class.php
	lib/class/update.class.php
	lib/class/vainfo.class.php
	modules/catalog/local/local.catalog.php
	templates/show_edit_song_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song.inc.php
 2015-11-17 20:48:10 +01:00
Afterster
5124a5ed4c Merge branch 'develop' of https://github.com/Psy-Virus/ampache into Psy-Virus-develop 
Conflicts:
	templates/show_album_row.inc.php
	templates/show_artist_row.inc.php
	templates/show_label_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song_row.inc.php
	templates/show_video_row.inc.php

Apply align_equals and concat_with_spaces on code style
 2015-11-07 08:08:59 +01:00
Afterster
657ff21e43 Allow shout view for unregistered user if auth is not mandatory 
Allow graph view for user owner
 2015-11-06 21:54:41 +01:00
Afterster
ca2028256a Add timeline / friends timeline (= user activities) 2015-11-04 23:59:13 +01:00
René Bigler
04d8ce9c11 [BUGFIX] Fixe some code style issues 2015-10-29 23:09:52 +01:00
René Bigler
5f50341dff Merge branch 'develop' into feature/customMetadata 2015-10-29 20:36:49 +01:00
Afterster
a3c2a4336f Don't show disabled songs to normal users (fix #883) 2015-10-25 18:58:28 +01:00
Afterster
e497f61f37 Add protocol check on live stream homepage url (fix #767) 2015-10-18 11:02:11 +02:00
Afterster
bda9389c26 Add rating on XML API 2015-10-16 22:47:01 +02:00
Afterster
468b5fba5c Merge branch 'wagnered-develop' into develop 2015-10-13 22:12:22 +02:00
Afterster
848f07adbb Directory from 3.8.1 release parsing 2015-10-13 22:05:53 +02:00
Afterster
1ea28c5e0f Merge branch 'develop' of https://github.com/wagnered/ampache into wagnered-develop 2015-10-12 21:37:39 +02:00
wagnered
0ff6bde592 Changed update_video_from_tags($results, Video $video) to static function. 2015-10-11 12:31:00 -07:00
Afterster
c6d403fe5b Handle BOM empty utf-8 string on song comparison 2015-10-04 23:53:01 +02:00
thinca
99290c0c38 Use "LIMIT" at SQL query 
For performance reasons.
 2015-10-04 03:28:27 +09:00
thinca
1eb846f8d1 Calculate sum of size at SQL query 
For performance reasons.
This returns single record.  This is fast.
 2015-10-04 03:21:01 +09:00
Afterster
bbd32d7a17 Keep %SAMPLE% variable for compatibility reason 2015-10-03 09:22:29 +02:00
Afterster
4695dce70a Merge branch 'develop' of https://github.com/Psy-Virus/ampache into Psy-Virus-develop 2015-10-03 09:18:23 +02:00
Afterster
23c16e5045 Fix tag deletion sql error (fix #981) 2015-10-02 21:50:19 +02:00
wagnered
92cac3fa73 Added logic to parse regex "\d\d\d" file pattern not previously caught. 
Improved parsing of standard(typical) file patterns.
 2015-09-30 10:45:22 -07:00
Afterster
f627d3ee3a Add radio stations to UPnP backend (fix #958) 2015-09-26 20:15:06 +02:00
Manuel
50c1ecc037 Various fixes based on transcode bit rate handling 
config/ampache.cfg.php.dist
+ updated version because the changes depend on database and base code
changes
+ renamed variable `%SAMPLE%` -> `%BITRATE%`

lib/class/stream.class.php
+ changed `AmpConfig::get('sample_rate');` ->
`AmpConfig::get('transcode_bitrate');` due to db changes
+ renamed variable `%SAMPLE%` -> `%BITRATE`
+ renamed variable `$sample_rate` -> `$bit_rate`
+ renamed variable `$user_sample_rate` -> `$user_bit_rate`

lib/class/update.class.php
+ New update function to change preference name `sample_rate` ->
`transcode_bitrate`

lib/init.php
+ changed config file version for config autoupdate

lib/preference.php
+ changed case `sample_rate` -> `transcode_bitrate` due to db changes
 2015-09-26 17:38:13 +02:00
Afterster
9be50b8e28 Fix jQuery UI Dialog removed deprecated position setter 
Fix indent
 2015-09-24 21:35:35 +02:00
Maniac
d7e7500fce fixed indention of comment 2015-09-24 12:14:58 +02:00
Maniac
a0c38ad9d9 Deliver album art if the song does not have a custom picture 2015-09-24 11:00:37 +02:00
Afterster
9b35f818fd Merge branch 'develop' of https://github.com/wagnered/ampache into wagnered-develop 2015-09-24 07:11:01 +02:00
wagnered
e3adcc5106 Modified regex pattern to minimize conflict between Episode Title and unwanted abbreviations. 2015-09-23 15:05:10 -07:00
Afterster
4e1dffaf7b Update advanced_search API function to support artists and albums requests 2015-09-23 22:42:40 +02:00
Afterster
89d6e8aa6c Merge branch 'xml_advanced_search' of https://github.com/nicklan/ampache into nicklan-xml_advanced_search 2015-09-23 22:30:48 +02:00
Afterster
9be94cc5ca Merge branch 'develop' of https://github.com/wagnered/ampache into wagnered-develop 
Conflicts:
	config/ampache.cfg.php.dist
	modules/plugins/Tmdb/Tmdb.plugin.php
	modules/plugins/Tvdb/Tvdb.plugin.php
 2015-09-23 22:24:48 +02:00
Maniac
57e529e7de Fixed indenting (again -.-) 2015-09-23 10:54:29 +02:00
Maniac
68204bc413 Fixed issue that song/album/artistCount parameters were ignored if they were 0 2015-09-23 10:51:52 +02:00
Afterster
e85e21ce92 Fix statistics Graph broken since Composer move (fix #966) 2015-09-23 07:06:10 +02:00
Afterster
1446bd22c6 Create UPnP UUID from host 
Avoid plugin debug message for current and parent directory test
 2015-09-22 22:02:29 +02:00
Afterster
b336d1ab7e Merge branch 'nioc-develop' into develop 
Conflicts:
	modules/plugins/Lastfm/Lastfm.plugin.php
	modules/plugins/Librefm/Librefm.plugin.php
 2015-09-22 20:21:50 +02:00