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

1642 Commits

Author SHA1 Message Date
Martin Konecny 70a51f1aca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-18 15:45:15 -04:00
James dacdc4e432 CC-3672: Source switch stays connected if current show is cancelled 
- fixed
 2012-04-18 15:38:47 -04:00
James d3d6b10528 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-18 14:03:47 -04:00
James 897b61b357 CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours 
- fixed
 2012-04-18 14:00:40 -04:00
denise 843299361a Merge branch 'cc-3637-fix-external-source-dashboard-display' into devel 2012-04-18 12:32:21 -04:00
denise 3ddabf5cf7 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:30:37 -04:00
denise 479e112317 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:30:37 -04:00
denise a7fb8ea3f2 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-semi-fixed
 2012-04-18 12:30:37 -04:00
denise ddf1a6d027 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:30:37 -04:00
denise 1c9871a6ed fixed whitespace 2012-04-18 12:30:37 -04:00
denise a58dc95f07 changed "current" label - not perfect 2012-04-18 12:30:37 -04:00
denise fffaac726c CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-semi-fixed
 2012-04-18 12:26:10 -04:00
denise 7659ae6384 added missing bracket on <span> 2012-04-18 12:26:10 -04:00
denise a7ac80e785 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:26:10 -04:00
denise ef22a33258 fixed whitespace 2012-04-18 12:26:10 -04:00
denise 91cc633139 changed "current" label - not perfect 2012-04-18 12:26:10 -04:00
James 000f7d549c CC-3652: Can't edit current show if it's a single instance 
when the timezone is in CEST(prague timezone)

- fixed a bug where variable name wasn't changed
 2012-04-18 12:25:10 -04:00
denise 53a85204da CC-3498: Calendar -> Show Content better representation of duration needed 
-fixed (check for array length after explode())
 2012-04-17 16:52:59 -04:00
Martin Konecny 64a7a13f79 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 16:25:57 -04:00
Martin Konecny d258e39b2e CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. 
-Remove unecessary "continue;" statements
 2012-04-17 16:25:10 -04:00
James 5df1fede9f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 15:43:39 -04:00
James a91785ff42 CC-3652: Can't edit current show if it's a single instance 
when the timezone is in CEST(prague timezone)

- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
 2012-04-17 15:43:18 -04:00
Naomi Aro 467fbc2c4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 19:00:57 +02:00
Naomi Aro 4732c0ad67 CC-733 : Broadcast Log 2012-04-17 18:59:17 +02:00
Martin Konecny 29e24d1847 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 12:24:05 -04:00
Martin Konecny cdf92b016f CC-3655: Context menu for current show missing add/remove content and remove all content options. 
-undone
 2012-04-17 12:23:56 -04:00
Naomi Aro 102bcb1d46 CC-3416 : Create password reset form 2012-04-17 18:16:10 +02:00
Martin Konecny 2c4df4853a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 18:38:55 -04:00
Martin Konecny 79b9de203d -Better attempt at getting at least 3 items 2012-04-16 18:38:48 -04:00
James 4527da6cdf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 18:22:03 -04:00
James 1d91d1b11b CC-3659: Override on Master/Show Source connection needs to have 
better description about what the override field actually does.

- fixed description
- extra fix:
 - using variable instead of hard coded text
 - removed unnecessary code
 2012-04-16 18:21:28 -04:00
denise 27e5a6db5e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 17:36:19 -04:00
denise e786514f27 CC-3655: Context menu for current show missing add/remove content and remove all content options. 
-fixed
 2012-04-16 17:31:16 -04:00
James da691dcfb7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 17:29:18 -04:00
James c08800468f CC-3658: DJ assigned to the Show can't switch/kick streams 
- fixed
 2012-04-16 17:29:02 -04:00
denise 2fc591db2b CC-3498: Calendar -> Show Content better representation of duration needed 
-fixed
 2012-04-16 17:09:54 -04:00
James 2f4861db26 CC-3444: Ability to edit currently playing show (end time and permissions) 
- added comment
 2012-04-16 17:06:06 -04:00
James d11fca8ac8 CC-3444: Ability to edit currently playing show (end time and permissions 
- fixed
 2012-04-16 16:48:04 -04:00
James 2e811dfef8 CC-3642: System->Streams->DJ URL changes are not reflected in Calendar 
->LiveStream

- fixed
 2012-04-16 15:23:37 -04:00
James 90edd9d1b0 CC-3643: System->Streams - Master URL GUI is broken after overriding URL 
setting

- fixed
 2012-04-16 15:10:01 -04:00
James 9aa814212a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 14:58:03 -04:00
James df3acb5590 CC-3654: Cannot resize current (non-repeating) show on the calendar 
- fixed
 2012-04-16 14:57:53 -04:00
Naomi Aro 7e3112e3d7 CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW 2012-04-16 18:31:15 +02:00
Naomi Aro b5f48c7732 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 18:16:33 +02:00
Naomi Aro b9d82a579f CC-3407 : Timeline: Display if tracks are missing on disk 2012-04-16 18:16:24 +02:00
Martin Konecny a6c0a1d2d9 -removed erroneous import 2012-04-16 12:04:35 -04:00
Naomi Aro a0fb607d30 Merge branch 'CC-3174' into devel 2012-04-16 16:40:02 +02:00
Naomi Aro c96c60dc5a CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files 
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
 2012-04-16 16:33:32 +02:00
James 63df3d5295 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 10:19:54 -04:00
James 0ad9177dac CC-3648: Airtime Station time is broken 
- fixed
 2012-04-16 10:19:34 -04:00
denise c61f74b06f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 18:06:16 -04:00
denise 82130560f5 CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen. 
-fixed
 2012-04-13 18:05:31 -04:00
James ffc17ba705 CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format 
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
 2012-04-13 17:45:28 -04:00
James a6f44226b9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 17:18:52 -04:00
James 9cafc91785 CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to 
play unavailable track leads to platform hanging

- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
 2012-04-13 17:18:31 -04:00
Martin Konecny 8442932b7d CC-3520: Change default password of monit 
-fix names
 2012-04-13 17:07:59 -04:00
Martin Konecny 6a72d6a8e8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 16:58:18 -04:00
Martin Konecny 5a2d55ef84 CC-3520: Change default password of monit 
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
 2012-04-13 16:58:12 -04:00
denise eff9ca85be CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen. 
-fixed
 2012-04-13 16:52:22 -04:00
Martin Konecny 2e4cab45b3 -Logging::log works with arrays 2012-04-13 16:50:54 -04:00
James 3ae8eb9105 CC-3622: When changing location of the stor directory, the "organize" 
subfolder is not being created

- fixed
 2012-04-13 15:09:59 -04:00
James 36ca2c29fc CC-3634: Media Folder: if file was deleted from file system, and the file was 
scheduled in the future, it wasn't marking the file as deleted

- using propel instead of PEAR DB
 2012-04-13 15:03:27 -04:00
James 1bb04296a9 CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high) 
- the regular exp check in model class was wrong
 2012-04-13 12:05:59 -04:00
Naomi Aro ef908ee894 CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences) 2012-04-13 11:09:52 +02:00
James 6e1bf50009 CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly 
- fixed
 2012-04-12 18:49:24 -04:00
James fd700c225c CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files 
be remover from server

- RecallByMd5() was checking against all cc_files entries which includes
 deleted files
 2012-04-12 17:37:14 -04:00
James c706bc32fd CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format 
- fixed
 2012-04-12 17:23:26 -04:00
James d4533ca545 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 17:19:03 -04:00
James c6ad9462af CC-3634: Media Folder: if file was deleted from file system, and the file 
was scheduled in the future, it wasn't getting deleted from Airtime

- fixed a bug
 2012-04-12 17:18:45 -04:00
denise 62cd704d1c --added comment 2012-04-12 17:12:43 -04:00
denise 9d4a474521 CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show 
-fixed
 2012-04-12 17:07:27 -04:00
Vladimir b0ac86ba43 CC-3416, style changes 2012-04-12 22:33:54 +02:00
denise fe68d0fc87 CC-3498: Calendar -> Show Content better representation of duration needed 
-fixed
 2012-04-12 16:25:01 -04:00
James f522c7a7af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 16:17:36 -04:00
James 53e37ee826 CC-3634: Media Folder: if file was deleted from file system, and the file was 
scheduled in the future, it wasn't getting deleted from AIrtime

- fixed
 2012-04-12 16:17:19 -04:00
Martin Konecny c2db20f004 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-cleanup
 2012-04-12 15:10:40 -04:00
Martin Konecny bfed474b7b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:41:18 -04:00
denise a2fedaa3f1 CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show 
-fixed
 2012-04-12 13:36:45 -04:00
Martin Konecny 83d78eb0dd -check if exec function is available before using it 2012-04-12 13:36:36 -04:00
denise 7276d3d895 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:34:48 -04:00
Martin Konecny 380094b4cc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:29:58 -04:00
Martin Konecny 04718a88ae CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-done
 2012-04-12 13:29:49 -04:00
Martin Konecny fbef6aa3c4 -remove reference to deleted meio mask jquery library 2012-04-12 13:11:45 -04:00
denise 0b1b7d0e9f CC-3511: Pausing and then playing the live stream player should restart the stream at current time instead of playing from the buffer 
-play/pause removed
 2012-04-12 12:25:35 -04:00
James 4ef18fb00f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:22:36 -04:00
James c90a8006cc CC-3622: When changing location of the stor directory, the "organize" 
ubfolder is not being created.

- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
 2012-04-12 12:22:20 -04:00
denise 390f9b44fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:22:09 -04:00
Naomi Aro 0486d33e27 Merge branch 'CC-3174' into devel 2012-04-12 18:12:01 +02:00
denise b0948e8848 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:01:55 -04:00
Naomi Aro adddd1085c CC-3592 : Calendar-> Recorded Shows do not get Rebroadcasted at the moment 
added a flag whether to check user permissions or not.
 2012-04-12 18:00:38 +02:00
Martin Konecny 8303eb728e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 11:54:58 -04:00
Martin Konecny 5a8df0321e CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-12 11:54:51 -04:00
James 18391604b5 CC-3424: UI Design for new drop down menu 
- html integration
 2012-04-12 10:26:11 -04:00
denise 3d156a0516 CC-3612: Stream->Preferences-> inappropriate error message is popped up 
-fixed
 2012-04-12 10:01:22 -04:00
denise d06b3573e9 CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO") 
-fixed
 2012-04-11 19:22:47 -04:00
James 0ec58f0bc3 CC-3250: UI design for mount monitor for media monitor 
( Manage Media Folder and Playlist Builder screen)

- adding tooltip and fixed a minor bug
 2012-04-11 17:24:26 -04:00
Martin Konecny bdd3444acf CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-11 16:45:03 -04:00
James f0be7cc995 - comments and removing logging 2012-04-11 16:06:10 -04:00
James 7986c8d77a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 15:55:10 -04:00
James 8f197115ae CC-3618: Current playing Text Field in Dashboard alternates between "Nothing 
Scheduled" and "current playing song"

- fixed
 2012-04-11 15:54:03 -04:00