Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,710 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

2085 Commits

Author SHA1 Message Date
Albert Santoni 345c782eb9 Fixed the unit tests and changed ops->zu 2014-06-09 11:34:25 -04:00
Albert Santoni cc19b18d7f CC-5588: Specific user can't see Library because ColReorder is null for 
their account
 2014-06-05 18:04:42 -04:00
Albert Santoni 1624aa4007 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-30 17:13:00 -04:00
Albert Santoni 9f9c32aec3 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-05-30 17:12:42 -04:00
Albert Santoni 61be4875fb CC-5343: Missing files can be scheduled via playlists 
* Fixed it by adding a check for this.
 2014-05-30 17:11:12 -04:00
Albert Santoni 1db308330b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-22 18:47:21 -04:00
drigato 8432799b9a CC-5853: Tracks marked as 'hidden' won't be marked as unavailable in Now Playing page 2014-05-22 14:47:14 -04:00
drigato fb12ee7e54 CC-5855: Output to zendlog when files are deleted from library 
Added host name to log message
 2014-05-20 14:21:41 -04:00
drigato f684ce4ab9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 14:16:24 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
Albert Santoni e963157a22 Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:49 -04:00
Albert Santoni f89c66922b Merge branch '2.5.x-saas' into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:42 -04:00
drigato 5762bb9df5 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-05 12:26:01 -04:00
drigato 16fb9d75d3 Changed GetDiskUsage so it will always return 0 if the value has not been set yet 2014-05-05 12:25:42 -04:00
drigato a8c428bfb0 Fix disk quota message 2014-05-05 11:52:13 -04:00
drigato e11afd4e71 Fix for new saas instances getting created with a 'disk quota reached' message 2014-05-05 11:41:43 -04:00
Albert Santoni 250d5d083e Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-02 16:06:15 -04:00
Albert Santoni 2d6748457c Remove database credentials from application.ini 2014-05-02 15:50:37 -04:00
drigato b4a9882e9c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 10:27:07 -04:00
drigato d081ff10b2 CC-5807: Disk Space will be updated when file is not actually deleted 2014-04-28 10:25:36 -04:00
Albert Santoni 446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
 2014-04-25 00:43:22 -04:00
Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
 2014-04-23 15:58:39 -04:00
Naomi 578f758274 CC-5810 : Installation can have race conditions with the cache 
Preferences.php is used to set values since it will save the value to cache there as well.

defaultdata.sql is used where possible.
 2014-04-23 15:41:15 -04:00
Albert Santoni 43483dc112 Added dev env to RabbitMQ stuff for Analyzer (fixed) 2014-04-22 12:28:20 -04:00
Albert Santoni a79f53758f Fixed the RabbitMQ thingy 2014-04-22 11:40:35 -04:00
Albert Santoni f106bf8fad Separate RabbitMQ settings by development environment 2014-04-22 11:13:15 -04:00
drigato 411af6838b Remove logging statement 2014-04-17 17:02:14 -04:00
drigato 64ebd9e720 Logging statement 2014-04-17 16:15:04 -04:00
drigato 8979e4e5a9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-17 16:09:03 -04:00
drigato df9482f2ff CC-5795: Airtime Analyzer: "Delete file" in Library doesnt remove it from path 
Media monitor was still being used to delete the file from stor
 2014-04-17 16:08:02 -04:00
drigato edeb4b052a Remove logging statements 2014-04-16 16:53:17 -04:00
drigato f33317ebee Logging for testing 2014-04-16 16:44:31 -04:00
drigato 7c39ab294d Logging for testing 2014-04-16 16:37:38 -04:00
drigato 837decb5c3 Logging for testing 2014-04-16 16:36:19 -04:00
drigato 284a1b8895 Upgrade logging test 2014-04-16 16:29:36 -04:00
drigato db62ffff90 Log statment for testing upgrades 2014-04-16 16:01:48 -04:00
drigato 634b429391 Logging statment for testing upgrades - will be removed 2014-04-16 15:56:45 -04:00
drigato d05eae629a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-16 12:16:08 -04:00
drigato f5a2e59b6d Removed disk space check from StoredFile. This is now done in the Media controller 2014-04-16 12:15:34 -04:00
drigato 10cf16f53a Logging statments 2014-04-16 12:04:18 -04:00
drigato 87f365038f Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 12:22:15 -04:00
drigato 53ffa29b6b CC-5786: Quota Enforcement in the File Upload API 
small fix
 2014-04-14 12:21:59 -04:00
drigato 9041801103 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 12:09:48 -04:00
drigato 63e2eda64b CC-5786: Quota Enforcement in the File Upload API 
Tweaked this so it will work on self-hosted instances
 2014-04-14 12:09:15 -04:00
Albert Santoni 8fb95316f2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
 2014-04-09 15:01:11 -04:00
Albert Santoni e4af3a5a0e CC-5709: Airtime Analyzer 
* Better SIGTERM handling for airtime_analyzer
* Nuke the .identifier files saved by Airtime
 2014-04-08 17:28:50 -04:00
Albert Santoni e044187aed Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	python_apps/airtime_analyzer/setup.py
 2014-04-04 19:48:22 -04:00
drigato cdcdf7d912 SAAS-382: Reimplement Storage Quota 
Changed status page to use new disk_usage value from cc_pref table.
 2014-04-04 13:30:46 -04:00
Albert Santoni 95b369c54d CC-5709: Airtime Analyzer 
* Remove awful StoredFile::uploadFile() function
* Massive airtime_analyzer commenting and cleanup
* Cleaned up the upload code
* Temporarily disabled the liquidsoap playability test.
 2014-04-03 16:13:26 -04:00
Albert Santoni e3757d892b CC-5709: Airtime Analyzer 
* Fix hack for Airtime Pro
 2014-04-02 17:27:10 -04:00
Albert Santoni a6e80e2789 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-01 12:29:20 -04:00
Albert Santoni 7ea2eef233 CC-5709: Airtime Analyzer 
* Use system-wide config for Airtime PHP->airtime_analzyer RabbitMQ
  communication on Airtime Pro
 2014-04-01 12:07:29 -04:00
drigato 70228a675e Changed default import_status value on cc_files table to 1 (pending) 2014-04-01 11:28:33 -04:00
Albert Santoni 1c5e2d6205 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/public/index.php

* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
  only one way to find out...
 2014-03-27 16:38:03 -04:00
Albert Santoni db2b52a1bf CC-5709: Airtime Analyzer 
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
  imports.
 2014-03-24 17:14:04 -04:00
Albert Santoni efca227388 SAAS-417: Disable Live Chat for Starter Plans 
* Disable Live Chat for Starter Plans
 2014-03-21 14:30:41 -04:00
Albert Santoni 8f7ecafcf6 CC-5709: Airtime Analyzer 
* A bunch of changes that somehow didn't make it into my last commit...
* confused
 2014-03-21 14:03:17 -04:00
drigato 7800cb1e15 SAAS-382: Reimplement Storage Quota 
Storing disk usage in cc_pref
Add/subtract filesize to/from disk usage total when a file is uploaded or deleted
TODO: Hook this into the ftp server
 2014-03-21 09:50:03 -04:00
Albert Santoni 2a783f3825 Merge branch '2.5.x' into 2.5.x-saas 2014-03-17 15:41:14 -04:00
Albert Santoni 50a42f12bb CC-5709: Airtime Analyzer 
* File import via the Add Media page now works!
* Reworked StoredFile::copyFileToStor() because it's still needed.
* Reworked the way file paths are reported in airtime_analyzer
  and in the RESTful media API
 2014-03-17 10:19:39 -04:00
Albert Santoni 451b19150b CC-5709: Airtime Analyzer 
* Notify airtime_analyzer of new uploads with RabbitMQ
* Use a durable exchange for airtime-uploads
 2014-03-13 13:35:48 -04:00
Albert Santoni e6cbbdff33 CC-5709: Airtime Analyzer 
* Added session auth to the Media API (if you're logged in)
* Started reworking our Plupload interaction with the server to be less
  awkward.
* Basic uploading works with the Add Media page again, but messages
  aren't dispatched to airtime_analyzer yet (coming next...)
 2014-03-13 11:14:30 -04:00
drigato bcda9ea5e6 Broke unit test for adding content to single show 2014-03-05 14:50:35 -05:00
drigato ebc68b980c CC-5718: Show content can get scheduled in instances that are in the past 
Disabled scheduled content into instances that have already played out
Removed setting the show's start date to the first repeating instance's start date
because we already fixed that in CC-5697
 2014-03-05 13:12:27 -05:00
drigato b433a529ab CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot 2014-03-03 16:42:52 -05:00
drigato 753003639f CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot 
The problem was that we weren't updating the first show's start time if deleting
a repeat show day changes it. This affected the difference between the original
show start time and the new one.
 2014-02-25 17:22:17 -05:00
drigato cd592827fd CC-5698: Library -> Scheduled column doesn't get updated when bulk adding items 
Array storing file ids of scheduled files was in wrong place
and was getting re-created everytime a file was inserted into a show
 2014-02-24 17:46:16 -05:00
drigato 09040dc021 Merge branch '2.5.x' into 2.5.x-saas 2014-02-03 12:33:57 -05:00
drigato 63ec20d9f1 CC-5681: I18N: Fail to switch language 
Check if Zend_Auth class exists with the autoloader
 2014-02-03 12:33:35 -05:00
drigato b7c79df6ec Merge branch 'unittests' into 2.5.x 2014-01-31 15:02:41 -05:00
Albert Santoni c7c2d37b30 Merge branch '2.5.x' into 2.5.x-saas 2014-01-31 13:21:33 -05:00
drigato 883e8885c7 CC-5677: Library -> Scheduled column gets updated on incorrect file 2014-01-30 12:38:18 -05:00
Albert Santoni d68227939f Merge branch '2.5.x-saas' of github.com:sourcefabric/Airtime into 2.5.x-saas 2014-01-29 17:20:53 -05:00
Albert Santoni 03015a6b69 Nerf the APC cache on SaaS 
* We have multiple webservers on SaaS so we need a distributed data
  cache like memcached.
* Fixes CC-5671: Live streaming: UI won't update connection status unless reload apache2
 2014-01-29 17:19:24 -05:00
drigato 719d582e0f Merge branch '2.5.x' into 2.5.x-saas 2014-01-29 12:13:24 -05:00
drigato 7a04f7d98e CC-5672: Webstream warnings on SaaS 
Don't parse/use header info if get_headers returns false
 2014-01-29 12:09:05 -05:00
Albert Santoni ed78625fce Merge branch '2.5.x' into 2.5.x-saas 2014-01-27 12:01:11 -05:00
Albert Santoni 52c3971fc6 Fixed a bug in Application_Model_SetShowsPopulatedUntil 2014-01-22 17:58:25 -05:00
drigato a648f7fa2d CC-5665: Timeout can occur when scheduling large playlists into linked shows 
Added a temporary fix by extending the php time limit
 2014-01-09 11:57:32 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
drigato dc05d9ddaf CC-5649: Remove unused function, Application_Model_Show::populateAllShowsInRange 2013-12-17 17:09:59 -05:00
Albert Santoni 6a468ff549 Fix a rendering problem if a zero length show happens 2013-12-13 18:27:14 -05:00
Albert Santoni 346036a9ca Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 
Conflicts:
	airtime_mvc/application/models/Show.php
 2013-12-13 16:12:26 -05:00
Albert Santoni fa0a190277 Prevent division by zero if show lengths end up being zero 2013-12-13 16:10:36 -05:00
Naomi 99902bc10c CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-13 15:16:51 -05:00
Naomi 445f1ebe4f CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
removing old crappy method.
 2013-12-13 15:14:38 -05:00
Naomi 7a51b8d2ad CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-13 15:06:52 -05:00
Naomi a45235d39b CC-5627 : Check all Application_Common_DateHelper calculations that use timezone 2013-12-13 15:03:02 -05:00
Albert Santoni 27f0fa27e9 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 13:32:25 -05:00
Albert Santoni a96c2551ef CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
  the station timezone. This fixes negative remaining time that could
  occur in the embeddable JS Airtime widgets if you were logged in to
  Airtime while you viewed your website. (The widgets display in
  the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
  consistently in the user timezone now.
 2013-12-12 13:28:51 -05:00
drigato 974be86691 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 11:48:11 -05:00
drigato 9bbc3cf713 CC-5633: Can schedule overlapping shows 
The overlapping show check was returning false too early
 2013-12-12 11:48:00 -05:00
Albert Santoni f2fe04ba1d Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-12 11:33:28 -05:00
Albert Santoni 8986f1bc4f CC-5627 : Check all Application_Common_DateHelper calculations that use 
timezone.

* Changed getRangeStartAndEnd() to use UTC explictly
 2013-12-12 11:32:40 -05:00
Naomi 37ea29380b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 18:56:29 -05:00
Naomi 67031a75fe CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 18:56:19 -05:00
Albert Santoni abf3a50694 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 18:22:08 -05:00
Albert Santoni a9bd34fbcb CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Eliminate more strtotime usage, could fix on air light weirdness in
  some circumstances.
 2013-12-11 18:20:40 -05:00
Naomi e6c971387b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 17:35:47 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00