Commit Graph

148 Commits

Author SHA1 Message Date
Robb Ebright 927fcbc42d Pluralized file criteria, cleaned up CSS and removed dead code 2018-01-03 18:57:02 -05:00
Robb Ebright 91906e5b5d Moved files that meet criteria to top of track listing 2017-11-26 14:48:41 -05:00
Lucas Bickel 4875bc37a8 Add missing argument to playlistNotFound call
Was on 2.5.x as 7dbf4cf5d2d37057e1f5ab72cb12ffcc5ddc1ccb
2017-03-03 15:34:21 +01:00
Duncan Sommerville c5a5839eff Better errors from podcast 'Add' dialog 2015-11-10 19:26:25 -05:00
Duncan Sommerville 12f6536e74 Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-10-19 16:18:19 -04:00
Albert Santoni 8b33acacd3 Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/UserController.php
	airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
Albert Santoni 8b6833180d Refactored double Set-Cookie prevention code, and session reopening code 2015-09-25 12:03:10 -04:00
Duncan Sommerville 4238d5a201 Refactor tabs functionality 2015-09-22 15:27:08 -04:00
Albert Santoni f05157c376 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-09-02 15:07:31 -04:00
Albert Santoni 6046f8843b CC-6129: Static smart block errors don't appear 2015-09-02 15:07:17 -04:00
Duncan Sommerville 8d0cfdc202 Fix empty-name playlist bug 2015-09-02 13:58:38 -04:00
drigato b312189a7b CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own 2015-08-28 17:46:03 -04:00
Albert Santoni b6f33f6083 Completed smart block, playlist, and webstream editor form overhauls
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
  playlist contents back rather than the entire HTML fragment for the
  editor.
* Keep more of the playlist/smartblock editor view persistent across
  saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
Duncan Sommerville 3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
Albert Santoni 1194a0f959 Some big performance optimizations to Now Playing JavaScript.
* Big decrease in page load time
* Big decrease in load time during schedule operations (drag and drop)
2015-04-10 22:53:39 -04:00
Duncan Sommerville f6bf2f8cc5 Changed tabs to spaces 2014-11-07 12:05:29 -05:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly
Conflicts:
	airtime_mvc/application/models/Playlist.php
2013-05-23 13:01:38 -04:00
Naomi d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -04:00
denise 04ed640756 CC-3885: Deleted open playlist is not closed until a new item is added to it
-fixed
2013-02-13 15:44:52 -05:00
denise 525b2dcb33 CC-4895: Remove all json die() statements from code
- removed json_encode
2013-02-07 15:41:47 -05:00
denise 384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
denise d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -05:00
denise 5adadc2e91 CC-1960: Internationalize Airtime / Support translations
- added gettext wrapper function to all strings in controllers
2012-11-20 11:33:37 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists
- done
2012-11-13 17:32:10 -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
james 9293a26738 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
tracks meet the time limit

- code optimazation
2012-10-31 12:05:17 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
- done
2012-10-30 17:57:58 -04:00
denise c95050c04c CC-4546: Library->Context view for playlist: It only displays "..." instead of Static smart block's name
-fixed
2012-10-10 15:06:30 -04:00
Rudi Grinberg e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
Rudi Grinberg d409af2876 shortened logging 2012-09-13 11:07:29 -04:00
Rudi Grinberg dced49c425 Removed unused variable 2012-09-13 10:52:58 -04:00
denise e1403d45bd CC-4368: Unused local variables in Airtime Controllers. Should be removed.
-done
2012-09-13 10:32:33 -04:00
denise 33fe2f3467 CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while
-fixed
2012-09-06 14:10:50 -04:00
denise 8d1003bbbe CC-4303: Library Tab grays out after certain scenario with normal playlist
-fixed
2012-09-06 11:48:00 -04:00
denise 15f750eca5 CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
-included webstreams in the allowance type list in the error message
2012-09-04 11:29:23 -04:00
denise 80258f1fb7 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed for dragging tracks into deleted blocks
2012-08-29 16:13:18 -04:00
denise 7c79aad5f4 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-removed unnecessary exception catch
2012-08-29 16:04:40 -04:00
denise fe48780932 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed
2012-08-29 16:00:58 -04:00
denise 46a6a5fc30 CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
-added in saving behaviour for regular playlists
2012-08-29 12:05:41 -04:00
denise 5effb253bf CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
-done
2012-08-29 11:38:47 -04:00
Martin Konecny 699a49a103 CC-4090: Make code style PSR compliant - part 4
-controllers dir
2012-08-29 10:54:36 -04:00
denise 69b61c4cfe CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified
-fixed
2012-08-28 12:13:58 -04:00
Martin Konecny 24988616b3 CC-1665: Scheduled stream rebroadcasting and recording
-current Library session object should not be stored as a property of the Controller class.
-fixed
2012-08-22 14:03:11 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Martin Konecny 15eae0698b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:55:17 -04:00
Martin Konecny a1b91aebbd CC-1665: Scheduled stream rebroadcasting and recording
-use sessions to determine currently open object in Library
2012-08-21 16:54:14 -04:00
denise 2cdaa186e3 CC-4257: Smart Block: Admin cannot delete DJ user's block
-fixed
2012-08-21 15:42:44 -04:00