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
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
fe482eea29
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-25 15:40:59 -04:00
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
d46f38fa3f
Merge branch 'devel'
2011-04-25 15:11:01 -04:00
bf34170f29
Temp commit.
...
It's not done, need to work more later.
2011-04-25 10:11:12 -07:00
2fb289bf0a
cc-2193: debian database install fixes
...
-fixed
2011-04-22 23:02:18 -04:00
f1a314aa0a
-update version string number for pypo
2011-04-22 01:05:47 -04:00
42a5df0b57
-changed version string to 1.8.1
2011-04-22 01:04:16 -04:00
cfcd612d47
-updated version string to 1.9.0-beta
2011-04-22 01:02:35 -04:00
d57a308111
Merge branch '1.8.1'
2011-04-22 00:59:16 -04:00
357bc64fe7
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-22 16:04:36 -04:00
483848aa73
Merge branch 'cc-2227-repeating-weekday-show-bug' into 1.8.1
2011-04-22 00:59:01 -04:00
05ff297cf3
CC-2227 repeating weekday show bug
...
-fixed syntax error
2011-04-22 00:58:01 -04:00
6922c4d87c
CC-2193: Debian database install fixes
2011-04-22 00:55:31 -04:00
9dc6d4c0ce
Merge branch 'cc-2227-repeating-weekday-show-bug' into 1.8.1
2011-04-21 22:01:23 -04:00
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
a9d6bc3db5
CC-1799 : Live Studio Playout from media library (pytagsfs)
...
starting python script using pyinotify
2011-04-21 17:37:59 -04:00
4b7ea32c7d
-syntax errors discovered by eclipse
2011-04-21 17:23:59 -04:00
7a40161e7e
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-20 14:28:57 -07:00
e31a1240f3
CC-2155:Can open the rebroadcast options without the 'Record'checkbox being selected - fixed
2011-04-20 14:10:58 -07:00
1863882451
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-20 16:22:19 -04:00
96551e0d91
CC-2186: Integration of a logger tool
...
-added upgrade support
2011-04-20 16:22:06 -04:00
b53c9482c2
CC-2207:Rename 'Schedule Playlist' window to 'Schedule Media' - fixed
2011-04-20 12:42:38 -07:00
0781f08148
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-20 00:46:18 -04:00
171828f8ad
CC-2186: Integration of a logger tool
...
-initial check-in. Everything appears to be working...
2011-04-20 00:46:03 -04:00
290d0b1b3f
Updated changelog and credits for 1.8
2011-04-19 11:12:16 -04:00
3b1e79a5d8
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-04-18 17:50:24 -04:00
52a84629da
airtime ini files weren't being updated on clean install.
2011-04-18 17:50:04 -04:00
37c6ca2265
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-18 17:32:59 -04:00
34bd145885
-updated version string to remove beta
2011-04-18 17:32:49 -04:00
425e90beb6
INI files never created on fresh install.
2011-04-18 17:15:51 -04:00
c0f9b31d7b
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-04-18 16:20:40 -04:00
886d0d7d80
CC-2194 : Error when uninstalling pypo
...
not removing linked files to early.
2011-04-18 16:20:27 -04:00
59c1e02a98
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-18 15:57:42 -04:00
6f9926eba2
CC-2195: Remove global php.ini changes from install guide and Airtime
...
-done
2011-04-18 15:57:32 -04:00
6b1e6b87a0
better message about backing up.
2011-04-18 15:41:11 -04:00
fe59967f51
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-04-18 15:40:20 -04:00
9e96ec9da4
reloading config after ini values are changed
2011-04-18 15:28:48 -04:00
a27885139c
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-18 14:51:57 -04:00
c1dd1e7415
CC-2198: airtime-pypo-stop airtime-pypo-start are ineffective
...
-fixed
2011-04-18 14:51:44 -04:00
2c7bf676a3
creating default storage directory in airtime
2011-04-18 14:42:41 -04:00
b56efc54bf
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-04-18 14:19:49 -04:00
b44be9fd6a
upgrading with new file locations
2011-04-18 14:11:31 -04:00
fab68dfad1
CC-2203: Search results: "Delete" should be at the bottom of the list and should have a confirmation
...
-Fixed
2011-04-18 12:43:04 -04:00
d7bb00dc20
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-04-18 12:01:22 -04:00
7a3fbe9ac7
CC-2196: Update a Live show with invalid data, uncheck the Record checkbox
...
-fixed
2011-04-18 12:01:02 -04:00
23105b9d67
CC-2184 : Hardcoded CSS path should be relative path instead
...
using baseURL zend provides in path.
2011-04-18 11:02:09 -04:00
114fe1ad3f
CC-2166 Packaging improvements
...
A fix to prevent updating values in INI files on install.
2011-04-15 18:37:24 -04:00
173d82007f
CC-2166 Packaging improvements
...
Added command line options to the install process to overwrite or
preserve the existing config files.
Added the pypo-start/stop and recorder-start/stop symlinks to /usr/bin.
Renamed pypo-start.py to airtime-pypo-start.
Renamed pypo-stop.py to airtime-pypo-stop.
Renamed recorder-start.py to airtime-show-recorder-start.
Renamed recorder-stop.py to airtime-show-recorder-stop.
Renamed testrecordscript.py to recorder.py
2011-04-15 18:23:51 -04:00
Paul Baranowski
martin
James Moon
Naomi
James Moon