Commit Graph

1325 Commits

Author SHA1 Message Date
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 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 0ad9177dac CC-3648: Airtime Station time is broken
- fixed
2012-04-16 10:19:34 -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 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
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
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
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 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
James c510286614 CC-3596: Playlist->Library->Edit Metadata: Throw exception after
inputing string in "BPM"

- added digit validator
2012-04-11 14:09:51 -04:00
James 13502b4c08 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 12:27:54 -04:00
James f82aef2a85 CC-3566: Preferences->"Fade In" is not respected when Show starts
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
Martin Konecny 4ff0962b60 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 11:22:07 -04:00
Denise Rigato 26d13e7184 CC-3468: Stream settings: Need detailed tooltip for "override" fields
-fixed
2012-04-11 11:01:22 -04:00
Martin Konecny a09a31bc88 CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
-pypo side fixed
2012-04-10 23:13:52 -04:00
James 1017b4e449 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-10 17:37:15 -04:00
Denise Rigato e4fc5fafb5 CC-3468: Stream settings: Need detailed tooltip for "override" fields
-fixed
2012-04-10 16:30:46 -04:00
James 148fdfb8f9 Merge branch 'CC-3603' into devel 2012-04-10 15:28:38 -04:00
Naomi Aro 428d04d77f CC-3605 : Create 2.1 upgrades 2012-04-10 18:07:39 +02:00
Naomi Aro b998a04c2e Merge branch 'devel' into CC-3174 2012-04-10 15:57:13 +02:00
Naomi Aro 1dcced18ac CC-3605 : Create 2.1 upgrades 2012-04-10 14:45:48 +02:00
James 56ce2b0da5 - text change on live stream section on show form 2012-04-09 17:04:53 -04:00
James 32548de639 CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting
entire text and typing does not erase the highlighted text.

- removed all the masking
- meioMask is very outdated so it's removed from the project.
2012-04-09 16:35:39 -04:00
Denise Rigato 7fc575e750 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 15:51:37 -04:00
Denise Rigato ee0a08be15 CC-3487: Improved restart warning message for stream settings page
-fixed
2012-04-09 15:51:17 -04:00
Denise Rigato 516f71c23e CC-3487: Improved restart warning message for stream settings page
-fixed
2012-04-09 15:49:39 -04:00
Martin Konecny 5bc1fe84ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 12:43:46 -04:00
Martin Konecny 54ec6445c6 CC-3606: System->Media Folders-> system seems to search
-fixed. Need to check if directory actually exists.
2012-04-09 12:43:40 -04:00
James b32e463350 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
- fixed
2012-04-09 12:19:22 -04:00
James 6785a373a1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 10:50:51 -04:00
James d035681f35 CC-3596: Playlist->Library->Edit Metadata: Throw exception after
inputing string in "BPM"

- added validator on the form
2012-04-09 10:50:32 -04:00
James 064490a2fd CC-3603: Calendar->Once you update the rebroadcasted show it disappears
- temp commit
2012-04-09 10:37:44 -04:00
Martin Konecny d562a26f4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-07 22:33:47 -04:00
Martin Konecny 548c4ffb8d -change it so that user can access API actions if logged in. 2012-04-07 22:28:10 -04:00
James 954fa2bceb CC-3444: Ability to edit currently playing show (end time and permissions)
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
Martin Konecny ef6c496ba3 CC-3541: Missing show title from "Show Content" pop-up
-fixed
2012-04-05 15:49:58 -04:00
Martin Konecny 8050a1ce29 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 14:45:16 -04:00
Naomi Aro 35a89e0308 CC-3174 : timeline 2012-04-05 15:52:16 +02:00
Naomi Aro 0b3809c379 CC-3110 : Password reset
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
Naomi Aro cf2813a545 CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page 2012-04-05 10:56:06 +02:00
Naomi Aro 35d2ded26b CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page 2012-04-05 10:47:35 +02:00