Commit Graph

2084 Commits

Author SHA1 Message Date
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
drigato 3a50f7a6dc Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 16:55:47 -05:00
drigato cfb6195523 CC-5632: System preferences don't get saved 2013-12-11 16:55:35 -05:00
Naomi b13d12eaac CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 15:20:19 -05:00
Naomi 3a2f9a24b5 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
working on getting widgets to work properly returning station local time.
2013-12-10 16:45:05 -05:00
Naomi 0f28e0f1aa Merge branch '2.5.x' into cc-5594-date_default 2013-12-06 18:18:17 -05:00
Albert Santoni 2c7db0e83c CC-5555: Fix user preferences logic in preferences cache
* Fixes stream settings not dislaying
2013-12-06 17:11:07 -05:00
Naomi 061897a58b CC-5594 : Remove all date_default_timezone_get()
never rely on this method.
2013-12-05 16:00:52 -05:00
Naomi ec6a991090 CC-5594 : Remove all date_default_timezone_get()
missed a place to set show timezone,
setting UTC timezone in CcSchedule, very important!!
2013-12-05 15:57:00 -05:00
Naomi ed74470803 CC-5594 : Remove all date_default_timezone_get()
updating dashbaord information for timezone.
2013-12-04 17:54:28 -05:00
Naomi e508d141ed CC-5594 : Remove all date_default_timezone_get()
resizing must calculate from displayed calendar settings.
2013-12-04 15:48:32 -05:00
Naomi e71f306c7d CC-5594 : Remove all date_default_timezone_get()
setting display time using user timezone.
last played was never converted properly for display previously.
2013-12-04 15:24:27 -05:00
Naomi 10d8351f93 CC-5594 : Remove all date_default_timezone_get()
setting display timezone to be user's timezone for library utime and mtime.
2013-12-04 15:16:07 -05:00
Naomi aafeeb6aed CC-5594 : Remove all date_default_timezone_get()
replacing timezone with the user timezone pref.
2013-12-04 15:11:40 -05:00
Naomi c8cfdadb90 CC-5594 : Remove all date_default_timezone_get()
removing unused old methods, changing listener stats to use the user timezone for display.
2013-12-04 15:06:07 -05:00
Naomi 82b40f52e7 Merge branch '2.5.x' into cc-5594-date_default 2013-12-04 14:42:30 -05:00
Naomi 447ad4e3c6 CC-5594 : Remove all date_default_timezone_get()
correcting show contents timezone.
2013-12-04 14:39:56 -05:00
Naomi e6808b0c12 CC-5594 : Remove all date_default_timezone_get()
removing now unused old methods
2013-12-04 14:31:23 -05:00
drigato 7f8f084c98 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Refactored cc_show_day->getLocalEndDateAndTime() function
2013-12-04 14:17:19 -05:00
Naomi c9773d2a0e CC-5594 : Remove all date_default_timezone_get() 2013-12-04 14:13:19 -05:00
drigato 463d286ac5 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Refactored cc_show->isRepeating() function
2013-12-04 14:00:31 -05:00
drigato b78fa994f7 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Removed redundant timestamp var
Removed redundant DateTime object creation
2013-12-04 12:20:16 -05:00
drigato ef8af1b724 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
- Fixed resizing repeating shows to not include edited instances
- Fixed context menu on repeating shows with edited instances
- Fixed populated the show form when editing a single instance
2013-12-04 09:00:43 -05:00
drigato a465b5a770 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Create a new cc_show_day rule instead of a new cc_show
2013-12-04 09:00:43 -05:00
drigato 4253608948 Small fix to overlapping show check 2013-12-03 15:14:53 -05:00
drigato c18d53f403 CC-5593: Overlapping Show Bug
Get instance depending on whether instance id is provided or not
2013-12-03 15:07:40 -05:00
drigato d49131db48 CC-5593: Overlapping Show Bug
Need to check if the show instance has been deleted
2013-12-03 14:39:53 -05:00
drigato eae93008b4 CC-5589: SQL error when adding/moving a scheduled item
Error was occuring when a moved item didn't exist in a linked show instance
Error was also occuring when trying to insert item into a schedule localtion
that does not exist in a linked instance.

Fixed by skipping the move action if the file does not exist in a linked instance,
cleaning up the position numbers after deleting schedule items, and by
setting the insert time to the show start time in a linked instance is empty
2013-12-02 16:40:15 -05:00
drigato 89feb3d0fb Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-11-22 09:39:37 -05:00
drigato 52f0d5a13b CC-5570: Tracks get scheduled ahead of their show start time 2013-11-22 09:39:19 -05:00
Naomi 757e35aaf9 CC-5555 : Implement simple caching for preferences
comment out logging to not flood logs.
2013-11-11 17:22:55 -05:00
Naomi b8a084998e CC-5555 : Implement simple caching for preferences
cache key creation change.
2013-11-11 17:08:15 -05:00
Naomi f615e176e2 CC-5555 : Implement simple caching for preferences
better to include the key in the error message
2013-11-11 16:36:21 -05:00
Naomi f69dd123ca CC-5555 : Implement simple caching for preferences
making sure locale/timezone is returned properly in generic calls.
2013-11-11 16:32:43 -05:00
Naomi 06323a40fd CC-5555 : Implement simple caching for preferences
fixing up code so user id is never passed in manually to a preference getter.
2013-11-11 16:20:51 -05:00
Naomi f45708682f CC-5555 : Implement simple caching for preferences
using apc to save/fetch preferences to/from a cache.
2013-11-11 15:07:13 -05:00
Naomi 24663d9851 Merge branch '24hourfileimport' into 2.5.x 2013-10-16 17:29:22 -04:00
Naomi 02dbde82ec CC-5429 : importing file > 24 hours doesn't work 2013-10-16 17:27:40 -04:00
Albert Santoni 0d74d744da Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-16 16:49:15 -04:00
Naomi fa5c1018bf CRLF 2013-10-16 16:01:30 -04:00
Naomi 60cbd15381 CC-5428 : Ordering by length not working 2013-10-16 15:56:32 -04:00
Naomi 109b313d37 CC-5424 : Same webstream playing will switch off ON AIR light 2013-10-16 12:26:39 -04:00
denise b62fde46e7 CC-5407: Scheduling problem with global crossfade
Sometimes we set a flag to not apply the global crossfade value when inserting tracks.
This flag needs to get reset when more than one track is getting inserted or when
inserting an item into a linked show
2013-10-15 15:20:58 -04:00
Naomi 73e5fa8a90 CC-5410 : Now playing icon should not lag to show up on calendar 2013-10-11 18:15:12 -04:00
denise c85833239c CC-5379: adding a file after a gap in now playing - starts too early
Fixed the start time in cc_schedule
Track still starts playing later than cue in (CC-5019)
2013-10-10 12:11:23 -04:00
Daniel James febadd08b9 Updated comment to explain newer repeat types 2013-10-10 10:43:45 +01:00
denise ff28daf28e CC-5378: Subseconds are gone from cc_schedule calulations
Formatting error
2013-10-07 16:58:57 -04:00
Naomi c707967567 CRLF 2013-10-02 11:25:40 -04:00
Naomi faa6c7210c Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-02 11:25:08 -04:00
Naomi 4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -04:00
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi 1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
denise af03502592 CC-5323: User's Timezone Can Improperly Edit Show
-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
2013-09-25 16:22:30 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Daniel James 577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
Naomi Aro ae1c41e4ce CC-5333 : Rebroadcast Shows are not created 2013-09-23 12:20:10 +02:00
Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
2013-09-02 15:52:43 -04:00
Naomi Aro 60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
Naomi 075342c637 don't delete a history item if a show instance is removed from the database. 2013-08-30 16:43:05 -04:00
Naomi 4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi Aro 15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi 8208f8596b ordering by show start time 2013-08-29 15:37:33 -04:00
Naomi 653a6384b9 creating a separate controller for playouthistory templates. 2013-08-28 18:25:46 -04:00
Naomi 5aa983be36 adding an instance id to the playout history table. 2013-08-28 17:15:36 -04:00
Naomi 969889859b improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp. 2013-08-28 13:07:55 -04:00
drigato c48f556b7d CC-5303: Interface freezes sometimes when using smart blocks 2013-08-13 16:41:32 -04:00
Naomi 27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi 774027c9bd crlf 2013-08-02 15:30:35 -04:00
Naomi c110b4b4df file summary table now starting to work with templates.need to change query around to be configurable still. 2013-08-02 15:29:39 -04:00
Naomi 7ca3048f36 can add a new list item using the template.
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
Naomi 06e21029d0 saving a template to the DB. 2013-07-29 17:35:07 -04:00
Naomi 8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi 16581088d9 working on configuring an item template UI.
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro ec44b81f6a clrf 2013-07-18 01:37:39 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi e63518f2da IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature

moving original functionality into the service.
2013-07-03 16:00:48 -04:00
Naomi 328c1f3cac IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
Naomi Aro e0d2de642d CC-5254 : Listener Status for SHOUTcast doesn't work
clrf
2013-06-24 17:26:20 -04:00
Naomi Aro c5221aae6a CC-5254 : Listener Status for SHOUTcast doesn't work 2013-06-24 17:24:43 -04:00
Naomi Aro 3858371b16 CC-5251 : clrf 2013-06-24 11:15:09 -04:00
Naomi Aro a680421281 CC-5251 : Playlist length is not shown in Library 2013-06-24 11:09:03 -04:00
denise 3b353b47b1 CC-5216: Library length does not consider cue points 2013-06-07 14:19:46 -04:00
denise c9b7deba52 CC-5213: Crossfades aren't properly applied in schedule table sometimes 2013-06-07 13:07:08 -04:00
Naomi 2c35a0416a clrf fix 2013-05-30 16:53:03 -04:00
Naomi 61427647d6 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 16:52:17 -04:00
Naomi 891cc80069 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 16:52:03 -04:00
denise afda0c140b CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set. 2013-05-30 15:50:35 -04:00
denise 4728a90ce5 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:43:49 -04:00
denise c1c90a4b9a Smart block fix 2013-05-30 15:43:31 -04:00
Naomi 5fbae77c1f Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:38:34 -04:00
Naomi 1fa0ee49d6 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 15:36:55 -04:00
denise 527b1eaf1d CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist 2013-05-30 15:05:57 -04:00
denise 91ea1f2240 CC-5184: Timeline -> Filter by show option doesn't work 2013-05-29 15:00:35 -04:00
Martin Konecny 2a2fd45567 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-29 13:48:01 -04:00
Martin Konecny 362eba60d5 CC-5181
Library -> Edit Metadata:Exception in zendphp.log if trying to set a really large number as track number

-fixed
2013-05-29 13:47:55 -04:00
denise d3355a527a Removed commented out code 2013-05-29 13:18:37 -04:00
denise 90e235350f Small fix 2013-05-29 13:16:14 -04:00
denise 4c2de70256 CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set 2013-05-29 13:14:44 -04:00
denise 4a7a08a119 CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set
Crossfades were not getting applied to the track end time
2013-05-29 12:49:48 -04:00