Commit graph

14079 commits

Author SHA1 Message Date
drigato
89e760fd98 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-15 13:45:40 -05:00
drigato
7d0f1655d2 SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime 2015-01-15 13:44:48 -05:00
Albert Santoni
4ba4559f01 Merge pull request #85 from danielhjames/2.5.x
2.5.x Fix link to user manual
2015-01-15 13:30:48 -05:00
Albert Santoni
ee9163fa8e 2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
2015-01-15 12:42:36 -05:00
Daniel James
cfe3527b93 Fix link to user manual 2015-01-15 16:33:03 +00:00
Daniel James
f9a006e11b Merge branch '2.5.x' of git://github.com/sourcefabric/Airtime into 2.5.x
Conflicts:
	debian/changelog
	debian/compat
	debian/control
	debian/copyright
	debian/etc/airtime.ini
	debian/etc/apache.vhost.tpl
	debian/install
	debian/po/templates.pot
	debian/postinst
	gen-snapshot.sh
2015-01-15 16:26:16 +00:00
Duncan Sommerville
a5cc529c4a Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-01-15 11:24:16 -05:00
Duncan Sommerville
19a1817159 Fix a bad reversion in the airtime-playout binary 2015-01-15 10:12:52 -05:00
localizer
c614f4d711 updated translation resources 2015-01-15 11:12:14 +00:00
Duncan Sommerville
5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Duncan Sommerville
b338c5cf0d Fixed code for setting up user's web root 2015-01-14 20:15:47 -05:00
Duncan Sommerville
3452e13f5e Added locale generation to the installer 2015-01-14 19:37:22 -05:00
Duncan Sommerville
380ec41201 Removed Skip this step buttons in web installer, removed opus plugins from requirements.apt files 2015-01-14 18:07:33 -05:00
Duncan Sommerville
f40d88b192 Updated installer to better accommodate running over existing installs 2015-01-14 16:53:19 -05:00
Duncan Sommerville
f7c1b6f755 Updated override process for existing airtime installs 2015-01-14 16:27:45 -05:00
Duncan Sommerville
df2576e5a0 Updated installer to better accommodate running over existing installs 2015-01-14 16:11:49 -05:00
drigato
754c7bfc64 Removed code that was deleting the cloud_file database records in the case of
station termination. The database will remain as is in case we have to restore
the files.
2015-01-14 15:15:23 -05:00
Albert Santoni
609a46dfa3 Comment Airtime_Decorator_SuperAdmin_Only 2015-01-14 15:12:20 -05:00
Albert Santoni
c24a040689 Fixed my SuperAdmin_Only decorator 2015-01-14 14:34:14 -05:00
Albert Santoni
d5b969f94f Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
Albert Santoni
3247f6992a Merge branch 'saas-pullreq77' into saas 2015-01-13 20:59:02 -05:00
Albert Santoni
c4d3a8fa62 Massive simplification of the GeneralPreferences dialog
* The purpose of this was so that we can use Zend_Form_Element
  decorators, which I need.
2015-01-13 20:51:46 -05:00
Duncan Sommerville
8535c82b7f Move changing ownership for cases when installing overtop of existing Airtime install 2015-01-13 17:40:31 -05:00
Duncan Sommerville
9e90e8af63 Added cc_show image_path and cc_show_instances description fields to schema 2015-01-13 17:07:23 -05:00
Duncan Sommerville
a0e5c975dd Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2015-01-13 15:50:38 -05:00
drigato
a4461dc79a Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 15:50:20 -05:00
Duncan Sommerville
9f6bd33076 Fix returning stor directory from database in uninstall, work on getting lxc-bootstrap working with debian 2015-01-13 15:50:01 -05:00
drigato
2185fc9ca4 SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id 2015-01-13 15:49:57 -05:00
drigato
c264747a54 Removed silly logging statement 2015-01-13 15:25:36 -05:00
Duncan Sommerville
3908e82667 Add apt.sourcefabric.org to apt sources.list, remove incorrect packages from debian requirements.apt 2015-01-13 15:14:56 -05:00
drigato
d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
Duncan Sommerville
b82391b931 Fixed spacing in README 2015-01-13 12:48:27 -05:00
Duncan Sommerville
e7490d6b2d Fixed lxc-bootstrap to make a shallow clone, updated uninstall script, added initial debian wheezy requirements file 2015-01-13 12:28:36 -05:00
Albert Santoni
caf37e1b87 CC-5975: Default fade-in/out, and crossfade time validators don't work
* Fixed the number formatting and validation in the preferences and streaming preferences
  (the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
  crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
2015-01-13 12:18:57 -05:00
Albert Santoni
9cfcaf2ffd SAAS-537: Fixed the week view of the schedule widgets
* Also improved the instructions inline for how to use them...
  (this is a stop-gap measure until we get a real iframe widget)
* ALSO renamed the field HTML Code since it's not JS! (it was
  misleading before)
2015-01-12 22:29:21 -05:00
drigato
e17b330186 Remove just previously added logging statements 2015-01-12 16:26:27 -05:00
drigato
c7c683966d Logging 2015-01-12 16:21:53 -05:00
Duncan Sommerville
674b8c69e4 Add very basic uninstall script, move install script to root directory 2015-01-12 16:13:39 -05:00
drigato
7bdf34fcd1 Logging 2015-01-12 15:58:50 -05:00
drigato
8f0f69abd9 More logging 2015-01-12 15:45:33 -05:00
drigato
44b82fdd8a More logging statements 2015-01-12 15:37:48 -05:00
drigato
85557d4886 Logging statements 2015-01-12 15:29:41 -05:00
Duncan Sommerville
ec601f916c Add preventDefault call to final setup page 2015-01-12 14:58:15 -05:00
drigato
02e4c18931 SAAS-531: Finalize S3 folder hierarchy 2015-01-12 14:50:42 -05:00
Duncan Sommerville
d07195f048 Rework redirect to config page at the end of the web install 2015-01-12 14:40:22 -05:00
Duncan Sommerville
23f33cd8da Reorder final setup steps 2015-01-12 13:41:39 -05:00
Duncan Sommerville
2b882cc313 Reorder final setup steps 2015-01-12 12:45:52 -05:00
Duncan Sommerville
0fcac545e6 For now, just prompt users to start background services at the end of the install process 2015-01-12 10:53:31 -05:00
Duncan Sommerville
bf1355a203 Yet another attempt to run upstart jobs as unprivileged user 2015-01-12 09:48:08 -05:00
Albert Santoni
f0bad70cee Merge branch '2.5.x' into saas-pullreq77
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/ApiController.php
2015-01-09 13:10:54 -05:00