Commit Graph

4032 Commits

Author SHA1 Message Date
Paul Baranowski 6d39af6fb9 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	dev_tools/pr.sh
2011-04-15 14:46:07 -04:00
Paul Baranowski aab1ad16e1 CC-2166 : Packaging improvements
Fixed paths for pypo and the show recorder.

Pypo and the show recorder now read their paths from the INI files.
Note that liquidsoap and shell scripts do not yet read from the
INI files, and so that paths are hard-coded in those places.

On uninstall, no longer deleting INI files and the STOR directory.
Included a note to remove those by hand if they want them gone.

Fixed some bugs where not all directories were removed on uninstall.

Fixed bugs in the Show Recorder install where it was adding directories
that it didnt need.
2011-04-15 14:45:10 -04:00
Naomi b80c0ed65a Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-04-15 13:38:56 -04:00
Naomi dfa508a9ea changing paths with new folder structure 2011-04-15 13:25:52 -04:00
Naomi 428357e5f8 changing include paths for new folder structure. 2011-04-15 12:37:30 -04:00
martin 0320c9a136 -fix to dev_tools/pr.sh path 2011-04-15 12:35:57 -04:00
martin be26c9a9ba Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-15 12:32:43 -04:00
martin 6db16bc6d1 -update paths logs for utils in dev_tools/ 2011-04-15 12:27:25 -04:00
martin e48f044e56 -CC-2192: Schedule sent to pypo is not sorted by start time. 2011-04-15 12:26:59 -04:00
Naomi 4814d90824 CC-2157 : Enable OGG streams by default, not MP3, due to lame distribution problems 2011-04-15 12:14:49 -04:00
Naomi b992801a45 hiding/showing show overflow message properly. 2011-04-15 12:11:06 -04:00
Naomi e853a6ff6e need individual rows/total rows error tracker. 2011-04-15 11:22:40 -04:00
Naomi 4d8f434059 have to start each loop as valid now. 2011-04-15 11:13:42 -04:00
Naomi eb312ae454 fixes to template, javascript to handle error arrays. 2011-04-15 10:51:06 -04:00
Naomi 0982405d4c better form validation for rebroadcast date/times 2011-04-15 10:23:08 -04:00
Naomi c3a02e2569 some fixes to display rows in form. 2011-04-15 10:04:16 -04:00
martin d68a8369c8 -changed version string to "1.8.0-beta" 2011-04-14 23:11:40 -04:00
martin 7d2c2f65f2 -fix invalid path includes 2011-04-14 23:08:55 -04:00
Paul Baranowski 03ab7edea0 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-14 18:55:15 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00
martin d2239b827d CC-1805: Ability to edit a show
-removed (now) redundant moveScheduledShowContent function
2011-04-14 18:03:24 -04:00
martin b6e235b8fe Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-14 17:57:20 -04:00
martin d5b914fa84 CC-1805: Ability to edit a show
-Fixed bug with scheduled data start time not shifting with show instance start time
-What "tab" now automatically open when form appears.
2011-04-14 17:57:08 -04:00
Naomi 379e70ff23 CC-2169 : All logging should go to /var/log
pypo-liquidsoap log now in its folder
2011-04-14 17:16:50 -04:00
Naomi d69723f910 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-04-14 16:03:37 -04:00
Naomi e5f2e8d044 CC-2169 : All logging should go to /var/log
moving pypo/recorder logs to folder /var/log/airtime
2011-04-14 16:03:23 -04:00
Paul Baranowski 514777e8d2 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	install/airtime-install.php
2011-04-14 15:07:12 -04:00
Paul Baranowski 4af55027ad Added const values for the names of the INI files.
Also verify with the user if they want to overwrite their INI files if they are
re-installing.
2011-04-14 15:04:44 -04:00
martin 88362a2c52 CC-2179: Creating a record + rebroadcast show with no rebroadcast times causes DB error
-fixed
2011-04-14 14:57:52 -04:00
martin 5a7ebc8a8b Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-14 14:18:05 -04:00
martin bf146e7f85 -commented some functions
-removed usage of "current_timestamp" in postgresql queries in favour
of php time.
2011-04-14 14:17:56 -04:00
Naomi 6899dca0a3 removing confusing redundant imports 2011-04-14 14:01:14 -04:00
Naomi 804f9c66b9 require order screwed up. 2011-04-14 13:47:50 -04:00
Naomi fc8f9f18fc CC-2176 : Allow up to 10 rebroadcasts, add in the plus button with hidden elements
tested with editing shows.
2011-04-14 12:32:25 -04:00
Naomi 5b79a9f876 CC-2176 : Allow up to 10 rebroadcasts, add in the plus button with hidden elements
tested with adding shows, need to test editing shows.
2011-04-14 11:31:44 -04:00
martin ac3853c0fb CC-2175: Overbooking: Cut off shows when they are done
-on-air light now turns off when show finishes before a song is able to finish. (before waited until song completed)
2011-04-14 00:45:20 -04:00
martin 33b24b581c CC-2175: Overbooking: Cut off shows when they are done
-fixed
2011-04-14 00:20:19 -04:00
martin 7e6ce1514f -fixed airtime install not working. 2011-04-13 18:22:56 -04:00
martin f6abd30551 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-13 17:00:04 -04:00
martin 5b0121712b CC-2181: No cancel button on Update show
-Pressing "Close" will now clear the form
-Editing show will now hide "+ Show" button
2011-04-13 16:59:53 -04:00
Naomi f478a27a06 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-04-13 15:11:20 -04:00
Naomi 492c76cb2f CC-2176 : Allow up to 10 rebroadcasts, add in the plus button with hidden elements
creating elements inside for loop to be less redundant.
2011-04-13 15:11:06 -04:00
Paul Baranowski 782f00b32f Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-13 14:20:54 -04:00
Naomi 32c9d9b7f2 nudge progress bar up a bit for new css. 2011-04-13 14:13:52 -04:00
Paul Baranowski 3aac24b42b Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-13 14:03:32 -04:00
Paul Baranowski aca157f0ee CC-2170 Add option to airtime-install to install with or without audio samples
Now we dont install audio samples by default.
2011-04-13 14:03:23 -04:00
lukabazuka 17166fdf71 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-13 19:24:03 +02:00
lukabazuka 4c4e75a38f CSS modifications for issues CC-2039, CC-2160 and CC-2174 2011-04-13 19:23:38 +02:00
martin 2148de0e92 CC-2149: Adjustments for DEB packaging
-Done
2011-04-13 12:07:00 -04:00
martin 5f512d47ff Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-13 11:24:33 -04:00