abd3a37970
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-17 14:09:32 -04:00
29225a8ea3
Updating de_DE .po file. Thanks Silvio Mende!
2013-05-17 14:09:19 -04:00
01d16348db
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-17 13:20:40 -04:00
ae41a4f9ff
more persistent links (won't be invalid if title changes)
2013-05-17 13:20:28 -04:00
d57836c42b
CC-5159: Repeating Shows doesn't populate correct dates sometimes
2013-05-17 13:10:15 -04:00
76a02796b7
implement method stub
2013-05-17 12:16:04 -04:00
d205b0dbd3
remove string literal
2013-05-17 12:14:33 -04:00
5bf91d513d
CC-5127: Library -> Scheduled and Playlist columns needs better icon
...
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
dc664ad9ff
CC-5156: Hungarian language is shown in strange font on login page
2013-05-17 11:05:38 -04:00
9133384789
is_scheduled flag was not getting updated when shows were deleted
2013-05-16 15:03:10 -04:00
3d09747990
CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show
2013-05-16 13:42:06 -04:00
f4d313a67c
Hungarian translation locale option
2013-05-16 12:50:12 -04:00
1b2c60dd57
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-16 12:47:52 -04:00
3010d014b4
Hungarian translation
2013-05-16 12:47:40 -04:00
1af4c7bbad
fix version # in VERSION file
2013-05-16 12:33:27 -04:00
3208ab0fd1
Merge branch 'patch-2' of git://github.com/picizse/Airtime into picizse-patch-2
2013-05-16 12:28:23 -04:00
165b3b9640
Merge branch 'master' of git://github.com/Cougar/Airtime into Cougar-master
2013-05-16 12:27:17 -04:00
59785a952f
make up for lack of 'total_seconds()' lib function for pre 2.7 version of python
2013-05-16 12:25:21 -04:00
dc1ec789d2
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-16 12:08:38 -04:00
d2f29b1f88
more informative message to user about new init.d script behaviour
2013-05-16 12:08:32 -04:00
70b734c940
Update Chinese po file
2013-05-16 11:16:36 -04:00
0e843e2e7b
Update liquidsoup compile files
2013-05-16 10:51:57 -04:00
ca6442f7f0
ensure we are parsing in base 10
2013-05-15 17:18:52 -04:00
1ab27e3cf8
be more idiomatic
2013-05-15 17:18:42 -04:00
95bb5b2f36
CC-5153:
...
Cancel show won't cut off current song after airtime-playout is restarted
-fixed
2013-05-15 17:18:15 -04:00
05dc0b7dbc
added comments, remove deprecated code, better var names...
2013-05-15 16:44:36 -04:00
018c88d12a
CC-5063:
...
"Nothing Scheduled" appears between 2 scheduled tracks
-fixed
2013-05-15 16:43:58 -04:00
148e1b9e46
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-15 15:48:04 -04:00
5a86bd9ac4
CC-5149: Linked show: Regular show will be treat as linked show in some case
...
A new form was not getting sent to the user properly after a show creation
2013-05-15 15:47:45 -04:00
10154ae724
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-15 15:39:07 -04:00
b0cdc606f8
CC-5096 : Add "i" (info) icon to stream output type
2013-05-15 15:38:46 -04:00
58a806a607
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-15 15:32:43 -04:00
491ea6a32c
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Made some small optimizations. Still needs more work.
2013-05-15 15:32:29 -04:00
658fd82e1f
version number change necessary for nightly build scripts
2013-05-15 13:55:21 -04:00
8545803dbf
CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
...
-slightly better way of not writing cue-in/cue-out
2013-05-15 13:19:29 -04:00
4a82fe2e52
Revert "CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00"
...
This reverts commit 9ad42b2b2c
2013-05-15 13:13:37 -04:00
ba3703b556
Revert "CC-5126:"
...
This reverts commit a2b500729c
2013-05-15 13:10:56 -04:00
80686b7063
add parameter parsing to airtime-liquidsoap script.
...
-Allow us to prevent running as daemon
2013-05-15 13:06:16 -04:00
f3edc2bee6
CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
...
Fixed so it doesn't update files that are scheduled in other shows
2013-05-15 12:38:48 -04:00
254ebb709e
CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
2013-05-15 11:25:30 -04:00
9ad42b2b2c
CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
...
-also removed functions that query for cue-in/cue-out,
since we don't care about these.
2013-05-14 22:26:48 -04:00
a2b500729c
CC-5126:
...
Media Monitor: Exception happens when cuein value is 00:00:00
-fixed this be ensuring we're not writing cue-in/out values to the file.
This should never have been allowed.
2013-05-14 22:16:30 -04:00
b2c8cb0f9d
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 19:18:51 -04:00
5080807a21
IM-629
...
-fix minor SQL syntax error
2013-05-14 19:18:41 -04:00
b287409bfb
IM-629
...
-not using show_instnace_filter POST param correctly
2013-05-14 19:18:30 -04:00
bb36556bb9
IM-629
...
-filter by using instance id instead of show id
Conflicts:
airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04:00
393c8abb95
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 18:14:51 -04:00
7d5177d77d
CC-5096 : Add "i" (info) icon to stream output type
2013-05-14 18:14:38 -04:00
af7b2d5347
IM-629
...
-fix using instance id instead of show id
2013-05-14 17:18:20 -04:00
992e3c37ef
IM-629
...
-add missing POST parameter
2013-05-14 17:18:11 -04:00
denise
Martin Konecny
cliff.wang
Naomi