Martin Konecny
|
b0eda6e915
|
Merge branch '2.4.x'
Conflicts:
airtime_mvc/public/js/airtime/preferences/streamsetting.js
python_apps/pypo/pypocli.py
python_apps/pypo/schedule/telnetliquidsoap.py
|
2013-05-22 12:07:08 -04:00 |
Daniel James
|
18a1c7ad98
|
Localization updates for fixes in CC-5166 and CC-5168
|
2013-05-22 10:55:14 +01:00 |
Daniel James
|
2e970bfc8a
|
Fixes date format in Smart Block tooltip (CC-5618)
|
2013-05-22 10:25:43 +01:00 |
Daniel James
|
7ec664823d
|
Fixes whitespace to the left of 'Open Media Builder' button (CC-5166)
|
2013-05-22 10:23:42 +01:00 |
Daniel James
|
717cda984a
|
Fixed 'steam' typo in stream settings tooltip
|
2013-05-22 10:21:27 +01:00 |
Daniel James
|
8caea983dc
|
Initial credits for 2.4.0 release, added new translators
|
2013-05-22 10:20:31 +01:00 |
Naomi
|
3ad7c868e2
|
Merge branch 'SAAS-317-datatables-reorder' into 2.4.x
|
2013-05-21 17:44:25 -04:00 |
Naomi
|
b720086a4b
|
SAAS-317 : http://ryerson.airtime.pro/ is having issues with show/hide column in their library
missing single quote problem, updating column visible plugin.
|
2013-05-21 17:40:52 -04:00 |
Martin Konecny
|
8e617b33de
|
add ability to use id's with mksafe operator
|
2013-05-21 16:31:32 -04:00 |
Martin Konecny
|
d86edd43ab
|
fix reference to non-existent var
|
2013-05-21 12:58:19 -04:00 |
denise
|
fb605ccb71
|
Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page
|
2013-05-21 09:30:35 -04:00 |
Martin Konecny
|
46364bec44
|
fix reference to non-existent var
|
2013-05-17 14:54:23 -04:00 |
Martin Konecny
|
e4b6eef22d
|
remove unecessary backslashes
|
2013-05-17 14:52:49 -04:00 |
denise
|
0f1a94532e
|
CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action
Fixed. Also had to prepare the warning message for localization.
|
2013-05-17 14:47:34 -04:00 |
denise
|
2f6e2e7de6
|
Merged in new string into updated de_DE .po file
|
2013-05-17 14:13:01 -04:00 |
denise
|
abd3a37970
|
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
|
2013-05-17 14:09:32 -04:00 |
denise
|
29225a8ea3
|
Updating de_DE .po file. Thanks Silvio Mende!
|
2013-05-17 14:09:19 -04:00 |
Martin Konecny
|
bda22baf0c
|
fix playout not working
-silly mistake due to inf recursion
|
2013-05-17 14:00:09 -04:00 |
Martin Konecny
|
01d16348db
|
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
|
2013-05-17 13:20:40 -04:00 |
Martin Konecny
|
ae41a4f9ff
|
more persistent links (won't be invalid if title changes)
|
2013-05-17 13:20:28 -04:00 |
Martin Konecny
|
72cfe62de9
|
more persistent links (won't be invalid if title changes)
|
2013-05-17 13:19:40 -04:00 |
denise
|
d57836c42b
|
CC-5159: Repeating Shows doesn't populate correct dates sometimes
|
2013-05-17 13:10:15 -04:00 |
Martin Konecny
|
85b73706dc
|
stricter error checking when adding to queues
|
2013-05-17 12:18:29 -04:00 |
Martin Konecny
|
76a02796b7
|
implement method stub
|
2013-05-17 12:16:04 -04:00 |
Martin Konecny
|
d205b0dbd3
|
remove string literal
|
2013-05-17 12:14:33 -04:00 |
Martin Konecny
|
19506fb8c2
|
remove hard-coded string
|
2013-05-17 11:55:51 -04:00 |
Martin Konecny
|
9165ddc0ec
|
more DRY code. also use "with" instead of try/except
|
2013-05-17 11:55:14 -04:00 |
denise
|
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 |
Martin Konecny
|
bd0becf277
|
update install script to take into account new config location
|
2013-05-17 11:28:27 -04:00 |
denise
|
dc664ad9ff
|
CC-5156: Hungarian language is shown in strange font on login page
|
2013-05-17 11:05:38 -04:00 |
Martin Konecny
|
e51e046dd0
|
more lintian fixes
-mostly lines with length > 79
|
2013-05-16 17:37:01 -04:00 |
Martin Konecny
|
d0a0487840
|
clean up some pylint warnings
-silly copy paste error
|
2013-05-16 17:12:21 -04:00 |
Martin Konecny
|
36462b6dc9
|
clean up some pylint warnings
|
2013-05-16 17:05:37 -04:00 |
Martin Konecny
|
060980d8c6
|
Ensure only telnetliquidsoap has telnet responsibilities
-also added module docstrings
|
2013-05-16 16:19:00 -04:00 |
denise
|
9133384789
|
is_scheduled flag was not getting updated when shows were deleted
|
2013-05-16 15:03:10 -04:00 |
denise
|
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 |
Martin Konecny
|
888e6db812
|
more structural organization of files/packages
|
2013-05-16 13:41:56 -04:00 |
Martin Konecny
|
1c87d51b8e
|
Major reorganization of the pypo directory.
Much better organization of files into packages
|
2013-05-16 13:22:15 -04:00 |
denise
|
f4d313a67c
|
Hungarian translation locale option
|
2013-05-16 12:50:12 -04:00 |
denise
|
1b2c60dd57
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-16 12:47:52 -04:00 |
denise
|
3010d014b4
|
Hungarian translation
|
2013-05-16 12:47:40 -04:00 |
Martin Konecny
|
1af4c7bbad
|
fix version # in VERSION file
|
2013-05-16 12:33:27 -04:00 |
Martin Konecny
|
3208ab0fd1
|
Merge branch 'patch-2' of git://github.com/picizse/Airtime into picizse-patch-2
|
2013-05-16 12:28:23 -04:00 |
Martin Konecny
|
165b3b9640
|
Merge branch 'master' of git://github.com/Cougar/Airtime into Cougar-master
|
2013-05-16 12:27:17 -04:00 |
Martin Konecny
|
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 |
Martin Konecny
|
dc1ec789d2
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-16 12:08:38 -04:00 |
Martin Konecny
|
d2f29b1f88
|
more informative message to user about new init.d script behaviour
|
2013-05-16 12:08:32 -04:00 |
cliff.wang
|
70b734c940
|
Update Chinese po file
|
2013-05-16 11:16:36 -04:00 |
cliff.wang
|
0e843e2e7b
|
Update liquidsoup compile files
|
2013-05-16 10:51:57 -04:00 |
Martin Konecny
|
ca6442f7f0
|
ensure we are parsing in base 10
|
2013-05-15 17:18:52 -04:00 |