7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
11acca32f9
Update comment at the top of conf.php to reflect config file
...
amalgamation
2015-01-15 15:36:22 -05:00
5c95f63f75
Clarify README slightly
2015-01-15 13:57:10 -05:00
b144a92c4d
Small fix to uninstall script
2015-01-15 13:52:12 -05:00
36c5d22e25
Made the process of switching from an old (pre-2.5.2) install to the new version smoother
2015-01-15 13:48:40 -05:00
f8ce7110ee
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-15 13:46:26 -05:00
89e760fd98
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-15 13:45:40 -05:00
7d0f1655d2
SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime
2015-01-15 13:44:48 -05:00
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
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
cfe3527b93
Fix link to user manual
2015-01-15 16:33:03 +00:00
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
a5cc529c4a
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-15 11:24:16 -05:00
19a1817159
Fix a bad reversion in the airtime-playout binary
2015-01-15 10:12:52 -05:00
c614f4d711
updated translation resources
2015-01-15 11:12:14 +00:00
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
b338c5cf0d
Fixed code for setting up user's web root
2015-01-14 20:15:47 -05:00
3452e13f5e
Added locale generation to the installer
2015-01-14 19:37:22 -05:00
380ec41201
Removed Skip this step buttons in web installer, removed opus plugins from requirements.apt files
2015-01-14 18:07:33 -05:00
f40d88b192
Updated installer to better accommodate running over existing installs
2015-01-14 16:53:19 -05:00
f7c1b6f755
Updated override process for existing airtime installs
2015-01-14 16:27:45 -05:00
df2576e5a0
Updated installer to better accommodate running over existing installs
2015-01-14 16:11:49 -05:00
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
609a46dfa3
Comment Airtime_Decorator_SuperAdmin_Only
2015-01-14 15:12:20 -05:00
c24a040689
Fixed my SuperAdmin_Only decorator
2015-01-14 14:34:14 -05:00
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
3247f6992a
Merge branch 'saas-pullreq77' into saas
2015-01-13 20:59:02 -05:00
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
8535c82b7f
Move changing ownership for cases when installing overtop of existing Airtime install
2015-01-13 17:40:31 -05:00
9e90e8af63
Added cc_show image_path and cc_show_instances description fields to schema
2015-01-13 17:07:23 -05:00
a0e5c975dd
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2015-01-13 15:50:38 -05:00
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
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
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
c264747a54
Removed silly logging statement
2015-01-13 15:25:36 -05:00
3908e82667
Add apt.sourcefabric.org to apt sources.list, remove incorrect packages from debian requirements.apt
2015-01-13 15:14:56 -05:00
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
b82391b931
Fixed spacing in README
2015-01-13 12:48:27 -05:00
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
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
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
e17b330186
Remove just previously added logging statements
2015-01-12 16:26:27 -05:00
c7c683966d
Logging
2015-01-12 16:21:53 -05:00
674b8c69e4
Add very basic uninstall script, move install script to root directory
2015-01-12 16:13:39 -05:00
7bdf34fcd1
Logging
2015-01-12 15:58:50 -05:00
8f0f69abd9
More logging
2015-01-12 15:45:33 -05:00
44b82fdd8a
More logging statements
2015-01-12 15:37:48 -05:00
85557d4886
Logging statements
2015-01-12 15:29:41 -05:00
ec601f916c
Add preventDefault call to final setup page
2015-01-12 14:58:15 -05:00
Albert Santoni
Duncan Sommerville
drigato
Albert Santoni
Daniel James
localizer