Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,986 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

657 Commits

Author SHA1 Message Date
Albert Santoni 01fc9e6ffc Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-26 19:11:47 -04:00
drigato 9eb0f2f3b3 CC-5859: Airtime Analyzer: format fields before writing to db 2014-05-26 17:13:45 -04:00
Albert Santoni ed78625fce Merge branch '2.5.x' into 2.5.x-saas 2014-01-27 12:01:11 -05:00
drigato 2cdad4932a CC-5660: Unable to create shows with a rebroadcast 
Used wrong formating for minutes
 2014-01-06 14:04:18 -05:00
drigato 11284d0d41 CC-5660: Unable to create shows with a rebroadcast 
Two variables that are needed for the rebroadcast validation were deleted
before the 2.5.1 release. Just had to add them back in.
 2014-01-06 13:51:06 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
Albert Santoni 15370702a4 Use the user timezone, not the station timezone in the Add Show form (by 
default)

* Fixes really annoying problem where you click on the calendar, and it
  adds your show in the wrong spot.
 2013-12-13 18:27:36 -05:00
drigato e8a8aeaf00 CC-5636: Php 5.5: Cannot update repeating show's name if that instance is updated 
Made all show fields readonly when editing a repeating instance
 2013-12-13 12:13:58 -05:00
Naomi e6c971387b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 17:35:47 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
Albert Santoni 4d77d14d33 CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Removed strtotime usage from AddShowRepeats.php
 2013-12-11 15:54:13 -05:00
Naomi c732b44903 CC-5594 : Remove all date_default_timezone_get() 
must allow 24 hours, but nothing greater to match old usage.
 2013-12-05 13:11:36 -05:00
Naomi eb4cefa3ff CC-5594 : Remove all date_default_timezone_get() 
DateTime here was relying on a timezone that wasn't what the user selects in the timezone drop down on the form.
 2013-12-05 13:04:02 -05:00
drigato 6ea0cb5918 CC-5571: Overlapping show check in wrong sometimes 
The incorrect number of days we're getting added to create repeat instances
because we were checking the start week day in UTC instead of local time
 2013-11-22 10:51:16 -05:00
denise 4abdbfae1f CC-5401: Stream settings -> Can't save show source info 
Typo in sprintf formatting
 2013-10-11 13:22:02 -04:00
denise c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime 
Conflicts:
	airtime_mvc/application/services/ShowService.php
 2013-10-08 11:16:25 -04:00
denise 55254e88a5 UI text improvements for setting the station/user timezones 
Added info icon in the add-show form for timezone setting
 2013-10-07 14:49:52 -04:00
drigato 37a0c271f6 CC-5359: Update show fails sometimes with overlapping check 
Some DateTime objects were not getting created in correct timezone
Used format() to get the day of week value instead of getTimestamp()
getTimestamp() sometimes returns the wrong value
 2013-10-03 18:02:15 -04:00
denise 1e59ab836d CC-5277: Selecting weekly repeat without selecting days fails silently 
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
 2013-10-01 14:19:02 -04:00
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi 0dd5458269 Merge branch '2.5.x' into CC-5293-calendar-pref 2013-09-30 13:57:23 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream 
adding the webstream metadata to the history table.
 2013-09-30 13:56:27 -04:00
Albert Santoni 11ae76beb8 Fix SAAS-349 by preventing password changes in demo mode. 
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
 2013-09-26 16:23:22 -04:00
Albert Santoni 28a032388b Start of bugfixing for SAAS-349. 
* Also identity verification for erry on Freenode.
 2013-09-26 15:18:41 -04:00
denise 2114383519 CC-5323: User's Timezone Can Improperly Edit Show 
-overlapping show check was using the user's local timezone to compare new
 shows instead of the show's timezone
 2013-09-25 16:22:30 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Jamie Connor f7f2cdc51c Follow up changes relating to adding in new show repeat options 2013-09-07 14:54:03 +12:00
Jamie Connor 03f383f764 added more options for show repeats 2013-09-03 12:25:22 +12:00
Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi Aro 9c0bee3877 adding show instance to the create form if it's already set. 2013-08-31 23:34:37 -04:00
Naomi d50cdd16c2 starting association of a show instance. 2013-08-29 17:40:08 -04:00
Naomi Aro 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
Naomi b65007868a crlf fix 2013-08-12 15:08:09 -04:00
Naomi d83c004fb9 subclassing the template types, files summary table is now fully configurable form wise. 2013-08-12 15:06:26 -04:00
Naomi 27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi aaf2e5c2f6 better casting on form checkbox, setting populate flag properly based on if id is set (for create/update) 2013-08-05 15:05:26 -04:00
Naomi 31c604d09c can update an existing history item entry. Form is pre-populated. 2013-08-02 18:16:23 -04:00
Naomi 7ca3048f36 can add a new list item using the template. 
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
 2013-07-30 19:24:05 -04:00
Naomi Aro 7183396da5 needed to update jquery, fullcalendar needed updating for the new JS. 
working on configuring a template.
 2013-07-29 08:57:31 -04:00
Naomi 46ecdf393d dynamic form rendering for template 
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
 2013-07-26 17:33:17 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro 19ba788bae CLRF 2013-07-22 10:47:11 -04:00
Naomi Aro 634eb40a0c creating an entry. 2013-07-22 10:45:39 -04:00
Naomi Aro ec44b81f6a clrf 2013-07-18 01:37:39 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi c744d88f23 IM-784 : Create Editing Abilities For History 2013-07-08 18:00:02 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
 2013-06-26 01:25:26 -04:00
Naomi Aro 6b0ab535e5 CC-5244 : Exception when creating Smartblock 2013-06-20 14:03:13 -04:00
Naomi 440163f199 CC-5225 : Library: Fail to open Metadata Editor 2013-06-12 13:05:58 -04:00
Martin Konecny 6498f43dad CC-5211: 
Php Exception: Set large number as year in tracks Metadata

fixed
 2013-06-06 17:02:01 -04:00
Martin Konecny 254d3b8950 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 16:09:02 -04:00
Daniel James 2e970bfc8a Fixes date format in Smart Block tooltip (CC-5618) 2013-05-22 10:25:43 +01:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
Naomi 435bb83588 CC-2301 : dos2unix being run 2013-05-02 16:52:30 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Naomi 58957cc919 CC-2301 : running dos2unix on 3 files. 2013-04-29 17:01:08 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -04:00
denise 327d0dd6c9 CC-4961: Show linking 
Add front-end for creating a show with monthly repeats on same day of week
 2013-03-22 15:57:15 -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 7347be35b1 Created a new service for show days 
Created a new user service
Started refactoring edit show action
 2013-03-11 16:18:40 -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
Martin Konecny 3f7ccf6967 fix missing closing parentheses 2013-03-04 11:41:42 -05:00
Martin Konecny 8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
denise c8d7d23d62 CC-4963: Add cue in and cue out to smart block criteria list 
Done
 2013-02-19 16:38:58 -05:00
denise ad334d9e74 CC-4926: System-> Preference: Please limit the default fade value less than 60 
- added a range validator of 0 - 59.9 on default fade
 2013-02-06 15:44:52 -05:00
Martin Konecny 7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -05:00
denise 0cf8526f87 CC-4878"Send support feedback" button at initial login tries to load "http://showbuilder" and was missing the local host IP. 
-fixed
 2013-01-25 11:51:56 -05:00
Martin Konecny 784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
Martin Konecny 9d8c9149fd remove code that will never be executed on SaaS branch 2013-01-16 14:06:04 -05:00
Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2013-01-14 16:19:51 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
denise 7b4693e5f9 CC-4831: I18N: Error message of background settings when creating a show is not translated 
-fixed
 2013-01-14 14:13:32 -05:00
denise f067b952db CC-4829: Password Verify does not work on Lucid 
-code cleanup
 2013-01-14 12:17:33 -05:00
denise 83a450565e CC-4829: Password Verify does not work on Lucid 
-fixed
 2013-01-14 12:07:17 -05:00
Martin Konecny 89274e43b3 fix spelling mistake 2013-01-11 13:17:08 -05:00
denise a129b0b081 CC-4472: User password verify or clear text display. 
-done with password verify
 2013-01-10 17:51:25 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
denise dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -05:00
denise 2797809c74 CC-4786: Refresh page when language setting changes 
-done
 2013-01-10 13:55:52 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise 1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
denise f308305df8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:18:59 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting 
-fixed
 2013-01-07 18:18:40 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
Daniel James 771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00:00
Daniel James a2c1b9c699 Clarify label on default interface language preference 2013-01-07 11:05:38 +00:00
Daniel James 053418d7ac Added missing colon to the end of 'Language' 2013-01-07 10:42:16 +00:00
James 63c847080f CC-4732: Ask for admin username + password in Stream Settings page 
- CRLF
 2013-01-03 18:02:19 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
denise 7ea649e063 CC-4783: Username on the edit user form should be readonly 
-done
 2013-01-03 16:27:05 -05:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
james cf38e2c596 CC-4754: Replay gain modifier 
- done
 2012-12-27 22:58:41 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise adae81bffa CC-4747: Add User page -> Typo on form labels 2012-12-17 16:53:18 -05:00
denise bd18039785 CC-4744: Edit user form needs styling 
-done
 2012-12-17 14:12:27 -05:00
denise f12547dfb4 CC-4736: Let non-admin users update their user info 
new form
 2012-12-10 16:56:25 -05:00
denise adb966a734 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-cancel button does not reload the page anymore
 2012-12-05 13:21:18 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-done
 2012-12-05 13:16:25 -05:00
Martin Konecny 3086bde17e -cleanup parsing for form elements that weren't provided by the client in our SaaS implementation 2012-12-04 16:22:03 -05:00
denise 844246df3a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 15:30:56 -05:00
denise ab55bb73bb CC-4683: System -> Preference: Save button is old style 
-support feedback form also had old button style
 2012-12-03 14:51:21 -05:00
denise 2f0c6b702a CC-1960: Internationalize Airtime / Support translations 
- created locale table
- create locale model
- set default locale in pref table
 2012-11-29 18:21:03 -05:00
Martin Konecny 858f03c9ad -remove rebroadcast code 2012-11-29 15:58:29 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
Martin Konecny 4983721565 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/forms/LiveStreamingPreferences.php
 2012-11-28 16:10:33 -05:00
denise 9689c75bed CC-1960: Internationalize Airtime / Support translations 
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
 2012-11-28 11:54:22 -05:00
denise e475c2e99e CC-1960: Internationalize Airtime / Support translations 
-overwrote zend from stringLength validator
 2012-11-27 17:28:27 -05:00
denise 9acfb6c181 CC-1960: Internationalize Airtime / Support translations 
- overwrote default zend form error messages
 2012-11-27 17:11:29 -05:00
denise 42d535a922 CC-1960: Internationalize Airtime / Support translations 
-unlocalized some strings
 2012-11-27 12:33:43 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations 
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
 2012-11-23 16:39:41 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
 2012-11-22 17:32:24 -05:00
denise 7a9f01458c CC-1960: Internationalize Airtime / Support translations 
-fixed langauge label on preferences page
 2012-11-21 12:46:52 -05:00
denise 25ddd083bc CC-1960: Internationalize Airtime / Support translations 
-added language option in preferences
 2012-11-21 12:44:50 -05:00
denise e5f67c8b05 CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper functions for all strings in view/scripts, and forms
 2012-11-20 11:33:37 -05:00
denise 33e4d6154d CC-4693: Preferences: Bottom save button is not aligned 
-fixed
 2012-11-12 14:43:44 -05:00
denise a727f2bb1e CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on 
-fixed
 2012-11-12 14:28:50 -05:00
Martin Konecny 4b09b289ce SAAS-290: Hosted SaaS widgets + javascript code generation 
Slight improvements to description as well as element
positioning
 2012-11-07 15:44:22 -05:00
Martin Konecny 1b0b124247 SAAS-290: Hosted SaaS widgets + javascript code generation 
-working code
 2012-11-07 12:49:17 -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
Martin Konecny 27d40ef4df SAAS-290: Hosted SaaS widgets + javascript code generation 2012-11-06 18:10:53 -05:00
Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
 2012-11-06 17:23:32 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
Martin Konecny 38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
Martin Konecny 3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
denise 41cb6b2b0b Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-11-05 17:08:49 -05:00
denise 3b58ee1f48 CC-4651: Apache log errors part 1 
-fixed
-saas doesn't have rebroadcast shows so we don't need to check if they overlap
 2012-11-05 17:08:41 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
Martin Konecny 9609a4e220 Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 20:16:54 -04:00
denise 796274e4ef CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths 
-fixed
 2012-11-02 15:51:36 -04:00
James 1899d588ee - CRLF fix 2012-10-30 18:03:03 -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
Rudi Grinberg dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
denise 3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page 
-done
 2012-10-26 18:09:30 -04:00
denise 0ab1353564 CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on 
-fixed
 2012-10-26 18:00:48 -04:00
James b8d6132b52 - saas patch #1 2012-10-23 18:47:15 -04:00
denise 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
James 3ecde35b7c Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 14:28:14 -04:00
James 1146e1f269 CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00 
- fixed
 2012-10-19 14:27:57 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
denise a51c3174e0 SAAS-282: Overlap detection prevents creation of a repeating show 
-fixed
 2012-10-19 12:33:12 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
denise 887a86c6a1 CC-4591: Calendar: Cannot change start time for repeating show 
-fixed
 2012-10-18 10:51:24 -04:00
James 45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00
denise 25c28da761 CC-4550: Track should not be a required field in metadata editor 
-fixed
 2012-10-16 15:29:05 -04:00
denise 846af50543 CC-4567: Calendar: Exception in zendphp.log when setting a wrong rebroadcast time from repeating show 
-fixed
 2012-10-16 14:33:45 -04:00
denise 5ff89eeba2 CC-4561: Can create overlapping shows when rebroadcasting a repeating show 
-fixed
 2012-10-15 14:19:52 -04:00
denise b79e190d3c -small comment change 2012-10-12 15:42:51 -04:00
denise e60a23aab4 CC-4555: Can create overlapping shows with a repeating show if another show is on the last repeating day 
-fixed
 2012-10-12 15:34:42 -04:00
denise 8f5830757f CC-4553: Calendar: Can create overlapping show by repeat show's instances 
-fixed
 2012-10-12 14:26:54 -04:00
denise 2fbd8e868b CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error" 
-fixed
 2012-10-10 14:22:09 -04:00
denise 317bb7de69 CC-4479: Buttons in dialog windows are not styled 
-done
 2012-10-03 11:40:40 -04:00
denise 0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
Martin Konecny e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-initial commit
 2012-09-14 12:09:40 -04:00
Rudi Grinberg 55993352bf Removed unused variables. 2012-09-13 10:35:24 -04:00
denise 9c8f4fe404 CC-4414: Unused local variables in forms 
-done
 2012-09-12 17:09:00 -04:00
denise 54d18b7bcd CC-4382: Editing the color of a repeating show gives error message 
-fixed
 2012-09-12 14:27:17 -04:00
denise 58d39d74d4 CC-4355: Smart block criteria do not match library columns or metadata editor 
-fixed
 2012-09-11 17:18:17 -04:00
Martin Konecny 7f8b5ab92e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 17:40:07 -04:00
Martin Konecny 859445c766 CC-3301: Add ability to switch stereo/mono stream in stream settings 
-fixed
 2012-08-29 17:39:24 -04:00
denise a7427645d5 CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception 
-fixed
 2012-08-29 17:01:55 -04:00
Rudi Grinberg 5e180f0ce2 sexified code 2012-08-29 12:57:56 -04:00
Rudi Grinberg ca66073fb5 did some reformatting. 2012-08-29 12:31:59 -04:00
Martin Konecny b2327472e8 CC-4090: Make code style PSR compliant - part 4 
-forms directory
 2012-08-28 23:04:55 -04:00
denise 9d90e8c531 CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication 
-done
 2012-08-28 16:17:37 -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
denise dc8e3da6db CC-4283: Password Reset: Please let user input username they want to reset 
-done
 2012-08-24 12:40:30 -04:00
denise 7e50a11195 CC-4225: Smart playlists: Sample and bit rate ranges should include entered values 
-fixed
 2012-08-22 16:01:50 -04:00
denise 025656be1c CC-4205: Smart Playlist Builder: Change text on button mouseovers 
-changed generate success msg
 2012-08-21 10:46:25 -04:00
James a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc 
- done
 2012-08-20 17:17:48 -04:00
denise 76833344d6 CC-4250: Smart Playlists: Remove save button from form 
-done
 2012-08-17 16:24:11 -04:00
James 2d80131351 CC-4229: Smart Playlist: refactor code 
- bug fixes
 2012-08-15 16:22:56 -04:00
James 9fc5411895 CC-4229: Smart Playlist: refactor code 
- done
 2012-08-15 11:36:41 -04:00
denise c62d89d5da CC-4220: Smart Playlists: Change indexing of criteria elements 
-changed indexing on UI
 2012-08-14 10:02:36 -04:00
James 1e36d77857 CC-4213: Smart Playlist -> Criteria Bpm: Cannot find track by 'is in the range' 
- changed BPM to string type
 2012-08-13 11:51:25 -04:00
denise 5e1d8eabb3 Smart Playlists: moved Save button from right side to left side 2012-08-10 12:34:45 -04:00
denise 7d73f0996c CC-4205: Smart Playlist Builder: Change text on button mouseovers 
-done
 2012-08-10 10:54:13 -04:00
denise 791989faf7 Smart Playlists: changed label 'block' to 'playlist' type 2012-08-08 15:35:28 -04:00
James fd1628f971 CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect 
- removing radio_station_name from criteria list
 2012-08-08 12:01:10 -04:00
denise 9479aeb3dd CC-84: Smart Playlists 
- fixed db column mapping for radio station name and track title
 2012-08-01 17:10:56 -04:00
James 27017c7903 CC-84: Smart Playlists 
- fixed getCriteria() to non static function
 2012-07-30 18:21:27 -04:00
denise f91be9468f CC-84: Smart Playlists 
-UI cleanup
 2012-07-30 16:42:37 -04:00
denise e04273c335 CC-84: Smart Playlists 
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
 2012-07-29 15:47:42 -04:00
denise d7cf50b2f4 CC-84: Smart Playlists 
- changed error handling and criteria saving to handle same criteria rows
 2012-07-27 14:32:31 -04:00
James 1f3cbd8aba CC-84: Smart Playlists 
- introducing smart-block
 2012-07-25 12:44:37 -04:00
denise 722e470f6f CC-84: Smart Playlists 
- changed playlist controller to also handle Blocks
- created new view for smart blocks
 2012-07-25 11:00:46 -04:00
denise 754187a2b7 CC-84: Smart Playlists 
- remove subform and combined back into one form
 2012-07-24 12:13:51 -04:00
denise c82ea30809 CC-84: Smart Playlists 
- removed criteria subform and reverted back to original criteria options design
 2012-07-24 12:12:47 -04:00
denise 64185dac95 CC-84: Smart Playlists 
- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
 2012-07-23 12:42:00 -04:00
denise 952a584f10 CC-84: Smart Playlists 
- form cleanup
 2012-07-23 10:45:17 -04:00
denise c99e1b892c CC-84: Smart Playlists 
-divided criteria into sub form to handle multiple sets
 2012-07-23 10:40:53 -04:00
denise a67b2fa300 CC-84: Smart Playlists 
- removed soundcloud_id criteria
- added last_played criteria
 2012-07-20 11:25:54 -04:00
denise 9fcc851523 CC-84: Smart Playlists 
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
 2012-07-19 14:52:39 -04:00
denise 2d8a9188eb CC-84: Smart Playlists 
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
 2012-07-18 15:48:15 -04:00
denise 7c5291fe0c CC-84: Smart Playlists 
- ui cleanup
 2012-07-18 11:55:29 -04:00
James 2a38527161 CC-84: Smart Playlists 
- propel usage chage
- cleaning up code
- some js changes
 2012-07-18 11:52:09 -04:00
denise 0aae7c75ae CC-84: Smart Playlists 
- added shuffle button
- moved all callbacks into one function
 2012-07-17 15:32:26 -04:00
James 7c07bf146c Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-17 11:07:38 -04:00
James a4ba776b0f CC-84: Smart Playlists 
- save playlist type to db
- on edit type is loaded
 2012-07-17 11:07:16 -04:00
denise e0a674a96c CC-84: Smart Playlists 
-added save button for static playlists
 2012-07-16 18:24:46 -04:00
denise 1bb97c8603 CC-84: Smart Playlists 
- ui clean-up
 2012-07-16 14:44:50 -04:00
denise 2dae5f30f7 CC-84: Smart Playlists 
- code cleanup
- adds 'Add' button to last row, always
 2012-07-16 11:01:34 -04:00
James ae9442d7f5 CC-84: Smart Playlists 
- editing playlist
 2012-07-13 15:58:23 -04:00
James 207582eb7e CC-84: Smart Playlists 
- temp commit
 2012-07-13 14:23:30 -04:00
denise d81253cccc CC-84: Smart Playlists 
- send playlist id on generate/save action
- fixed some small UI bugs
 2012-07-12 17:19:53 -04:00
denise 31bb07b4f0 CC-84: Smart Playlists 
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
  for 'is in the range' modifier
- moved 'add' button to last row
 2012-07-12 13:02:02 -04:00
denise e8a2f23856 CC-84: Smart Playlists 
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
 2012-07-11 18:53:28 -04:00
denise c27b886817 CC-84: Smart Playlists 
-0-indexed form elements
 2012-07-11 16:15:44 -04:00
denise 4842f1a5a1 CC-84: Smart Playlists 
-removed limit checkbox
 2012-07-11 15:52:46 -04:00
denise 7358b00c81 CC-84: Smart Playlists 
-disabled non-visible form elements
 2012-07-11 15:18:47 -04:00
denise 5fb0364f2d CC-84: Smart Playlists 
-switched action names for static/dynamic
 2012-07-11 11:57:13 -04:00
denise fe75ba0e93 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 11:50:52 -04:00
denise 1afe1e4d32 CC-84: Smart Playlists 
-added in save/generate functionality in the UI
 2012-07-11 11:50:40 -04:00
denise a1ceb4bfa0 CC-84: Smart Playlists 
-added in 'Add' and 'Remove' form elements functionality on the UI
 2012-07-11 10:42:51 -04:00
denise b7cd90bc28 CC-84: Smart Playlists 
-created form and view script
 2012-07-11 10:42:51 -04:00
Martin Konecny 7ce4934cdc CC-4090: Make code style PSR compliant 
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
 2012-07-10 18:55:44 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant 
-User.php
-removed all trailing whitespace
 2012-07-10 18:51:32 -04:00
denise 4301a221b7 CC-84: Smart Playlists 
-added in 'Add' and 'Remove' form elements functionality on the UI
 2012-07-10 18:20:23 -04:00
denise 72dd48e33e CC-84: Smart Playlists 
-created form and view script
 2012-07-10 15:25:29 -04:00
Martin Konecny 3d243468a7 CC-4090: Make code style PSR compliant 
Subjects.php
 2012-07-10 10:36:53 -04:00
Martin Konecny dc2b4fed0a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-10 10:19:35 -04:00
Martin Konecny e91c96b90e CC-4090: Make code style PSR compliant 
StreamSetting.php
 2012-07-09 23:32:21 -04:00
denise c6c0a70152 CC-4075: Calendar -> Can create overlapping show by repeating show 
-fixed
 2012-07-09 14:50:35 -04:00
denise 1cbb0345b3 improved error message for overlapping shows 2012-07-05 11:33:03 -04:00
denise 1fa3da5bd0 CC-4069: Edit Show -> cannot edit show 
-fixed
 2012-07-04 18:58:22 -04:00
denise cbf026412c CC-4056: Add Show -> Prevent shows from overlapping 
-done
 2012-07-04 11:34:18 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2012-06-29 10:57:14 -04:00
James c669d3cb47 CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page 
without possibility to navigate back gracefully

- done
 2012-06-20 18:02:46 -04:00
denise b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
James 81fb7699a4 CC-3985: Email field on User creation should be required. 
- done
 2012-06-14 16:11:14 -04:00
James 73a7a76078 Merge branch 'CC-3963' into 2.1.x 
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
 2012-06-14 16:06:53 -04:00
denise 6b990f8712 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel 2012-06-14 13:45:14 -04:00
denise 9cabd4d32c CC-3921: Add mobile phone number field to user record 
-done
 2012-06-13 13:39:54 -04:00
James 4077858c8e CC-3927: Should automatically switch back to Master/Show stream if there 
is a connection interruption

- chaning label and description text
 2012-06-13 12:46:26 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined 
-done
 2012-06-12 17:08:36 -04:00
denise 8b2353ede0 Merge branch '2.1.x' into devel 2012-06-12 15:49:18 -04:00
James 57397312f2 CC-3963: If DJ is scheduled to broadcast for show, then automatically 
enable source when DJ connects.

- done
 2012-06-12 15:38:03 -04:00
denise b588b3b9a4 CC-3849: PlaylistLibrary->Edit Metadata: The deletion of metadata entries has no effect after saving 
-set track_number as a required field on form
 2012-06-12 14:40:18 -04:00
denise d66ba4074c Merge branch '2.1.x' into devel 2012-06-11 18:11:09 -04:00
denise 81c7eb7763 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked 
-fixed
 2012-06-11 18:08:36 -04:00
denise ca8187c9c2 CC-3718: Please enable user to input the mail server settings 
-done
 2012-06-11 12:53:09 -04:00
denise b586d69d09 CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show. 
-fixed
 2012-06-08 11:39:04 -04:00
James fb48184629 CC-3875: Dashboard: User shouldn't be able to set currently playing shows end time in the past 
- fixed
 2012-06-07 12:25:21 -04:00
James 3c7f3d52e1 CC-3864: Calendar -> Edit show: Can edit the start time of current playing show 
- bug fix. In case of this error, we should maintain the original start time.
 2012-06-07 12:14:22 -04:00
James 2bf6408d90 CC-3864: Calendar -> Edit show: Can edit the start time of current playing show 
- fixed
 2012-06-06 18:23:27 -04:00