Commit Graph

5057 Commits

Author SHA1 Message Date
drigato 725b5da154 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 17:42:12 -04:00
drigato 14c670aa20 CC-5728: Problem when removing repeat option and changing start date 2014-03-10 17:41:57 -04:00
Naomi 1854d76f03 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 17:39:36 -04:00
Naomi 5f3199b4bb CC-5727 : History search range using incorrect timezone offset 2014-03-10 17:39:17 -04:00
drigato 8ad866c2a2 Fixed changing the start date on a non-repeating show 2014-03-10 17:32:54 -04:00
drigato 78d34a6d16 Fixed broken test 2014-03-10 17:31:24 -04:00
Naomi bb00936792 CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-10 12:38:42 -04:00
drigato 03bb0e1df9 CC-5725 Changing a show's repeat type removes first instance from repeating seriesCC-5726: Write database test cases for CC-5725 2014-03-07 15:59:57 -05:00
drigato 6b91d2daf8 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-07 14:52:32 -05:00
Naomi 9162ec99fd CC-5450 : Refactor Media Management (Classes/DB) in Airtime
making sure to store boolean values.
2014-03-06 18:28:05 -05:00
Naomi d14041ac0a CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on repopulating criteria in rules form.
2014-03-06 18:02:02 -05:00
drigato 35fd639c1c CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 11:18:13 -05:00
drigato 51b5cc2052 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 10:54:40 -05:00
Naomi 7c7748c753 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up range field to match.
2014-03-05 18:33:42 -05:00
Naomi 04d17c3818 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on playlist AND/OR
2014-03-05 18:18:24 -05:00
Naomi c944b8c6a7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on adding smart block criteria back in playlist rules.
2014-03-05 17:37:08 -05:00
drigato bcda9ea5e6 Broke unit test for adding content to single show 2014-03-05 14:50:35 -05:00
drigato 426b75b635 CC-5724: Changing start date of a repeating show will update content incorrectly 2014-03-05 14:37:07 -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
Naomi 3ce67a6523 CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-04 12:52:26 -05:00
drigato 7660e0cd84 CC-5719: Incorrect show content start time
The show content was getting recalculated twice sometimes.
So if the difference between the original and now show start
date-time and was 2 hours, the scheduled content would have
a difference of 4 hours
2014-03-04 11:29:49 -05:00
Naomi bbdc9dcb6d CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-03-03 17:11:09 -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
Naomi e6896a3256 show instance clean up 2014-02-27 18:30:15 -05:00
Naomi 89a404f568 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
combining update media playing into history service, only creating a history entry if the item is being broadcast.
2014-02-27 17:42:27 -05:00
drigato 1715f2187d CC-5715: Write database test to check the schedule start times after editing a repeating show and changing the repeat day 2014-02-27 13:08:41 -05:00
drigato 4cb785a062 CC-5716: Write database test to check the show content after editing a repeating show and removing a repeat day 2014-02-27 12:10:28 -05:00
drigato e5cdaf3785 Temporarily commenting out test 2014-02-27 09:32:28 -05:00
drigato 1acdf2ca80 CC-5716: Write database test to check the show content after editing a repeating show and removing a repeat day 2014-02-27 07:35:08 -05:00
Naomi b46863345a CC-5450 : Refactor Media Management (Classes/DB) in Airtime
replace content or not
2014-02-26 18:31:33 -05:00
Naomi e295663f9e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on playlists
2014-02-26 18:06:50 -05:00
Naomi 739e2c3f7d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
more fixes for history editing
2014-02-26 15:49:33 -05:00
Naomi 6f0e7b3976 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up record editing.
2014-02-26 15:32:35 -05:00
Naomi 7e2633f658 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up editing history items.
2014-02-25 18:08:39 -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 f1658f6490 CC-5697: Editing a linked show's repeat day sets wrong day for show content
Fixed a problem where we can't store the original cc_show_day data
because none can exist at some points. If the user changes the only
repeat day, the cc_show_day rule is deleted first then recreated
2014-02-25 17:16:14 -05:00
Naomi 96a02c8642 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing imports and casting types.
2014-02-25 16:59:56 -05:00
drigato 3db1cd412a CC-5697: Editing a linked show's repeat day sets wrong day for show content
Optimized how we store the instance ids that already exist
2014-02-25 16:51:48 -05:00
Naomi 7877000186 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
creating single table inheritance with propel on the playlist table.
creating separate classes for either static or dynamic playlists.
2014-02-25 16:42:44 -05:00
Naomi aac73a3cc7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
make sure extra columns don't show up in show builder.
2014-02-25 12:41:22 -05:00
Naomi 3be85340d0 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
adding some more database indexes.
2014-02-25 12:02:08 -05:00
Naomi fc8c964d43 Merge branch '2.5.x' into 2.6.x
Conflicts:
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Scheduler.php
	airtime_mvc/application/services/HistoryService.php
	airtime_mvc/build/build.properties
2014-02-25 11:36:55 -05:00
Naomi 4ddbb82e4a CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing an import, adding some indexes to the database.
2014-02-25 11:11:04 -05:00
Naomi 594e8df606 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up file summary in history.
2014-02-24 18:42:33 -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 6cd84363a6 CC-5697: Editing a linked show's repeat day sets wrong day for show content
Added comment
2014-02-24 16:04:48 -05:00
drigato 787f19f69a CC-5697: Editing a linked show's repeat day sets wrong day for show content
When a user edits a show and changes the repeat day, we are really deleting the instances from the original
repeat day and creating new instances. Therefore, we don't need to update the show content's start/end time
in this case.
2014-02-24 14:49:11 -05:00
Naomi 362aa20cc1 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
history item refactoring mostly done.
2014-02-21 18:44:00 -05:00
Naomi 256107d2b6 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
improving history logging.
2014-02-21 17:21:20 -05:00
Naomi 062d8ae9d6 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
removing all old media access from ApiController, using the new tables.
2014-02-20 16:10:08 -05:00
Naomi f64f737cf7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
removing all old tables now, starting clean up.

playlist rules stored in a text field in a json formatted string.
no need for a seperate criteria table now.
2014-02-20 12:40:59 -05:00
Naomi Aro 55291b3f15 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fix blocking on jPlayer html5 request
2014-02-14 23:50:16 -05:00
Albert Santoni 86dafaf61c SAAS-404: Separate the Airtime API version from the Airtime version
* Airtime PHP side can be version bumped without pypo freaking out now
2014-02-14 16:22:15 -05:00
Naomi fd05048a48 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
can open a playlist for editing
2014-02-14 16:15:42 -05:00
Naomi 4fabaa34a7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
checking there is an open playlist for the add button.
2014-02-14 15:33:26 -05:00
Naomi 04c10df071 Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x 2014-02-14 13:43:17 -05:00
Naomi eb0682a5d4 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on multi add in library.
now playing page should be fully working.
2014-02-14 13:42:58 -05:00
Albert Santoni 181db1deb2 Add some defensive code against missing memcached settings 2014-02-14 12:23:02 -05:00
Albert Santoni bb3523d92e Merge branch '2.5.x-jquery-cleanup' of https://github.com/danielhjames/Airtime into 2.6.x 2014-02-14 11:55:33 -05:00
Naomi 1b146b77a8 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
trackoffset in playlist contents is now an interval as well.

window function calculates offsets by summing cliplength and subtracting trackoffsets.
2014-02-13 16:03:00 -05:00
Naomi Aro 1c0ecfb1cf CC-5450 : Refactor Media Management (Classes/DB) in Airtime
Using a postgresql window function to calculate offsets in the playlist.
All times are formatted now to 3 decimal places.
2014-02-13 02:22:32 -05:00
Naomi d4fe56d309 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
implementing delete, changing how an audiofile is deleted.
hidden is useless and maybe dangerous, actually removing an entry from the db when a user
removes it from the interface. it will be deleted from all playlists which will update their lengths and content positions.
2014-02-12 19:06:55 -05:00
Naomi 4b5202e47f CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on getting deleting items to be the same as in 2.5.1
2014-02-12 14:59:11 -05:00
Daniel James 3a503c2488 Move showinfo.js to libs and link via URLs, remove old jQuery versions 2014-02-12 15:24:43 +00:00
Daniel James 743b42fb4e Remove duplicate copy of CSS file that we don't use 2014-02-12 13:20:29 +00:00
Daniel James b530299159 We don't seem to use jQuery 1.10 at the moment 2014-02-12 12:47:38 +00:00
localizer 003f9ed6b2 updated translation resources 2014-02-12 10:54:11 +00:00
Naomi 33f609fc8a CC-5450 : Refactor Media Management (Classes/DB) in Airtime
starting implementation of "delete" for media library.
2014-02-11 18:31:00 -05:00
Naomi 53a378abc1 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working select all/none dropdown.
fixing up datatables plugins. migrating to submit on enter for search.
2014-02-11 15:54:18 -05:00
localizer b7b92fc19e updated translation resources 2014-02-11 20:09:12 +00:00
Naomi Aro 00e851ddfc CC-5450 : Refactor Media Management (Classes/DB) in Airtime
don't want to prevent default.
2014-02-11 01:37:30 -05:00
Naomi Aro 1473c1d13d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
adding advanced search to all media tables.
2014-02-11 01:29:18 -05:00
Naomi 2855c3a45d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
putting in proper paging for media tables
2014-02-10 19:51:54 -05:00
Naomi 3ee0d9ccb7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing some search issues
2014-02-10 18:54:33 -05:00
Naomi aebea96aec CC-5450 : Refactor Media Management (Classes/DB) in Airtime
advanced search is working for dates, numbers and strings
2014-02-10 18:26:43 -05:00
drigato 8bbc243cf6 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-02-10 16:19:40 -05:00
drigato 3b9608a8df CC-5693: API call to notify-item-start-playing fails because an invalid schedule id is sent
Temporary fix for this bug. Throw an exception if no schedule item is found.
2014-02-10 16:19:26 -05:00
Albert Santoni 7ee5c8ffd7 Another dummy commit for Bamboo 2014-02-10 13:32:41 -05:00
Albert Santoni 36d6a6b2bf Dummy commit to test web hook 2014-02-10 13:18:28 -05:00
Albert Santoni 034d1dc9f8 Unit test docs update 2014-02-10 13:03:11 -05:00
Daniel James cd0e8d3464 Removed old version of jquery-ui 2014-02-10 17:41:33 +00:00
Daniel James 22d303be17 Remove old jQuery library 2014-02-10 17:31:52 +00:00
Naomi f25918336d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
column filter now sends data in proper field.
starting to fix up datepicker defaults in common.js, avoid repeating options.
2014-02-10 12:06:26 -05:00
Naomi 71f9ce1942 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
starting working on proper visibility of advanced search fields.
2014-02-06 12:41:50 -05:00
Naomi 54de9d47c3 Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x 2014-02-06 11:25:40 -05:00
Naomi a21683bf90 CC-5450 : Refactor Media Management (Classes/DB) in Airtime 2014-02-06 11:25:33 -05:00
Naomi Aro 1227eb5d32 Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x
Conflicts:
	airtime_mvc/public/js/airtime/library/lib_separate_table.js
2014-02-05 21:40:27 -05:00
Naomi Aro 046d7fd07e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
investigation Chrome some more.
2014-02-05 21:36:56 -05:00
Naomi 7a2238fbad CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on setting up advanced search
2014-02-05 18:18:21 -05:00
Albert Santoni 296adfdb24 CC-5651: Unit Test the Scheduler
* Added a beastly unit test for Application_Model_Schedule::isFileScheduledInTheFuture
2014-02-05 15:37:47 -05:00
Naomi Aro 0ce0371e6d Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x
Conflicts:
	airtime_mvc/application/models/airtime/AudioFile.php
2014-02-04 20:21:44 -05:00
Naomi 309a30910e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
starting to setup advanced search
2014-02-04 18:54:05 -05:00
Naomi 640dac63a2 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
saving/restoring the column settings for each table in the library.
2014-02-04 17:46:53 -05:00
Naomi 636dba3db1 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
saving column displays for all datatables in the library.
2014-02-04 17:15:05 -05:00
Naomi 7fee696014 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing up editing metadata for audio files.
2014-02-04 15:44:20 -05:00
localizer c84c6d9d22 updated translation resources 2014-02-04 18:20:15 +00:00
localizer 93eb5ff1de updated translation resources 2014-02-04 14:07:13 +00:00
localizer f056eeac0a updated translation resources 2014-02-04 11:49:16 +00:00
localizer ce819b18e7 updated translation resources 2014-02-04 11:32:05 +00:00
localizer c549544146 updated translation resources 2014-02-04 11:31:56 +00:00
localizer 2d61459620 updated translation resources 2014-02-04 11:25:37 +00:00
localizer f2ce85a212 updated translation resources 2014-02-04 11:24:32 +00:00
localizer b209c58dbf updated translation resources 2014-02-04 10:32:05 +00:00
Naomi Aro c04e33cbfd Merge branch '2.6.x' of github.com:sourcefabric/Airtime into 2.6.x 2014-02-03 21:57:26 -05:00
Naomi 2feac41af7 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
creating context menus for the media in their own services.
2014-02-03 18:33:11 -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
localizer 5d19a22b2d updated translation resources 2014-02-03 12:35:10 +00:00
Naomi Aro 8e2215c58d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on jplayer
2014-02-01 21:41:34 -05:00
Naomi 86b5f68c67 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
trying to fix chrome lag issue with inline jPlayer.
2014-01-31 17:32:45 -05:00
drigato ba84e609e7 Moved commit hook scripts to dev_tools directory 2014-01-31 16:42:53 -05:00
drigato 6d63b81f76 Testing commit triggers.... 2014-01-31 15:56:59 -05:00
drigato a00ab8bc79 Added comment for phpunit 2014-01-31 15:31:40 -05:00
drigato f71909d255 CC-5651: Unit Test the Scheduler
Some fine tuning
2014-01-31 15:22:19 -05:00
drigato b7c79df6ec Merge branch 'unittests' into 2.5.x 2014-01-31 15:02:41 -05:00
drigato e24d25e398 CC-5651: Unit Test the Scheduler
Log results in xml file for junit parser
2014-01-31 12:41:15 -05:00
drigato 5c01234445 CC-5651: Unit Test the Scheduler
Small fix to runtests script
2014-01-31 11:18:46 -05:00
drigato 4beb06a1d9 CC-5651: Unit Test the Scheduler
Creat a rabbitmq vhost and user before running tests so airtime doesn't have to be installed
2014-01-31 11:09:22 -05:00
localizer 4a39097daf updated translation resources 2014-01-31 07:52:07 +00:00
localizer 5730c13da6 updated translation resources 2014-01-30 20:37:06 +00:00
drigato 484f1d9502 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-01-30 12:38:49 -05:00
drigato 883e8885c7 CC-5677: Library -> Scheduled column gets updated on incorrect file 2014-01-30 12:38:18 -05:00
root 91c89e91f3 Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2014-01-30 17:07:52 +00:00
drigato ce7eddf563 CC-5678: Scheduler: Show's contents won't follow show's scheduled time change
Fixed by storing original cc_show_day object by value
2014-01-30 12:07:24 -05:00
root 3f15bf6e80 updated translation resources 2014-01-30 17:06:38 +00:00
Naomi fbe0b0a75d CC-5450 : Refactor Media Management (Classes/DB) in Airtime
creating service function for column datatables settings script.
context menu on right click, dblclick event now used for adding to shows/playlist.
2014-01-29 18:03:44 -05:00
Daniel James eb35dcac5f Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00: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
Naomi eea17b9dcd CC-5450 : Refactor Media Management (Classes/DB) in Airtime
new code for getting the dashboard json.
2014-01-28 18:38:31 -05:00
Naomi 1f0d44de02 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
working on new query for prev/current/next
2014-01-27 17:52:45 -05:00
Naomi 1516f916eb CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixed column sorting problem
2014-01-27 17:52:19 -05:00
drigato a59453cde5 CC-5651: Unit Test the Scheduler 2014-01-27 17:17:03 -05:00
drigato 55665fb246 CC-5651: Unit Test the Scheduler
Added test for weekly repeat show R&R show creation
2014-01-27 15:10:42 -05:00
Albert Santoni c9d98e4e10 Small Airtime Pro fix for ShowFormService 2014-01-27 14:31:33 -05:00
drigato 697e50c50d CC-5651: Unit Test the Scheduler
Added test for non-repeating record and rebroadcast shows
2014-01-27 13:23:28 -05:00
drigato 6da493110f CC-5651: Unit Test the Scheduler
Fixed linked show test
2014-01-27 12:23:46 -05:00
Naomi 6e7f9d3232 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
testing sending audio file and webstream schedules.
Seems to be bugs with pypo around message passing and possibly noticing a track that
should be currently playing.
2014-01-24 17:52:39 -05:00
drigato d6aabfdc88 CC-5651: Unit Test the Scheduler
Added some linked show tests
2014-01-24 17:25:40 -05:00
drigato 2bbc42f532 CC-5651: Unit Test the Scheduler
Moved test data outside of services
2014-01-24 16:08:38 -05:00
drigato e0650fb840 CC-5651: Unit Test the Scheduler
Overlapping show tests
2014-01-24 15:14:31 -05:00
drigato 2076b3c069 CC-5651: Unit Test the Scheduler
Add logging class to bootstrap
2014-01-24 11:39:15 -05:00
drigato c04d8714bb Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests 2014-01-23 17:06:34 -05:00
drigato ca09ad2896 CC-5593: Overlapping Show Bug
Added tests for checking if shows overlap
2014-01-23 17:06:27 -05:00
Albert Santoni ab96e1e0b2 CC-5651: Unit Test the Scheduler
* Temporarily disabling the one Preferences unit test that's failed
  until I fix it.
2014-01-23 17:06:13 -05:00
Albert Santoni 162a873f9d CC-5651: Unit Test the Scheduler
* Continued refactoring of the database creation.
* Database now persists after running tests but most of the tables are
  cleared.
* The unit tests run WAY faster now. :-)
2014-01-23 17:04:29 -05:00
Albert Santoni aa2e084a09 Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests 2014-01-23 13:10:41 -05:00
Albert Santoni 5d2aae4525 Updated readme for unit testing 2014-01-23 12:51:53 -05:00
drigato fc4dfd5cb0 CC-5651: Unit Test the Scheduler
Moved common database setup functions to helper class
2014-01-23 11:37:20 -05:00
Albert Santoni 52c3971fc6 Fixed a bug in Application_Model_SetShowsPopulatedUntil 2014-01-22 17:58:25 -05:00
Albert Santoni 3826a88d1f Disable code coverage report because autoloader is not working 2014-01-22 17:00:23 -05:00
Naomi 3ec0d1db8e CC-5450 : Refactor Media Management (Classes/DB) in Airtime
fixing scheduling for webstreams.
2014-01-22 16:27:41 -05:00