1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-05 02:39:47 +02:00
Commit graph

9 commits

Author SHA1 Message Date
Jahak
eb6da495a8 Update pvmsg.php 2016-03-21 21:34:44 +05:00
Afterster
9c3637b879 Change license from GPLv2 to AGPLv3 2015-12-02 20:46:34 +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
207076d9a0 Merge branch 'develop' of https://github.com/Niols/ampache into Niols-develop
Conflicts:
	admin/users.php
	config/ampache.cfg.php.dist
	lib/class/api.class.php
	lib/class/userflag.class.php
	lib/rating.lib.php
	lib/ui.lib.php
	sql/ampache.sql
	templates/browse_filters.inc.php
	templates/footer.inc.php
	templates/header.inc.php
	templates/show_albums.inc.php
	templates/show_artists.inc.php
	templates/show_broadcasts.inc.php
	templates/show_catalogs.inc.php
	templates/show_channels.inc.php
	templates/show_concerts.inc.php
	templates/show_democratic_playlist.inc.php
	templates/show_html5_player_headers.inc.php
	templates/show_index.inc.php
	templates/show_install_config.inc.php
	templates/show_labels.inc.php
	templates/show_live_streams.inc.php
	templates/show_localplay_playlist.inc.php
	templates/show_login_form.inc.php
	templates/show_manage_license.inc.php
	templates/show_manage_shoutbox.inc.php
	templates/show_missing_albums.inc.php
	templates/show_objects.inc.php
	templates/show_playlist_songs.inc.php
	templates/show_playlists.inc.php
	templates/show_preferences.inc.php
	templates/show_pvmsgs.inc.php
	templates/show_recommended_artists.inc.php
	templates/show_searches.inc.php
	templates/show_shared_objects.inc.php
	templates/show_song_previews.inc.php
	templates/show_songs.inc.php
	templates/show_tvshow_seasons.inc.php
	templates/show_tvshows.inc.php
	templates/show_user_activate.inc.php
	templates/show_users.inc.php
	templates/show_videos.inc.php
	templates/show_wanted_albums.inc.php
	templates/sidebar.inc.php
	templates/stylesheets.inc.php
2015-09-06 11:23:51 +02:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
Niols
a1f6a073cb Use UI::find_template everytime there's a '/templates/…'
Note: This concerns everything but the install files
2015-06-06 18:54:05 +02:00
Afterster
db9cc4ed33 Add set as read/unread and delete actions on private messages 2015-05-03 20:22:34 +02:00
Afterster
0c26c33626 Stay on shoutbox page when posting a new shout
Fix light sidebar home page link
2015-04-28 21:03:52 +02:00
Afterster
edc85b1612 Add private messages feature
Add follow/unfollow users feature
Add simple maintenance mode (/.maintenance file)
Add user option to receive email on new content related shouts or private messages
2015-04-26 23:10:05 +02:00