martin
|
b3beab1dbd
|
CC-2216: Update to latest liquidsoap binaries
-Done
|
2011-04-29 17:11:31 -04:00 |
martin
|
8ffbcc96c7
|
Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel
|
2011-04-29 15:32:27 -04:00 |
martin
|
50c649dc59
|
Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel
|
2011-04-29 15:31:18 -04:00 |
James Moon
|
afa51c0d56
|
CC-2211:changes to playlist not show
Move redraw function into callback function when PL gets deleted
from the left window
|
2011-04-29 12:17:06 -07:00 |
James Moon
|
615c6e18f5
|
cc-2211:changes-to-playlist-not-shown
There was a timing issue
Moved redrawing part into callback function.
|
2011-04-29 11:08:10 -07:00 |
martin
|
3ac7fb01af
|
Merge branch 'cc-2238-deleting-a-playlist-from-right-list' into devel
|
2011-04-29 13:52:30 -04:00 |
martin
|
a2f8062404
|
Merge branch 'cc-2202-start-upload-button-vanishes' into devel
|
2011-04-29 13:21:51 -04:00 |
James Moon
|
676d64bbb6
|
cc-2202:start upload button vanishes
Fixed.
|
2011-04-27 15:33:32 -07:00 |
James Moon
|
d9ecb965bb
|
cc-2211:changes-to-playlist-not-shown
- removing some codes that aren't used.
- it deletes pl from the right list if the 'delete' button on
the left window is clicked.
|
2011-04-27 14:41:47 -07:00 |
James Moon
|
c322b8fb7f
|
cc-2238:deleting-a-playlist-from-right-list
fixed.
|
2011-04-27 14:22:50 -07:00 |
James Moon
|
44d599a00b
|
CC-2211:Changes to playlist not shown
Everything works fine except when adding new playlist.
When the new playlist gets created, it doesn't display
the page which contains the playlist.
|
2011-04-27 12:14:24 -07:00 |
James Moon
|
d9216eafe5
|
cc-2230:Overbooked show still palying
Fixed. Assigning it to Martin for a review
|
2011-04-26 13:36:21 -07:00 |
martin
|
9236f4941d
|
Merge branch 'master' of dev.sourcefabric.org:airtime into 1.8.1
Conflicts:
VERSION
airtime_mvc/application/configs/conf.php
|
2011-04-26 15:34:53 -04:00 |
Paul Baranowski
|
d14dc6cbe3
|
Merge commit '08864f79347e912e990f5ce0e86e5a8e739dc29d'
Conflicts:
VERSION
airtime_mvc/application/configs/conf.php
airtime_mvc/application/models/Shows.php
|
2011-04-25 18:49:51 -04:00 |
Paul Baranowski
|
219598ac06
|
CC-2225 airtime-clean-storage doesnt work
Forced the user to run the script as superuser.
|
2011-04-25 18:34:03 -04:00 |
Paul Baranowski
|
78ed3e2822
|
Merge commit 'bfb90eefd10226ca32cc4e3c39cbb34ab88178d8' into 1.8.1
|
2011-04-25 17:58:34 -04:00 |
Paul Baranowski
|
eb76bbe7f0
|
Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
VERSION
airtime_mvc/application/configs/conf.php
airtime_mvc/application/models/Playlist.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Shows.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/user/remove-user.phtml
airtime_mvc/public/js/airtime/schedule/add-show.js
airtime_mvc/public/js/airtime/schedule/schedule.js
install/airtime-upgrade.php
install/include/AirtimeInstall.php
python_apps/api_clients/api_client.py
utils/airtime-clean-storage
utils/airtime-clean-storage.php
utils/airtime-import
utils/airtime-import.php
|
2011-04-25 17:24:53 -04:00 |
Paul Baranowski
|
07633ea249
|
CC-2225 airtime-clean-storage doesnt work
CC-2224 airtime-import checks if you can write to the stor directory even if you are linking
Had to rewrite the airtime-clean-storage script.
|
2011-04-25 16:48:34 -04:00 |
martin
|
fe482eea29
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-04-25 15:40:59 -04:00 |
martin
|
b030ebaba7
|
Merge branch '1.8.1' of dev.sourcefabric.org:airtime into 1.8.1
Conflicts:
install/include/AirtimeInstall.php
|
2011-04-25 15:23:21 -04:00 |
martin
|
d46f38fa3f
|
Merge branch 'devel'
|
2011-04-25 15:11:01 -04:00 |
James Moon
|
bf34170f29
|
Temp commit.
It's not done, need to work more later.
|
2011-04-25 10:11:12 -07:00 |
martin
|
2fb289bf0a
|
cc-2193: debian database install fixes
-fixed
|
2011-04-22 23:02:18 -04:00 |
martin
|
f1a314aa0a
|
-update version string number for pypo
|
2011-04-22 01:05:47 -04:00 |
martin
|
42a5df0b57
|
-changed version string to 1.8.1
|
2011-04-22 01:04:16 -04:00 |
martin
|
cfcd612d47
|
-updated version string to 1.9.0-beta
|
2011-04-22 01:02:35 -04:00 |
martin
|
d57a308111
|
Merge branch '1.8.1'
|
2011-04-22 00:59:16 -04:00 |
martin
|
357bc64fe7
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-04-22 16:04:36 -04:00 |
martin
|
483848aa73
|
Merge branch 'cc-2227-repeating-weekday-show-bug' into 1.8.1
|
2011-04-22 00:59:01 -04:00 |
martin
|
05ff297cf3
|
CC-2227 repeating weekday show bug
-fixed syntax error
|
2011-04-22 00:58:01 -04:00 |
martin
|
6922c4d87c
|
CC-2193: Debian database install fixes
|
2011-04-22 00:55:31 -04:00 |
martin
|
9dc6d4c0ce
|
Merge branch 'cc-2227-repeating-weekday-show-bug' into 1.8.1
|
2011-04-21 22:01:23 -04:00 |
martin
|
3e560bb082
|
CC-2227: Repeating weekday show -> Add weekend -> first weekend after show does not have new shows
-Should be fixed
|
2011-04-21 21:50:50 -04:00 |
Naomi
|
a9d6bc3db5
|
CC-1799 : Live Studio Playout from media library (pytagsfs)
starting python script using pyinotify
|
2011-04-21 17:37:59 -04:00 |
martin
|
4b7ea32c7d
|
-syntax errors discovered by eclipse
|
2011-04-21 17:23:59 -04:00 |
James Moon
|
7a40161e7e
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-04-20 14:28:57 -07:00 |
James Moon
|
e31a1240f3
|
CC-2155:Can open the rebroadcast options without the 'Record'checkbox being selected - fixed
|
2011-04-20 14:10:58 -07:00 |
martin
|
1863882451
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-04-20 16:22:19 -04:00 |
martin
|
96551e0d91
|
CC-2186: Integration of a logger tool
-added upgrade support
|
2011-04-20 16:22:06 -04:00 |
James Moon
|
b53c9482c2
|
CC-2207:Rename 'Schedule Playlist' window to 'Schedule Media' - fixed
|
2011-04-20 12:42:38 -07:00 |
martin
|
0781f08148
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-04-20 00:46:18 -04:00 |
martin
|
171828f8ad
|
CC-2186: Integration of a logger tool
-initial check-in. Everything appears to be working...
|
2011-04-20 00:46:03 -04:00 |
Paul Baranowski
|
290d0b1b3f
|
Updated changelog and credits for 1.8
|
2011-04-19 11:12:16 -04:00 |
Naomi
|
3b1e79a5d8
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-04-18 17:50:24 -04:00 |
Naomi
|
52a84629da
|
airtime ini files weren't being updated on clean install.
|
2011-04-18 17:50:04 -04:00 |
martin
|
37c6ca2265
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2011-04-18 17:32:59 -04:00 |
martin
|
34bd145885
|
-updated version string to remove beta
|
2011-04-18 17:32:49 -04:00 |
Naomi
|
425e90beb6
|
INI files never created on fresh install.
|
2011-04-18 17:15:51 -04:00 |
Naomi
|
c0f9b31d7b
|
Merge branch 'master' of dev.sourcefabric.org:campcaster
|
2011-04-18 16:20:40 -04:00 |
Naomi
|
886d0d7d80
|
CC-2194 : Error when uninstalling pypo
not removing linked files to early.
|
2011-04-18 16:20:27 -04:00 |