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

439 Commits

Author SHA1 Message Date
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
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
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 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 fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -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
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
James e35692e588 CC-3939: Media Library -> Edit Metadata: click 'Cancel' will keep in editing 
page after error message appears

- fixed
 2012-06-06 16:28:41 -04:00
denise 532b2710f0 CC-3932: Master/Source Source Connection URL should be in non-editable box 
-done
 2012-06-06 13:10:57 -04:00
denise 226ef262ba CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show. 
-retreived hours and minutes via preg_match()
 2012-06-06 10:31:49 -04:00
James b23e3d0a54 CC-3927: Should automatically switch back to Master/Show stream if there is a 
connection interruption

- done
 2012-06-05 16:41:41 -04:00
denise 4bcf904f92 CC-3932: Master/Source Source Connection URL should be in non-editable box 
-done
 2012-06-05 15:13:04 -04:00
denise 8b71ed6078 CC-3850: Use qTip instead of custom tooltips 
-removed description from cb_airtime_auth and cb_custom_auth
-description is no longer needed since we use qtips
 2012-06-05 14:49:31 -04:00
denise 35be145043 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-05 14:41:19 -04:00
denise df3a74b501 CC-3850: Use qTip instead of custom tooltips 
-removed description from icecast_vorbis_metadata element
 2012-06-05 14:40:40 -04:00
James 51227b4cad CC-3934: Master and Show stream override need to be disabled on airtime-demo 
- done
 2012-06-05 12:18:59 -04:00
denise a3754be31a CC-3850: Use qTip instead of custom tooltips 
-done
 2012-06-05 11:24:40 -04:00
denise 19d5655779 CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show. 
-fixed to only allow 24h or less
 2012-06-05 11:19:59 -04:00
denise f23582612a SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance 
-fixed
 2012-05-28 15:41:59 -04:00
Naomi Aro 428b13f3d7 CC-3803 : Don't allow editing of a current Record show 2012-05-22 17:51:53 +02:00
denise d0211aaca9 SAAS-208: airtime-system: create a option which can set the live stream connection setting 
-done
 2012-05-18 19:08:50 -04:00
denise d7eb9a9d95 SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command 
- changed "Airtime System Email" label on System->Preferences form
 2012-05-18 14:50:42 -04:00
denise 8710c00970 SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command 
-these options are hidden is instance is saas
 2012-05-18 12:58:09 -04:00
Paul Baranowski 869eb77ca4 CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place 
Fixed both of these issues.

Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.

Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs".  Now a scrollbar will appear if the
connection URL is too long.

Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.

Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.

Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
 2012-05-17 17:33:50 -04:00
denise 12be26925e -set p_keepData parameter to true when Application_Model_Preference::GetSystemInfo is called 
-this will keep all the cc_live_log data in tact if support-settings are saved
 2012-05-14 15:38:04 -04:00