Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14079 commits 3 branches 0 tags 405 MiB
Commit graph

14079 commits

This branch
This branch
All branches
Author SHA1 Message Date
Duncan Sommerville
7e2cc65f32 Merge branch '2.5.x' into saas 2015-01-21 15:15:58 -05:00
Duncan Sommerville
6492128ce9 Hide Now Playing toolbar for Guest users 2015-01-21 15:15:22 -05:00
Duncan Sommerville
345b2b5d26 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-21 15:14:34 -05:00
Albert Santoni
e649863dff Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2015-01-21 12:15:14 -05:00
Albert Santoni
39445c945f Added upgrade.py helper script (for development only) 2015-01-21 12:14:44 -05:00
drigato
62f2a0babf CC-5981: Admin users can't delete webstreams created by other users 2015-01-21 11:31:28 -05:00
Duncan Sommerville
ca9724ec5f Fixed small issue where doing an in-place install over an existing 2.5.1 install would fail 2015-01-21 10:50:58 -05:00
Duncan Sommerville
7034c8e00d Initial fix for apache 2.4 vhost file 2015-01-20 17:31:59 -05:00
Duncan Sommerville
b58891f1fa Added additional checks to ensure services are running properly 2015-01-20 13:42:41 -05:00
drigato
2fadc8f8f1 Merge branch '2.5.x' into saas 
Conflicts:
	CREDITS
 2015-01-20 11:44:53 -05:00
drigato
6ac5a2950f SAAS-551: Cannot schedule shows due to overlapping show check bug 2015-01-20 11:32:15 -05:00
Duncan Sommerville
a0193f6d39 Fix to overly optimistic service reporting 2015-01-19 17:40:21 -05:00
Duncan Sommerville
905981114f Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer 2015-01-19 16:41:56 -05:00
Duncan Sommerville
aee36c62b4 Updated README since dependencies are now on by default 2015-01-19 16:41:41 -05:00
Albert Santoni
dec7dddd83 Merge branch '2.5.x' into 2.5.x-installer 2015-01-19 15:40:07 -05:00
Albert Santoni
c399250fbf Updated credits 2015-01-19 15:39:52 -05:00
Albert Santoni
0c3395289d Merge pull request #78 from Robbt/realtime-smart-blocks 
Added sort tracks by upload time to smart blocks criteria
 2015-01-19 15:36:28 -05:00
Duncan Sommerville
57e4ba5292 requirements.apt for Ubuntu Precise 2015-01-19 15:05:49 -05:00
Duncan Sommerville
c5a60d2f09 Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise 2015-01-19 15:05:13 -05:00
Albert Santoni
2cb26db84b SAAS-547: Refactor upgrade procedure in 2.5.x-installer branch 
* Start using "schema_version" key instead of "system_version"
* Refactored the upgrade code a bit and make it be automatically invoked
  from the Zend bootstrap if a schema update is needed.
* Fixed error logging in certain cases
* Fixed an exception in Show related to image_path
 2015-01-19 13:41:23 -05:00
localizer
974d419951 updated translation resources 2015-01-19 13:52:08 +00:00
localizer
5980f599e7 updated translation resources 2015-01-19 13:02:11 +00:00
Albert Santoni
5abe364a69 Forgot to rename the 2.5.5 upgrade.sql to 2.5.2 2015-01-16 17:31:11 -05:00
Albert Santoni
b1d3dece48 Merge branch '2.5.x-installer' of github.com:sourcefabric/Airtime into 2.5.x-installer 2015-01-16 17:27:59 -05:00
Albert Santoni
c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
 2015-01-16 17:27:52 -05:00
Duncan Sommerville
c22f2cd5f0 Clean up readability of installer 2015-01-16 17:20:50 -05:00
Duncan Sommerville
44018b2cbf Changed status page to use config-check (tentative) and removed time-intensive check in index routing 2015-01-16 16:15:16 -05:00
drigato
38882abd1a SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:37 -05:00
drigato
527d2851af SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:14 -05:00
drigato
19626ed4f5 SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 13:26:55 -05:00
drigato
775008b274 SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 12:13:04 -05:00
drigato
57a7218a79 SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix 2015-01-16 11:09:13 -05:00
Duncan Sommerville
2f0b3d423c Small fix for users installing over an old version of airtime 2015-01-16 10:54:30 -05:00
Duncan Sommerville
75306936c0 Workaround for comment character conflict between python ConfigObj and PHP 2015-01-16 10:22:43 -05:00
Duncan Sommerville
04a1d82172 Upgrade step from 2.5.1 installs 2015-01-16 09:32:55 -05:00
Duncan Sommerville
36c889a3a2 Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer 2015-01-15 17:34:33 -05:00
Duncan Sommerville
4552089c19 Fixes to install & uninstall procedure 2015-01-15 17:33:47 -05:00
drigato
7930ae97ae Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-15 17:23:15 -05:00
drigato
29c5cf5de0 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-15 17:21:26 -05:00
drigato
52a66632c6 SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime 
Fix unit tests
 2015-01-15 17:17:29 -05:00
Albert Santoni
620029c04e Stop Chrome from flashing white between page loads 2015-01-15 16:45:14 -05:00
Duncan Sommerville
53b93d01ef Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:44:49 -05:00
Duncan Sommerville
791466b023 Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
Albert Santoni
7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-15 16:32:29 -05:00
Albert Santoni
f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using 
AJAX on the general prefs form
 2015-01-15 16:28:18 -05:00
Albert Santoni
11acca32f9 Update comment at the top of conf.php to reflect config file 
amalgamation
 2015-01-15 15:36:22 -05:00
Albert Santoni
5c95f63f75 Clarify README slightly 2015-01-15 13:57:10 -05:00
Duncan Sommerville
b144a92c4d Small fix to uninstall script 2015-01-15 13:52:12 -05:00
Duncan Sommerville
36c5d22e25 Made the process of switching from an old (pre-2.5.2) install to the new version smoother 2015-01-15 13:48:40 -05:00
drigato
f8ce7110ee Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-15 13:46:26 -05:00