Commit Graph

6226 Commits

Author SHA1 Message Date
James 2ef6d230f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-17 15:39:50 -05:00
James bb1cdc4a8f SAAS-196: Stats: Check if easy_install installation method detection
is working properly

- fixed
2012-02-17 15:39:31 -05:00
Naomi Aro 09ae26a531 CC-3174 : showbuilder
fixing bug moving item to beginning of show
2012-02-17 12:19:42 +01:00
Naomi Aro ac11d8bcf6 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
Naomi Aro 9bed56a2c3 CC-3174 : showbuilder
incorrect variable name fixed for updating last scheduled timestamp.
2012-02-17 11:14:44 +01:00
Martin Konecny e38682b9e4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-16 14:59:23 -05:00
Martin Konecny ba01c2b5d7 Merge branch '2.0.x' into devel 2012-02-16 14:59:11 -05:00
Martin Konecny 8f4eedd8b8 -remove unneeded file 2012-02-16 14:58:34 -05:00
Martin Konecny bea9c86679 CC-3332: Check if install full script still needs to install libogg-ocaml and libvorbis-ocaml
-fixed
2012-02-16 14:58:25 -05:00
Naomi Aro b2d0565ec4 CC-3174 : showbuilder
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +01:00
Naomi Aro e1d5d6de73 CC-3174 : showbuilder
checking modification time before deleting items.
Throws a ScheduleOutdatedException
2012-02-16 16:29:11 +01:00
Naomi Aro f14ebce239 CC-3174 : showbuilder
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
2012-02-15 18:27:59 +01:00
Daniel 190490d6f4 CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05:00
Naomi Aro b1fbeeb448 CC-3174 : showbuilder
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
Daniel 14a9225b97 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-14 18:12:51 -05:00
Daniel 14cd9ed0e9 CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which 	I've set ApiController and PluploadController todo on receipt of error code.
2012-02-14 18:12:29 -05:00
Martin Konecny 32f09fb18d -airtime-check-system should read domain from /etc/airtime/airtime.conf 2012-02-14 17:18:11 -05:00
Martin Konecny 443b55302c -update version strings from 2.0.1 -> 2.1.0 2012-02-14 15:52:52 -05:00
Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
Martin Konecny 5862324da9 CC-3326: Make /etc/monit/conf.d is empty of any old Airtime files before upgrading!
-fixed
2012-02-14 09:37:20 -05:00
Martin Konecny 76d8e22baf CC-3325: Airtime 2.0.0 upgrade script makes reference to 2.0.1 files
-fixed
2012-02-14 09:35:37 -05:00
Martin Konecny 7fd8ba4ffa -updated changelog for 2.0.1 2012-02-14 08:57:05 -05:00
Naomi Aro eba84ee878 CC-3174 : showbuilder
disabling editing of past/current shows.
2012-02-14 14:44:46 +01:00
Naomi Aro b7b1c401f6 CC-3174 : showbuilder
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
2012-02-14 13:33:25 +01:00
Naomi Aro 4f5b5d8562 CC-3174 : Show Content Builder
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
Martin Konecny 238abd6f87 CC-3324: Uncaught TypeError: Cannot read property 'length' of undefined - if watched dir not defined 2012-02-13 12:24:55 -05:00
Martin Konecny 3df396756f CC-3323: Don't send description text to Full Calendar since it is never used.
-Done
2012-02-13 12:10:23 -05:00
Martin Konecny fbd6df1986 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade. 2012-02-12 15:31:17 -05:00
Martin Konecny 0424a7f1d1 -We don't want any of our python services running at install time. Disable them early on. 2012-02-12 11:44:23 -05:00
Martin Konecny 8493180243 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
-use clearstatcache function
2012-02-12 11:43:34 -05:00
Martin Konecny 5059d13156 -handle case gracefully when pypo hasn't registered with Airtime server yet. 2012-02-12 01:34:53 -05:00
Martin Konecny ccd843a35a CC-3322: PHP warning during 2.0.1 upgrade process
-get timezone properly
2012-02-12 01:34:10 -05:00
Martin Konecny 585ae5ad20 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
-try touching file
2012-02-12 01:21:28 -05:00
Martin Konecny caf0f5fedd CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
-try clearing apc cache after upgrading web files
2012-02-12 01:16:32 -05:00
Martin Konecny 4254a45e74 CC-3322: PHP warning during 2.0.1 upgrade process 2012-02-12 01:09:35 -05:00
Martin Konecny 61f57bb88a -we should always be using our custom php.ini script on upgrades 2012-02-12 00:42:02 -05:00
Martin Konecny e5e8621c9e Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-11 23:54:05 -05:00
Martin Konecny 885572b36d CC-3321: Multiple messages are sent to Pypo via RabbitMq at one time, causing multiple telnet connections to Liquidsoap.
-Fixed
2012-02-11 23:53:43 -05:00
paul.baranowski 7e223aebae CC-3265: Move airtime-nuke.sh to utils. Done. Also added user message explaining what the script does and prevent non-root users from executing the script. 2012-02-11 19:27:20 +01:00
james 4106de4e1a CC-3319: Show recorder process FAILED when upgrading 2.0.0 to 2.0.1
- 2.0.1 upgrade folder is created
2012-02-11 11:56:19 -05:00
Martin Konecny eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-fixed
2012-02-10 18:43:40 -05:00
Martin Konecny 33b594c39a CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-syntax error
2012-02-10 14:58:48 -05:00
Martin Konecny ccb942838a CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-initial commit
2012-02-10 14:53:22 -05:00
Martin Konecny babfa1830c CC-3317: PHP Undefined variable error in SystemstatusController
-fixed
2012-02-10 13:12:18 -05:00
Naomi Aro 941da1fe44 CC-3174 : showbuilder
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
2012-02-09 23:41:12 +01:00
Martin Konecny 1dd49b8a11 CC-3312: Upgrade scripts for 2.0.1
-Done
2012-02-09 16:22:59 -05:00
Naomi Aro fdd962f5ce CC-3174 : showbuilder
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00
Daniel a4a41f301f Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-09 15:05:36 -05:00
Daniel b603726a39 CC-3289: Widgets should have a version string so users can make sure widgets are up to date
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
2012-02-09 15:04:52 -05:00
Naomi Aro 4691799326 Merge branch 'devel' into CC-3174
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
2012-02-09 19:41:31 +01:00