Commit Graph

62 Commits

Author SHA1 Message Date
Naomi Aro 3bfbe036c7 CC-3174 : showbuilder
using the new status column in cc_schedule to colour boundary/overbooked tracks.
2012-03-01 15:09:13 +01:00
Martin Konecny a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny 497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
Martin Konecny 11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Martin Konecny a53d856e8d CC-3336: Refactor schedule API used by pypo
-add comment
2012-02-28 14:56:21 -05:00
Martin Konecny 99c24ed038 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
Martin Konecny 322d1bfa99 CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-28 14:43:39 -05:00
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
Naomi Aro 43d67c921d CC-3174 : showbuilder
adding cue/fade columns to table

fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
Martin Konecny 4631e199cc CC-3336: Refactor schedule API used by pypo
-add comment
2012-02-23 15:20:25 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
Martin Konecny bb300676cf CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-23 15:20:24 -05:00
Martin Konecny da012af6ed CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-22 20:41:24 -05:00
Martin Konecny c5c1dce4d6 CC-3336: Refactor schedule API used by pypo
-initial commit
2012-02-22 17:29:49 -05:00
Naomi Aro e1d5d6de73 CC-3174 : showbuilder
checking modification time before deleting items.
Throws a ScheduleOutdatedException
2012-02-16 16:29:11 +01:00
Naomi Aro b1fbeeb448 CC-3174 : showbuilder
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
Naomi Aro b7b1c401f6 CC-3174 : showbuilder
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
2012-02-14 13:33:25 +01:00
Naomi Aro fdd962f5ce CC-3174 : showbuilder
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00
Naomi Aro aa7afce245 CC-3174 : showbuilder
modifying times to work with scheduling times.
2012-02-07 17:29:52 +01:00
Naomi Aro 8212624c4a CC-3174 : showbuilder
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +01:00
Naomi Aro fbda0e733b CC-3174 : showbuilder
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
Naomi Aro f5761fd03c CC-3174 : show builder
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
Naomi Aro b0c3bace1c CC-3174 : show builder
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
Naomi Aro ecaebbeb67 CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. 2012-01-23 19:07:07 +01:00
Martin Konecny a0217f715f CC-3037: Nowplaying bar not showing current show
-fixed
2011-11-15 16:10:45 -05:00
Martin Konecny 20fc49b7be CC-3027: Current Show progress bar is wrong
-looks like it's working.
2011-11-12 00:04:37 -05:00
Martin Konecny 5a83c5b81e Merge branch '1.9.1' into devel
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
2011-10-14 01:38:52 +02:00
Martin Konecny d8bcb3f03d CC-2972: Find better way to determine domain which pypo should download from.
-Done
2011-10-14 00:07:53 +02:00
martin 9e6a1ebf44 CC-2833: Use ClassLoaders for PHP Files
-autoload DateHelper class
2011-09-26 15:29:12 -04:00
martin 1e9a8a28fe CC-2833: Use ClassLoaders for PHP Files
-Done for class Schedule and ScheduleGroup
2011-09-23 16:50:00 -04:00
martin 1dd78d0584 CC-2833: Use ClassLoaders for PHP Files
-Found out ClassLoaders only want one class per file. Moved
 ShowInstance class to its own .php file.
-Merged Show_DAL class into Show class
2011-09-23 12:33:28 -04:00
martin 2be0960ed5 CC-2833: Use ClassLoaders for PHP Files
-made MusicDir, Playlist and StoredFile autoload
2011-09-22 12:24:17 -04:00
martin 62f0d1c7b2 Merge branch '1.9.1' into devel 2011-09-17 12:37:15 -04:00
martin d824eb7622 CC-2837: Invalid SQL statement
-fixed
2011-09-17 12:36:35 -04:00
James 903c3474c7 CC-2654: Remove abilities that don't apply to SaaS
- not displaying manage folder option when saas is true
- not displaying record and rebroadcast section when saas is true
2011-09-02 15:24:35 -04:00
james 56ad8c6b3d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
2011-08-26 12:56:10 -04:00
martin 7cfde811c9 CC-2729: Items in a playlist delivered from the server via JSON aren't in the proper order
-fixed
2011-08-24 18:13:50 -04:00
martin 846e08699e CC-2628: update a repeated show start time cause the show to get corrupted
-disabled dragging + dropping repeated show instances
2011-08-18 18:13:43 -04:00
martin 266ee56d6d CC-2683: All times in the database are not stored in UTC.
-missed a spot where we need to use calculate in UTC
2011-08-17 16:35:03 -04:00
martin 41fd5f2543 cc-2683: not using utc time
-context menu showing options display correctly
-edit show fills in correctly
-Now Playing view shows up correctly
2011-08-16 15:07:55 -04:00
Naomi Aro 9de0d490d8 CC-2569 : Scheduling a rebroadcast show uses old file length access
use new metadata key access.
2011-07-19 12:37:06 +02:00
martin 1416274882 CC-2529: Create download file API key
-users who are authenticed via ZEND_AUTH can now preview files
 without using api-key
2011-07-12 14:09:40 -04:00
martin d03cf4ca14 CC-2482: Next Song/Previous song can still be incorrect in some rare cases
-should be fixed.
2011-06-29 14:40:56 -04:00
james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
2011-06-20 18:09:37 -04:00
martin ec6db96025 cc-2015: on reboot resume show
-use native capabilities of liquidsoap cue-in cue-out
 for song cue-in/cue-out
2011-06-16 18:59:15 -04:00
martin e5ed11ee51 cc-2015: on reboot resume show
-removed cue file from pypo responibility
2011-06-16 13:26:37 -04:00
martin 0d13b9013b cc-2015: on reboot resume show
-calculating the amount of seconds since track began complete
2011-06-16 13:26:36 -04:00
james cf654f1a45 CC-1724:phone-home-statistics
Rebase from devel into this branch
2011-06-15 12:06:50 -04:00
james 061dec14aa CC-2289:Differentiate between time and duration
- modified createNewFormSections function so it populate form
with defalt value
2011-06-13 14:20:57 -04:00