drigato
b871b32175
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-30 12:17:34 -04:00
drigato
54d1bcf81e
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-30 12:15:41 -04:00
Duncan Sommerville
d4e8eed51d
Marked old functions for API calls as deprecated
2014-10-27 15:52:58 -04:00
drigato
7edd993fa3
Reverted pypo's copy file method to how it was without cloud files
...
and instead directly call the cloud file's downloader method.
2014-10-24 15:50:52 -04:00
Duncan Sommerville
598b18b65a
Added live-info-v2 and station metadata api calls
2014-10-24 15:11:27 -04:00
drigato
9726fb80d2
Removed amazon s3 signature from pypo cache file name.
...
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
2014-10-22 14:17:44 -04:00
drigato
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
drigato
52f3ed816e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 12:01:42 -04:00
drigato
20bd2ad9d5
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 11:08:55 -04:00
drigato
fe8e004d87
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-15 11:07:26 -04:00
drigato
8c2754972e
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
2014-07-29 15:07:51 -04:00
Albert Santoni
c09457ce7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 15:03:39 -04:00
Albert Santoni
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
drigato
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -04:00
drigato
9c4b254bab
CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents
2014-06-09 15:35:50 -04: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
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
ed74470803
CC-5594 : Remove all date_default_timezone_get()
...
updating dashbaord information for timezone.
2013-12-04 17:54:28 -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
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
Naomi
109b313d37
CC-5424 : Same webstream playing will switch off ON AIR light
2013-10-16 12:26:39 -04:00
denise
91ea1f2240
CC-5184: Timeline -> Filter by show option doesn't work
2013-05-29 15:00:35 -04:00
Naomi Aro
4d1a15b7ca
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-28 14:27:59 -04:00
denise
3d09747990
CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show
2013-05-16 13:42:06 -04:00
Martin Konecny
5080807a21
IM-629
...
-fix minor SQL syntax error
2013-05-14 19:18:41 -04:00
Martin Konecny
bb36556bb9
IM-629
...
-filter by using instance id instead of show id
Conflicts:
airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04:00
Naomi
74c0e390b6
CC-5147 : check builder feed on now playing page updating when not needed
...
wrong timestamp used when changing to prepared statement.
2013-05-14 16:51:34 -04:00
denise
c173744929
CC-5090: Unscheduled tracks are still marked at Scheduled in linked show
2013-05-14 10:58:06 -04:00
Naomi
82945038d5
CRLF fix
2013-05-10 17:44:50 -04:00
Naomi
b0018083c7
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-10 17:14:10 -04:00
Martin Konecny
9c05511613
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:08:47 -04:00
denise
71526a94cc
Merge branch 'cc-4961-show-linking'
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
Martin Konecny
fd78ad29bf
cleanup of function names
2013-04-19 20:24:05 -04:00
Martin Konecny
f39f9329cc
CC-4992:
...
Decouple pypo from Airtime install
-first commit
2013-04-19 20:10:51 -04:00
denise
a9b5d00d87
CC-4961: Show linking
2013-04-18 16:12:26 -04:00
denise
6766d208aa
CC-4961: Show linking
...
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
denise
99c07272fd
- Moved all form validation to it's own function in schedule service
...
- Moved show creation to it's own function in schedule service
2013-03-06 09:58:35 -05:00
drigato
bdab294fce
Added comments to Schedule Service
2013-03-06 09:58:35 -05:00
denise
d08f6cf3e1
CC-4961: Show linking
...
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
Martin Konecny
93ec4c001b
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
denise
cf2ed25bfb
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
...
-done
2013-01-30 16:53:59 -05:00