Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents 8f2df97 + e8da89d commit 8ca8931dd94594e131c1389ab86f4b8d17cbaac3 @Afterster Afterster committed Jun 12, 2015
Showing 1,891 changed files with 309,742 additions and 66,720 deletions.
View
@@ -1,7 +1,12 @@
config/ampache.cfg.php
+config/ampache-doped.cfg.php
rest/.htaccess
play/.htaccess
*.phpproj
*.sln
*.v11.suo
*.suo
+logs
+/nbproject/private/
+.pc
+/tmp
View
@@ -0,0 +1,22 @@
+<?php
+/**
+ * To put your Ampache website in maintenance, just rename this file to .maintenance
+ * This example redirect your visitors to a default maintenance information page hosted in ampache.org
+*/
+
+header("Access-Control-Allow-Origin: *");
+header("Access-Control-Allow-Methods: GET, POST");
+
+$domain = $_SERVER['HTTP_HOST'];
+if (empty($domain)) {
+ $domain = $_SERVER['SERVER_NAME'];
+}
+$scheme = "http";
+if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+ $scheme = "https";
+}
+$fromurl = rawurlencode($scheme . "://" . $domain . $_SERVER[REQUEST_URI]);
+
+header("Location: http://ampache.org/maintenance/?from=" . $fromurl);
+exit;
+?>
View
@@ -4,6 +4,7 @@ use Symfony\CS\FixerInterface;
$finder = Symfony\CS\Finder\DefaultFinder::create()
->exclude('modules')
+ ->exclude('nbproject')
->in(__DIR__)
->in(__DIR__ . '/modules/localplay')
->in(__DIR__ . '/modules/catalog')
View
@@ -0,0 +1,6 @@
+[bugtraq]
+ url = "https://github.com/ampache/ampache/issues/#BUGID#"
+ label = GitHub Issue Number
+ warnifnoissue = false
+ number = true
+ logregex = "#\\d+\n\\d+"
View
@@ -1,9 +1,9 @@
language: php
php:
- - 5.3
- 5.4
- 5.5
+ - 5.6
before_install:
- wget http://cs.sensiolabs.org/get/php-cs-fixer.phar
View
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[project_slug.resource_slug]
+file_filter = locale/<lang>_<lang>/LC_MESSAGES/messages.po
+source_file = locale/base/messages.pot
+source_lang = en_US
+type = PO
View
@@ -0,0 +1,6 @@
+## Contribution
+Please read [Development section](https://github.com/ampache/ampache/wiki#development).
+
+## Bug report
+Be sure the bug is not already fixed in `develop` branch or already reported in current open issues.
+Please add [some logs](https://github.com/ampache/ampache/wiki/Troubleshooting#enable-logging) with your new issue.
View
@@ -22,11 +22,13 @@ Recommended Version
Currently, the recommended version is [git HEAD](https://github.com/ampache/ampache/archive/master.tar.gz).
[![Build Status](https://api.travis-ci.org/ampache/ampache.png?branch=master)](https://travis-ci.org/ampache/ampache)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ampache/ampache/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/ampache/ampache/?branch=master)
Latest changes but unstable is [develop branch](https://github.com/ampache/ampache/archive/develop.tar.gz).
[![Build Status](https://api.travis-ci.org/ampache/ampache.png?branch=develop)](https://travis-ci.org/ampache/ampache)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ampache/ampache/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/ampache/ampache/?branch=develop)
+[![Codacy Badge](https://www.codacy.com/project/badge/b28cdb9e9ee2431c7cb9c23d5438cb80)](https://www.codacy.com/app/afterster_2222/ampache)
+[![Code Climate](https://codeclimate.com/github/ampache/ampache/badges/gpa.svg)](https://codeclimate.com/github/ampache/ampache)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/ee067d0e-3432-4062-a969-01b4ee037f48/mini.png)](https://insight.sensiolabs.com/projects/ee067d0e-3432-4062-a969-01b4ee037f48)
Requirements
------------
@@ -38,14 +40,16 @@ receives the most testing:
* nginx
* IIS
-* PHP 5.3 or greater.
+* PHP 5.4 or greater.
* PHP modules:
* PDO
* PDO_MYSQL
* hash
* session
* json
+ * simplexml (This is not strictly necessary, but may result in a better experience.)
+ * curl (This is not strictly necessary, but may result in a better experience.)
* MySQL 5.x
@@ -59,8 +63,8 @@ Upgrading
If you are upgrading from an older version of Ampache we recommend
moving the old directory out of the way, extracting the new copy in
-its place and then copying the old config file into config/. All
-database updates will be handled by Ampache.
+its place and then copying the old config/ampache.cfg.php, /rest/.htaccess,
+and /play/.htaccess files if any. All database updates will be handled by Ampache.
License
-------
@@ -99,6 +103,15 @@ Ampache includes some external modules that carry their own licensing.
* [MediaTable] (https://github.com/edenspiekermann/MediaTable): MIT
* [Responsive Elements] (https://github.com/kumailht/responsive-elements): MIT
* [Bootstrap] (http://getbootstrap.com): MIT
+* [jQuery Knob] (https://github.com/aterrien/jQuery-Knob): MIT
+* [jQuery File Upload] (https://github.com/blueimp/jQuery-File-Upload): MIT
+* [jsTree] (http://www.jstree.com): MIT
+* [php-tmdb-api] (https://github.com/wtfzdotnet/php-tmdb-api) : MIT
+* [TvDb] (https://github.com/Moinax/TvDb) : MIT
+* [jQuery DateTimePicker] (https://github.com/xdan/datetimepicker) : MIT
+* [pChart] (http://www.pchart.net) : GPL v3
+* [ZipStream-PHP] (https://github.com/maennchen/ZipStream-PHP) : [ZipStream-PHP license] (modules/zipstream/COPYING)
+* [SabreDAV] (https://github.com/fruux/sabre-dav) : New BSD
Translations
@@ -109,19 +122,24 @@ following languages. If you are interested in updating an existing
translation or adding a new one please see /locale/base/TRANSLATIONS
for more instructions.
-* English (en_US)
-* German (de_DE)
-* Spanish (es_ES)
-* Dutch (nl_NL)
-* Norwegian (nb_NO)
-* UK English (en_GB)
-* Italian (it_IT)
-* French (fr_FR)
-* Swedish (sv_SE)
-* Japanese (ja_JP)
-* Catalan (ca_ES)
-* Russian (ru_RU)
-* Czech (cs_CZ)
+* English (en_US)
+* Arabic (ar_SA)
+* Catalan (ca_ES)
+* Catalan (ca_ES)
+* Czech (cs_CZ)
+* Dutch (nl_NL)
+* French (fr_FR)
+* German (de_DE)
+* Greek (el_GR)
+* Italian (it_IT)
+* Japanese (ja_JP)
+* Norwegian (nb_NO)
+* Persian (fa_IR)
+* Polish (pl_PL)
+* Russian (ru_RU)
+* Spanish (es_ES)
+* Swedish (sv_SE)
+* UK English (en_GB)
Credits
-------
@@ -137,6 +155,7 @@ more features, encounter bugs, etc.
* [Public Repository](http://github.com/ampache)
* IRC: chat.freenode.net #ampache
+* [Forum](https://groups.google.com/forum/#!forum/ampache)
* [Issue Tracker](https://github.com/ampache/ampache/issues)
* [Documentation](https://github.com/ampache/ampache/wiki)
View
@@ -3,7 +3,7 @@
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
- * Copyright 2001 - 2014 Ampache.org
+ * Copyright 2001 - 2015 Ampache.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License v2
Oops, something went wrong.

0 comments on commit 8ca8931

Please sign in to comment.