Commit graph

6914 commits

Author SHA1 Message Date
James
839a49f3e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 16:09:28 -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
James
a57f8e2554 CC-3488: Update pop up window for jplayer so the size is exactly the same
size as the player.

- done
2012-04-09 15:28:38 -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
88a2b64b68 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 12:21:26 -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
Martin Konecny
1812db1490 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 11:52:45 -04:00
Martin Konecny
c71fb37c74 CC-3428: liquidsoap seems to have troubles with this file
-update path so that media-monitor finds our liquidsoap first instead
 of system's
2012-04-09 11:52:37 -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
e5e468e0e9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-08 20:17:04 -04:00
Martin Konecny
6e471c0060 CC-3428liquidsoap seems to have troubles with this file
-check file integrity before adding to library.
2012-04-08 20:16:53 -04:00
Martin Konecny
eb8d5ee1d7 CC-3470: Smarter way for pypo to recover when it should be playing something.
-check file integrity before adding to library.
2012-04-08 20:14:13 -04:00
Martin Konecny
b9e840552b -cleaned up some WTF!?!??! code 2012-04-08 19:29:55 -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
e549e997ae CC-3525: Pypo needs to look at end time of each track when receiving a new schedule 2012-04-07 22:33:32 -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
Martin Konecny
60d521a88a CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly
-done
2012-04-05 20:42:15 -04:00
James
332c1d91b5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/public/js/airtime/schedule/add-show.js
2012-04-05 16:03:15 -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
64ec4f30a8 CC-3598: Tighten permissions on Monit generic configuration file
-fixed
2012-04-05 16:00:11 -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
16ebd2951f -improved messages during install 2012-04-05 15:32:03 -04:00
Martin Konecny
788aef2f03 CC-3604: Clear Pypo cache dir on upgrade/reinstall
-done
2012-04-05 15:31:20 -04:00
Martin Konecny
176e5fdbd7 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 15:30:21 -04:00
Martin Konecny
3611f1071d CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly
-fixed
2012-04-05 15:09:20 -04:00
Martin Konecny
b00e74e831 -remove "disable_auto_start_services" install option 2012-04-05 14:56:11 -04:00
Martin Konecny
68c908eeac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-05 14:45:31 -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
James
1c55ab72a4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-05 12:07:22 -04:00
James
3df781cfea CC-3602: MediaFolders-> media files are added twice just because of seemingly
different paths

- fixed
2012-04-05 12:07:06 -04:00
Naomi Aro
743b5e33af CC-3605 : Create 2.1 upgrades 2012-04-05 16:10:58 +02:00
Naomi Aro
84efc6afb8 CC-3110 : Password reset 2012-04-05 16:05:19 +02:00
Naomi Aro
35a89e0308 CC-3174 : timeline 2012-04-05 15:52:16 +02:00
Naomi Aro
bbdcb3ec95 CC-3605 : Create 2.1 upgrades 2012-04-05 15:52:00 +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
James
cde8e07c0b CC-3581: Calendar->It should not be possible to change the duration for
the recorded show

- fixed
2012-04-04 16:26:28 -04:00
James
ab7da1ce90 CC-3581: Calendar->It should not be possible to change the duration for
the recorded show

- "When" section is disabled when editting rebroadcasting show
2012-04-04 15:44:52 -04:00
Martin Konecny
d9d8211a3b CC-3601: Pypo schedule needs to be sorted before pushing
-fixed
2012-04-04 15:25:57 -04:00
James
5da7d42290 CC-3548: Schedule: Separate repeate show template and single instance on
'When' section

- UI portion of the feature
2012-04-04 14:53:26 -04:00
Martin Konecny
3be1944fa4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:29:44 -04:00
Martin Konecny
366ea78fce CC-3532: Now Playing GUI-> Progress bar is still playing after end of show
-fixed
2012-04-03 18:29:36 -04:00
James
e5843dc54e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:09:39 -04:00
James
ebbaa02210 CC-3514: Playlist-> Metadata list of fields is not matching to that of
Playlist->Edit Metadata

- fixed
2012-04-03 18:09:03 -04:00