Commit Graph

109 Commits

Author SHA1 Message Date
Martin Konecny 4ed7c4ccd3 fix errors reported by Facebook's scheck 2013-05-28 17:30:48 -04:00
denise 9545d8aacb Removed dropping and recreating cc_schedule table index before inserting into this table.
We thought it would be a significant performance booster but it isn't
2013-05-28 16:19:17 -04:00
denise 85ee8aa0b2 Fixed bug where schedule start times were not getting calculated properly 2013-05-28 11:25:37 -04:00
denise 90ad62e4f9 CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
Refactoring schedule inserts
2013-05-27 15:34:54 -04:00
denise cee74b59f9 CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
Calculate crossfades during insert instead of after
2013-05-27 10:39:31 -04:00
Martin Konecny f23fc472ef Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-24 17:01:15 -04:00
Martin Konecny daa310ac18 CC-5175:
Now Playing: SQL syntax error happens when removing and add contents to current show.

-fixed
2013-05-23 18:37:30 -04:00
denise e104146b9a CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
Removed propel from calculateCrossfades function and used prepared statements instead
2013-05-23 16:10:00 -04:00
denise 0107f36206 Changed propel to prepared statements 2013-05-23 12:49:15 -04:00
denise 792366e1f5 CC-5100: Now Playing: Editing schedule on-the-fly will cause 2 tracks mixed at the same time. 2013-05-23 11:35:56 -04:00
denise 491ea6a32c CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
Made some small optimizations. Still needs more work.
2013-05-15 15:32:29 -04:00
Martin Konecny 6e0a3ffc60 CC-5102:
Cross Fading: No cross fading effect

-fixed start/end calculations
2013-05-10 15:24:43 -04:00
denise 92f6ec029f CC-5079: Timeline -> Moving items in linked shows doesn't work 2013-05-07 14:49:24 -04:00
Naomi 435bb83588 CC-2301 : dos2unix being run 2013-05-02 16:52:30 -04:00
Naomi 3e320f1e2e Merge branch 'master' into CC-2301 2013-05-02 16:15:58 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
denise 5ba5864d8c CC-5078: Wrong start time if dragging dynamic smart block into a show 2013-05-01 11:29:32 -04:00
denise 4ca60ca676 CC-5074: Editing a linked instance sets incorrect schedule start times 2013-04-30 13:58:03 -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
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
denise a5264aac1e CC-4961: Show linking 2013-04-26 16:10:01 -04:00
denise 52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -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 1a2a05c3cf CC-4961: Show linking 2013-04-12 16:34:36 -04:00
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -04:00
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise 2c1fa283da CC-4941: Dynamic Smart Block ignores the silan check
-fixed for playlists that contain dynamic blocks
2013-02-11 14:17:18 -05:00
denise 51ade73e85 CC-4941: Dynamic Smart Block ignores the silan check
-fixed
2013-02-11 13:45:51 -05:00
denise 8e82db1bc7 CC-4921: Now Playing: Cannot insert items into current playing show
-filler time in cc_schedule was not setting cue_in and cue_out
-since we made those colunns not null and removed a default value, we always have to set a value
2013-02-05 17:57:21 -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 8309593a0f CC-4904: Library -> Sort by status doesn't work
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
denise f1215c10fd CC-4882: Scheduled item does not take into account cue_out - cue_in time
-fixed
2013-01-28 14:21:11 -05:00
denise ad0879996d CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
-use existing function to convert seconds to time format
2013-01-18 14:35:17 -05:00
denise 22ecc3f1fc CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
-fixed
2013-01-18 14:28:45 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks
- done
2013-01-03 14:02:06 -05:00
denise a76b9b305f CC-1960: Internationalize Airtime / Support translations
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
denise b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
James 504d9968f1 CC-4639:
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit

- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
2012-11-06 16:32:00 -05:00
Rudi Grinberg 1c628bd831 renamed displayable to visible 2012-11-05 10:57:18 -05:00
Rudi Grinberg 6e89fdab30 changed file existence checks to displayable 2012-11-05 10:14:49 -05:00
denise ba1f6ed054 CC-4374: Nowplayling page: Cannot remove tracks from recording show
-fixed by disallowing dragging into recording shows
2012-11-02 13:24:47 -04:00
James f14320a769 CC-4603: Dynamic Smart Blocks: adding to multiple shows at once generates the same content
- fixed
2012-10-26 17:15:39 -04:00
James eecc90547d CC-4461: Now Playing: Timeline does not reflect the changes on Show start time (which is changed from Calendar->Edit Show)
- fixed
2012-09-18 15:47:37 -04:00
denise 3b43efefe0 CC-4413: Unused local variables in models.
-done
2012-09-12 17:26:41 -04:00
Martin Konecny c043053407 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
-fixed
2012-08-31 12:18:37 -04:00
Martin Konecny 79b6d13c16 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
-set DbEnds to 1 second in the past when cancelling stream
2012-08-30 17:53:28 -04:00
Martin Konecny 1884bebf15 CC-4281: Webstream: Nothing appears in the timeline if dr...
-fixed
2012-08-30 14:36:23 -04:00
Martin Konecny 4848717d4d CC-4090: Make code style PSR compliant - part 4
-models dir
2012-08-29 10:58:03 -04:00