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

2108 Commits

Author SHA1 Message Date
denise 1300593e8b CC-3975: Media Library: Try to download files from watched folder, the filename will be "true" 
-fixed
 2012-06-27 13:03:22 -04:00
Martin Konecny 0a0e873ef9 CC-4019: Library: When "Add content" is clicked, "Proccessing" image … 
-fix small comment typo
 2012-06-27 11:50:31 -04:00
denise 4015949d2a CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId. 
-done
 2012-06-27 10:27:53 -04:00
James 31d643cee1 CC-3997: Now Playing -> Time Line: different behaviour between 'delete' 
button and 'delete' menu items

- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
 2012-06-26 17:43:15 -04:00
James 576c13963d CC-3998: Now Playing -> Time Line: confirm message for user 'delete' 
track by context menu is misleading

- fixed
 2012-06-26 17:35:07 -04:00
James c2cc4253b3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-26 16:56:01 -04:00
James 9a14051f0b CC-4019: Library: When "Add content" is clicked, "Proccessing" image is keep 
flickering

- fixed
 2012-06-26 16:55:43 -04:00
denise d892a4b5ae CC-4009: Calendar icon cannot be clicked twice without clicking another icon first 
-fixed
 2012-06-26 16:43:36 -04:00
denise ca3d554c07 CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show 
-empty cursorId array after every callback
 2012-06-26 15:49:17 -04:00
denise 4cb872f615 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-26 15:37:04 -04:00
denise 05fa673e42 CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show 
-done
 2012-06-26 15:36:45 -04:00
Martin Konecny a63b765621 CC-4011: System -> Media Folders: Changing page will stop removing a watched folder with lots of files (50,000) 
-Changed doing 50,000 database calls to 1.
 2012-06-25 23:40:07 -04:00
Martin Konecny 84f867a00f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-25 18:31:07 -04:00
Martin Konecny b8c559db58 add time to our version so cache is never used in dev branch 2012-06-25 18:30:33 -04:00
denise 8005049bdc CC-3996: Undefined offset: 0 in StoredFile.php (Apache error) 
-fixed
 2012-06-25 12:22:34 -04:00
denise ffb7f2ff65 CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId. 
-done
 2012-06-22 18:01:00 -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
James 2480639e58 CC-3980: Excel export button in Playout History does not really export 
Excel format

- removed xls option
 2012-06-20 17:42:49 -04:00
James 10fc5038c8 CC-3965: Clarify input/output stream settings by addding appropriate labels 
- fixed
 2012-06-20 17:39:52 -04:00
James 5c43fa5a7b CC-3978: Playout History table says Artist when it should say Creator 
- fixed
 2012-06-20 16:51:34 -04:00
James 3a32e7240a CC-3984: Now Playing scissor and trashcan buttons are incorrectly labelled in 
tooltips

- fixed
 2012-06-20 16:49:41 -04:00
James e40d9731a2 CC-3979: Playout History export should include date range in file and/or 
filename

- fix
 2012-06-20 16:47:11 -04:00
James 6a75fd6c76 CC-3979: Playout History export should include date range in file and/or 
filename

- done
 2012-06-20 16:35:34 -04:00
denise f029124447 Merge branch '2.1.x' into devel 2012-06-19 17:57:27 -04:00
denise 9ac024fa72 CC-3993: Validate that reporting stats are correct on Airtime PRO instances 
-done
-if no log data for the past 24 hours, update current record with current date, and delete old records
 2012-06-19 16:59:59 -04:00
denise b742033647 - Add Media: fix to accept audio files with ID3 tags liquidsoap complains about 2012-06-18 12:24:13 -04:00
denise f3d0f06397 - Add Media: reverted change to testing audo file with liquidsoap (will fix in 2.1.x) 2012-06-18 12:00:54 -04:00
denise 186b8ef1c2 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true" 
-fixed
 2012-06-15 16:48:51 -04:00
denise b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
denise bb54a9041f CC-3986: 'Add User' does not convert email address to lowercase 
-done
 2012-06-15 15:03:48 -04:00
denise 87faf47c94 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-15 14:42:37 -04:00
denise d02607ed94 CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-15 12:16:19 -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 70bfe031ef Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/models/Email.php
 2012-06-14 15:30:33 -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 295a8ea5fe CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-14 13:44:56 -04:00
denise f433fd89fe CC-3970: Password Reset: No UI error msg for no mail server founded 
-done
 2012-06-13 16:04:57 -04:00
James b07b83f740 CC-3981: Record Show: Change streams settings during recording will 
cause record fail

- added warning message
 2012-06-13 14:44:38 -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
Martin Konecny f188eeada2 preparation for 2.1.1 release 2012-06-13 11:35:14 -04:00
denise 9b31a6daac Merge branch '2.1.x' into devel 2012-06-13 10:10:05 -04:00
Martin Konecny 02b6d04952 CC-3956: PHP script can enter inifinite loop 
-small cleanup
 2012-06-12 20:18:06 -04:00
Martin Konecny d1c224321b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 18:51:31 -04:00
Martin Konecny b858c34526 CC-3956: PHP script can enter inifinite loop 
-fixed
 2012-06-12 18:51:22 -04:00
James 776e35dfa9 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 17:49:52 -04:00
James 548a6ce16a CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday 
- bug fix
 2012-06-12 17:49:34 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined 
-done
 2012-06-12 17:08:36 -04:00
James 032637049d CC-3952: Calendar: Create/Edit Show's End time manually and keep date picker 
open, the change will not take effect

- fixed
 2012-06-12 17:07:24 -04:00
denise 8b2353ede0 Merge branch '2.1.x' into devel 2012-06-12 15:49:18 -04:00
denise 55634ddd46 CC-3928: Use liquidsoap to test whether file is playable on upload. 
-done
-tests return value and output
 2012-06-12 15:41:10 -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 df518fb03f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 14:58:51 -04:00
denise 8a63478c73 CC-3972: it is not possible to select tracks in Now Playing tab 
-fixed
 2012-06-12 14:58:33 -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
Martin Konecny 22453f3820 CC-3968: Cannot preview file as * .MP3 
-fixed
 2012-06-12 11:31:10 -04:00
denise d66ba4074c Merge branch '2.1.x' into devel 2012-06-11 18:11:09 -04:00
denise d8a1a17f19 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-11 18:08:47 -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
Martin Konecny 2ebf149a65 CC-3949: On edit empty show, time_filled becomes null 
fix method of checking null
 2012-06-11 17:08:17 -04:00
denise 1b057c8954 Merge branch '2.1.x' into devel 2012-06-11 16:49:03 -04:00
denise 0d770e55ef Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-11 16:43:35 -04:00
denise ebaff793be CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings 
-fixed (had to apply custom changes to new version of fullcalendar.js)
 2012-06-11 16:43:24 -04:00
James 06d90c53aa CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday 
- fixed
 2012-06-11 16:42:12 -04:00
James 6316c23b25 CC-3954: apache log errors part3 
- bug fix
 2012-06-11 16:10:51 -04:00
James 31000afbf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-11 15:52:58 -04:00
James c78ba0faf6 CC-3954: apache log errors part3 
- fixed
 2012-06-11 15:52:39 -04:00
denise 5b9add360c CC-3718: Please enable user to input the mail server settings 
-fixed soundcloud settings from collapsing if there are form input errors
 2012-06-11 15:18:12 -04:00
denise d498c51814 Merge branch '2.1.x' into devel 2012-06-11 15:10:33 -04:00
denise d348d21c10 CC-3960: Day of week text is missing from monthly Calendar view 
-fixed
 2012-06-11 15:08:02 -04:00
denise 16b6f09420 CC-3959: Make default username "source" for master and show inputs 
-done (just added tooltip)
 2012-06-11 14:55:26 -04:00
denise ca8187c9c2 CC-3718: Please enable user to input the mail server settings 
-done
 2012-06-11 12:53:09 -04:00
James 62eee61d4e CC-3956: PHP script can enter inifinite loop 
- fixed
 2012-06-08 17:58:21 -04:00
James 0bae3f9038 CC-3949: On edit empty show, time_filled becomes null 
- fixed
 2012-06-08 16:18:27 -04:00
James e661f400a4 CC-3950: apache log errors part2 
- fixed
 2012-06-08 15:31:45 -04:00
James 628f1518a7 CC-3906: PlaylistLibrary-> user can not delete track which has been already 
played even after cancelling the show.

- fixed
 2012-06-08 15:24:37 -04:00
James 1625cc6a25 CC-3948: Dashboard -> Source Info panel: Cannot turn off source if 
source is disconnect.

- fixed
 2012-06-08 15:14:30 -04:00
denise 7d4851573f CC-3951: Password Reset: You can still reset password even after system email for Password Reset disabled 
-fixed
 2012-06-08 13:09:14 -04:00
denise e6336044ed Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-08 12:14:26 -04:00
denise cf32096d9c CC-3942: Canceling a storage folder change does not blank the Import Folder field 
-fixed
 2012-06-08 12:14:16 -04:00
Martin Konecny e1dec544ad Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-08 12:07:07 -04:00
Martin Konecny 0416c05f9c add reason why Propel connection failed 2012-06-08 12:06:54 -04:00
denise 33f77c8c28 CC-3923: Show Timefilter - Even If the time filter is scheduled for yesterday it displays the Show played today 
-fixed
 2012-06-08 12:03:23 -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
denise 76c598c05b CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings 
-committing diff between original fullcalendar.js and changes made to it
 2012-06-08 10:55:13 -04:00
denise 951bd3c9b5 CC-3933: Remove version number and date strings from login page footer, add robots.txt 
-done
 2012-06-08 10:51:10 -04:00
James 5b56f258a4 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-08 10:33:27 -04:00
James 3b9f6f12de CC-3834: System -> Stream Settings: click "save" will cause some errors in 
zendphp.log

- removed logging
 2012-06-08 10:33:06 -04:00
denise 8fae454db6 CC-3901: DJ not assigned to Show, Guest: selection dialog populated upon clicking on "Select All" button in Now Playing 
-fixed
 2012-06-07 17:04:31 -04:00
denise 24f4e589a4 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-07 16:10:04 -04:00
denise da7e44a78c CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings 
-fixed
 2012-06-07 16:09:51 -04:00
James 7228dc9eb0 CC-3869: Source Streams: Please give Guest and DJ user clear error message 
when they try to shut off Scheduled Play stream

- fixed
 2012-06-07 14:27:12 -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 dc4597e526 CC-3910: NowPlaying-> preview dialog is greyed for files uploaded to Soundcloud 
- fixed
 2012-06-07 11:26:35 -04:00
denise be02906565 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-07 10:33:14 -04:00
denise a0a078db2b CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page. 
-fixed to keep current page after deleting an item
 2012-06-07 10:33:00 -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 ec6ff4c9e6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 17:32:10 -04:00
James e5d5f44813 CC-3905: Playlist Library -> the delete tracks button is enabled for DJ 
users and PM's

- done
- PM should have full control on the library
- DJ is only allowed to edit/delete playlist that they created.
no action on files except play or add to their own playlist
 2012-06-06 17:31:51 -04:00
denise d8a75cf5c6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 17:06:54 -04:00
denise fda04295a6 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked 
-fixed
 2012-06-06 17:06:46 -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
James fb533bed07 CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station 
on Sourcefabric.org' if it's checked then saved.

- fixed
 2012-06-06 14:26:23 -04:00
James bcf3f0014f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 14:19:15 -04:00
James 0ca45e343b CC-3878: Recorded media file's track number is changed after restarting media-monitor 
- fixed
 2012-06-06 14:18:54 -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 f57d316b6c CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES 
-changed support feedback message
-fixed whitespace in register-dialog.phtml
 2012-06-06 11:10:29 -04:00
denise 8e0c886350 CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack 
-fixed whitespace in library.js
 2012-06-06 10:45:27 -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
Martin Konecny 68deba81d9 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-05 22:30:50 -04:00
Martin Konecny d4b1fc711e CC-3928: Use liquidsoap to test whether file is playable on upload. 
-change to wording
 2012-06-05 22:30:17 -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 5966c7feda fixed merge conflit 2012-06-05 14:47:11 -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 af71a03982 CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page. 
-maintains current page after edit metadata
 2012-06-05 11:27:17 -04:00
denise 74e9f70506 CC-3928: Use liquidsoap to test whether file is playable on upload. 
-done
 2012-06-05 11:24:40 -04:00
denise a3754be31a CC-3850: Use qTip instead of custom tooltips 
-done
 2012-06-05 11:24:40 -04:00
denise e3bacba39b CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES 
-done
 2012-06-05 11:20:00 -04:00
denise 9c89d263db CC-3880: NowPlaying-> there is no tooltip for the removed files available 
-done
 2012-06-05 11:20:00 -04:00
denise c554190faf -fixed indentation 2012-06-05 11:20:00 -04:00
denise 990dea12a4 CC-3895: Sometimes Media Monitor will not update the length of tracks with the same title but different contents. 
-fixed
 2012-06-05 11:20:00 -04:00
denise c18704aa4d CC-3900: Show Builder boxes remain checked even when the item is no longer visible 
-fixed playlist builder "Dragging <x> items" message so <x> is amount of visible items only
 2012-06-05 11:20:00 -04:00
denise 1b540626ed CC-3900: Show Builder boxes remain checked even when the item is no longer visible 
-only visible tracks can be added/deleted
 2012-06-05 11:20:00 -04:00
denise 5e894f7351 CC-3893: Add Media: Red underline appears on the bottom 
-fixed
 2012-06-05 11:19:59 -04:00
denise 05378f52d3 CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack 
-fixed
 2012-06-05 11:19:59 -04:00
denise c1976162cb CC-3793: "Star time" check will block updating shows when error found in colour settings 
-fixed
 2012-06-05 11:19:59 -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 25ff2b3c3a CC-3873: "Reset e-mail" procedure leads to a certain page with no ability to navigate back from it 
-added "Back to login screen" link
 2012-06-05 11:19:59 -04:00
denise 3566480999 CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts 
-fixed
 2012-06-05 11:19:59 -04:00
Martin Konecny b6446442ba CC-3917: record_date field in recorded shows causing problem 
-fixed
 2012-06-04 11:43:41 -04:00
Martin Konecny 43f57c0f8b CC-3902: Help -> Getting Started: Step 2 is optional now 
-fixed
 2012-06-03 22:55:49 -04:00
Martin Konecny 54d741972a CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual" 
-fixed
 2012-06-03 22:51:23 -04:00
Martin Konecny 89c0583849 CC-3926: System -> Stream setting: input ' into "Name/Description" will cause PDOException 2012-06-03 22:39:42 -04:00
denise b76d602561 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 14:12:28 -04:00
denise 33e97e7b40 - changed trial-end-date box to have a fixed position 2012-05-30 14:12:18 -04:00
Paul Baranowski 4fec2d3982 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 13:59:34 -04:00
Paul Baranowski 81fb81af74 CC-3904: Help -> about: Year 2011 should be 2012 
Fixed.
 2012-05-30 13:59:06 -04:00
James e1a86d50f6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 12:46:30 -04:00
James e48b2f2a84 CC-3913: Live Stream: When master switch is turned on, it turns off show switch 
- fixed
 2012-05-30 12:46:05 -04:00
Naomi Aro 1a49173d2f CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected 2012-05-30 17:46:24 +02:00
denise 3277a81221 - moved calcAdditionalShowData call before currentShow and nextShow get assigned 2012-05-29 14:19:31 -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 396795e70e CC-3879 : Now Playing-> Guest's clicking on Preview pops up error window 2012-05-28 17:59:26 +02:00
denise 561934c8ef SAAS-244: Live chat box appears in stream-player and preview windows 
-fixed
 2012-05-25 16:23:33 -04:00