d1ac78be68
Fix for station logo....again...
2015-06-10 16:01:16 -04:00
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
c18e728583
Merge branch 'saas-installer-albert' into saas-dev
2015-06-10 15:03:11 -04:00
8e8f8aa55b
Radio Page Code Review Changes
...
Defined a SAAS_PRODUCT_BRANDING_NAME constant.
Defined constants for default station logo.
2015-06-10 12:23:19 -04:00
6528a9b0a3
SAAS-843: Create Embeddable Schedule Widget View
...
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
2015-06-04 12:00:23 -04:00
63b726e6b2
SAAS-848 - Modify SoundCloud code to use external redirect
2015-06-04 11:38:46 -04:00
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
6ca0e340a4
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
027adc7749
Three bugfixes
...
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
11c6818e61
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
a2a9e54553
Merge branch 'saas-dev' into saas-tunein
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
cf24c141fd
SAAS-772: Send metadata to Tunein
...
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
2015-05-13 16:05:37 -04:00
fc36ff5797
Updated user manual constant to new manual url
2015-04-30 14:51:35 -04:00
59b90360a1
SAAS-755 - Updated User Manual link
2015-04-30 11:52:23 -04:00
1515984664
Merge remote-tracking branch 'origin/saas-suspend' into saas
2015-04-17 15:23:40 -04:00
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
57cd2eda13
bad merge
2015-03-31 18:21:25 -04:00
220f21ab22
Merge branch 'saas' into saas-embed-player
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
669d980565
Fixed conf.php
2015-03-25 17:35:43 -04:00
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
3d03f837d2
Trial->Paid conversion tracking with GTM
...
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
2015-03-24 10:11:25 -04:00
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
40d6249229
Merge branch 'saas' into saas-embed-player
2015-02-20 14:47:57 -05:00
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
73cb14155c
Replace the version hashing with git revision hashing to fix browser
...
caching
2015-02-19 10:01:09 -05:00
08c53a9292
Fixed incorrect authorization for ShowImage API
2015-02-18 18:34:52 -05:00
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -05:00
d46f4a52eb
Installer tweaks and a pypo bugfix
...
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
2015-02-10 18:06:46 -05:00
2cf0f7da7a
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-02-06 16:06:32 -05:00
2a9790adf3
Backport ACL REST permission fix
2015-02-06 16:05:51 -05:00
cee0ff4881
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Default to production config files if dev env specific files are not
found.
Fix analyzer unit tests.
2015-02-05 14:31:20 -05:00
e2ff452b8a
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
2015-02-05 10:15:48 -05:00
826ae17552
SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful
2015-02-04 15:09:27 -05:00
c6fc184559
Merge branch 'saas' into saas-cloud-storage-config-per-dev-env
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-04 13:36:35 -05:00
7b3f9af04c
SAAS-560: Deploy separate cloud storage config files for each development environment
...
Changed analyzer upstart to take the cloud storage config file as a command line option
Dropped the dev env portion from the rabbitmq-analyzer.ini filename
2015-02-03 15:55:47 -05:00
f69e5afbff
SAAS-576: Fixed the Sentry data sanitizer and moved DSN into a config file
2015-02-02 14:42:20 -05:00
5040eb498d
SAAS-560: Deploy separate cloud storage config files for each development environment
2015-02-02 12:54:56 -05:00
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
134ade877c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
bade613e80
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-01-22 11:19:25 -05:00
2c2f7ebc5f
Initial commit for update to ACL for REST module; NEEDS TESTING
2015-01-21 15:34:15 -05:00
c5a60d2f09
Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise
2015-01-19 15:05:13 -05:00
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -05:00
36c889a3a2
Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer
2015-01-15 17:34:33 -05:00
791466b023
Fixes for code review https://github.com/sourcefabric/Airtime/pull/84
2015-01-15 16:33:33 -05:00
11acca32f9
Update comment at the top of conf.php to reflect config file
...
amalgamation
2015-01-15 15:36:22 -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
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
df2576e5a0
Updated installer to better accommodate running over existing installs
2015-01-14 16:11:49 -05:00
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
1ddda846d6
Updates to running background services as web user
2015-01-08 18:52:58 -05:00
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
9c324c1b6f
Updated configuration checklist
2014-12-19 11:58:47 -05:00
32f40f3dc8
Updated configuration checklist to include running services
2014-12-19 11:44:23 -05:00
a0f5e33855
Added "Help Center" link to Help menu for Josh
2014-12-17 16:10:04 -05:00
ec1c8669c8
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-17 14:14:03 -05:00
1de326283e
SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
...
Not quite done.
2014-12-16 18:47:42 -05:00
4043ebfd25
More work on monitless installer
2014-12-16 16:26:58 -05:00
ff0a685243
Updated propel models
2014-12-16 14:20:28 -05:00
4dfd49d12c
Initial work on monitless installation
2014-12-16 12:24:41 -05:00
09c30bde1b
Regenerated Propel models because some fields and methods were missing.
2014-12-16 10:53:39 -05:00
8f99595f54
Added button to redirect to login page from config-check page on success
2014-12-15 09:49:00 -05:00
891cfdb48e
SAAS-517: Create Provisioning controller with a terminate endpoint
2014-12-11 13:35:34 -05:00
f5b4928538
More work on web installer
2014-12-09 17:48:16 -05:00
9fed113f74
More work on setup/installation process
2014-12-03 18:04:47 -05:00
cf9eabbc74
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
bf91677f91
SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
...
Fixed reading credentials in from cloud_storage.conf
2014-12-02 09:06:28 -05:00
7c0a25be7f
SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
2014-12-01 21:05:46 -05:00
acaf47c592
More work on web setup form
2014-12-01 15:49:53 -05:00
8f46b4dca7
More work on new installer
2014-11-28 15:30:11 -05:00
8601452c71
Merge conflict
2014-11-27 15:46:39 -05:00
8fbe7dd649
Report an error and die if amazon.conf is missing
2014-11-26 17:50:59 -05:00
884a4c493d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
f08535cc10
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
bec62ec906
SAAS-496: Create a provisioning controller with a terminate endpoint
2014-11-25 16:04:08 -05:00
4d8b32556b
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:24:38 -05:00
10db978a2b
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-11 16:30:50 -05:00
5cf5ff4fa1
code cleanup
2014-11-11 16:29:54 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
8fc7178d82
Added several global constants for reoccurring strings in Airtime to aid dynamic translations
2014-11-06 18:40:19 -05:00
62a915f109
Added global define for application name
2014-11-06 11:57:05 -05:00
e24b4f43fd
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
6adb33e89b
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:24:03 -05:00
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
940d74ce39
Files auto-updated by Propel
2014-09-16 18:26:18 -04:00
ace883c975
Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04
...
Conflicts:
airtime_mvc/application/configs/application.ini
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/models/Cache.php
2014-08-28 17:01:03 -04:00
0ccc7e7dc9
SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04
...
The Bootstrap.php in the modules directory didn't like
short php tags.
2014-08-28 16:52:47 -04:00
0203be0f10
Revert zend routing changes to fix uploads
2014-08-01 15:30:37 -04:00
1c676dee6d
Fix user settings again for Super Admins, also Zend routing tweak
...
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
2014-08-01 12:50:02 -04:00
aa8a26271c
Fix zend routing on Trusty (weird error due to REST module)
2014-08-01 11:51:20 -04:00
41ff0cce67
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Using Class Table Inheritance - delegate behaviour, created a cloud_file
table to store cloud files
2014-07-23 15:22:42 -04:00
72841de714
CC-5895: Upgrade Propel to 1.7
...
Used composer to download Propel 1.7
The Propel library will no longer be stored in the Airtime repo
2014-07-23 15:03:51 -04:00
039a51121b
CC-5885: Factor out cloud storage code into separate class
2014-07-11 16:16:30 -04:00
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -04:00
d92e5197e1
Design and overhaul of Account Plans screen
...
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
25e4036d2f
typo
2014-06-20 17:29:56 -04:00
5d0ea2d015
Add billing section to main menu
2014-06-20 17:25:05 -04:00
497841225b
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 16:54:41 -04:00
faa12c8065
Super Admin edit page points to billing now
...
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
7f6fc7770a
Added Super Admin role and WHMCS login
2014-06-17 17:40:55 -04:00
81ceafbfbd
whmcs client form
2014-06-12 17:54:20 -04:00
2d6748457c
Remove database credentials from application.ini
2014-05-02 15:50:37 -04:00
e7482e52f7
Double equals typo *ducks*
2014-04-22 15:56:29 -04:00
dc27465b21
Fix config parsing for dev_env
...
Conflicts:
airtime_mvc/application/configs/conf.php
2014-04-22 15:29:21 -04:00
5971f51b53
CC-5781: Upgrade script for new storage quota implementation
...
First draft of an upgrade controller
2014-04-10 07:12:31 -04:00
8f7ecafcf6
CC-5709: Airtime Analyzer
...
* A bunch of changes that somehow didn't make it into my last commit...
* confused
2014-03-21 14:03:17 -04:00
aba2fb44d1
CC-5701: Airtime File API
...
-put and delete actions working
2014-03-03 11:21:25 -05:00
64c1dd2c1e
CC-5701: Airtime File API
...
Beginnings of fil rest api
index, get, post actions working without authentication
2014-02-27 17:11:17 -05:00
fe9beec778
CC-5651: Unit Test the Scheduler
...
* Added runtests.sh script for unit tests
* Use the airtime_test database config in Config.php, propel
* First unit test passes! :-)
2014-01-13 11:43:17 -05:00
4fd37a4fa0
Merge branch '2.4.x' into ryerson-history
2013-08-30 16:07:41 -04:00
429cdeeffb
filtering by a host's show so they can edit their own playout history.
2013-08-28 19:37:46 -04:00
653a6384b9
creating a separate controller for playouthistory templates.
2013-08-28 18:25:46 -04:00
969889859b
improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp.
2013-08-28 13:07:55 -04:00
8eecbb18c0
propel rename done for template fields, template name input.
2013-07-29 17:21:46 -04:00
16581088d9
working on configuring an item template UI.
...
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
69afc715d1
creating templates for validation.
2013-07-22 18:11:44 -04:00
328c1f3cac
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
a569d2f3f5
CC-5163 : Waveform - Hard coded api path will cause fail to open file when airtime is put under subfolder
2013-05-22 15:33:49 -04:00
23c29455d9
Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values
2013-02-05 13:18:25 -05:00
973a415164
-fix installation error
2013-01-15 15:37:26 -05:00
8c19384d32
- CRLF fix
2013-01-14 16:21:02 -05:00
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -05:00
a55bc9973c
- temp commit
2013-01-14 14:43:02 -05:00
dcf3526000
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-10 18:09:00 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
dd5882984e
CC-4736: Let non-admin users update their user info
...
-done but needs design
2012-12-10 16:55:44 -05:00
2f0c6b702a
CC-1960: Internationalize Airtime / Support translations
...
- created locale table
- create locale model
- set default locale in pref table
2012-11-29 18:21:03 -05:00
57fdab0ddf
CC-1960: Internationalize Airtime / Support translations
...
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
2012-11-20 11:33:37 -05:00
8338152876
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all navigation strings
2012-11-20 11:33:37 -05:00
7300b608cf
Merge branch 'cc-4661-listener-statistics' into devel
...
Conflicts:
python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
9112a8d0b1
CC-4661: Listener Statistics
...
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
3af3cd5870
CC-4661: Listener Statistics
...
- frontend part
2012-11-02 17:00:38 -04:00
3478797744
cc-4661: new database tables for listener stats
2012-11-02 11:32:02 -04:00
4cca80fe44
Added schema changes
2012-10-31 16:23:12 -04:00
dc361c1136
Aligned constants
2012-10-26 13:10:08 -04:00
dea764b8fd
cc-3936: added warning for metadata attributes that are not defined in constants.php
2012-08-27 14:03:22 -04:00
dcfa865f7d
cc-3936:
...
Ran propel-gen to commit schema changes.
2012-08-24 10:20:58 -04:00
0ce4c1000b
replace tabs with spaces
...
-also remove \r characters
2012-08-21 11:16:07 -04:00
51ebae3de9
Make sure we are using the Library controller for the Library page
2012-08-21 11:12:33 -04:00
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
2a1ea33362
CC-1665: Scheduled stream rebroadcasting and recording
...
-store Liquidsoap metadata in cc_schedule instead of cc_webstream
2012-08-17 15:07:58 -04:00
3735579378
-remove cc_access table and gunid usage
2012-07-26 14:49:32 -04:00
a16a1f5033
CC-1665: Scheduled stream rebroadcasting and recording
...
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
31176f525e
CC-1665: Scheduled stream rebroadcasting and recording
...
-started working on UI
2012-07-26 14:41:40 -04:00
1f3cbd8aba
CC-84: Smart Playlists
...
- introducing smart-block
2012-07-25 12:44:37 -04:00
722e470f6f
CC-84: Smart Playlists
...
- changed playlist controller to also handle Blocks
- created new view for smart blocks
2012-07-25 11:00:46 -04:00
9516771099
Merge branch 'cc-84-smart-playlist' into devel
...
Conflicts:
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Scheduler.php
2012-07-18 12:23:57 -04:00
4ebcb1b1f9
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Playlist.php
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
3bce6b4999
CC-84: Smart Playlists
...
- db inserting into cc_playlistcriteria
- error validations
2012-07-12 17:58:44 -04:00
bd51b4db02
CC-4100: Make number of shows displayed in widget customizable
...
-fixed
2012-07-11 19:31:24 -04:00
ce698d4123
CC-430: Audio normalization (Replaygain Support)
...
-Added support on server side
2012-07-05 22:37:40 -04:00
6d823d01ab
CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
...
- fixed
2012-06-29 12:49:59 -04:00
a8792a7b97
CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
...
- fixed. See the comment for more detail.
2012-06-29 10:55:19 -04:00
396795e70e
CC-3879 : Now Playing-> Guest's clicking on Preview pops up error window
2012-05-28 17:59:26 +02:00
1245d1e860
CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
...
-fixed in a better way
2012-05-15 15:17:19 -04:00
025ef0ed27
CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
...
-fixed
2012-05-15 12:35:02 -04:00
e347819c77
SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
...
-created cc_live_log table
2012-05-11 16:06:28 -04:00
80898ec898
CC-3732: NationTalk Database upgrade fail, from 2.0.3 to 2.1.0
...
-fixed
2012-05-03 16:13:50 -04:00
ff6e2a2e5a
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed
2012-05-02 16:52:49 -04:00
5be12c0a93
CC-3695: Non-admin user cannot preview the contents
...
- guest doesn't have access to playlist builder, hence allowing DJ, PM and
admin to access the preview.
2012-04-24 15:57:43 -04:00
2a9ea435f2
CC-3694: Upgrade fails with Propel database conversion.
...
-fixed
2012-04-20 15:37:51 -04:00
85bc150159
CC-3694: Upgrade fails with Propel database conversion.
...
-fixed
2012-04-20 14:46:23 -04:00
95d69a3bbe
CC-1927: Remove PEAR DB
...
Fixed all install/upgrade scripts.
2012-04-19 16:34:14 -04:00
102bcb1d46
CC-3416 : Create password reset form
2012-04-17 18:16:10 +02:00
5a2d55ef84
CC-3520: Change default password of monit
...
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
2012-04-13 16:58:12 -04:00
1519ada85c
CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development"
...
-fix problem when constant isn't defined
2012-04-02 17:28:05 -04:00
709f38e4ed
CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development"
...
-fixed
2012-04-02 17:28:05 -04:00
12b23443db
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 16:27:08 +02:00
f48c5ff575
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 15:34:58 +02:00
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
ccfa954f0e
CC-3174: Show Content Builder
...
-fixed indentation
2012-03-26 15:43:29 -04:00
9be6f1bd0e
CC-3464: Playout forward cache should be configurable
...
-Done
2012-03-17 14:53:15 -04:00
ae0d3c560c
CC-3394: Add play button to timeline table.
...
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +01:00
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
d250e2a297
CC-3380 Better names for items in the System menu
2012-03-02 17:50:52 -05:00
e99b23434e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-23 15:24:40 -05:00
1682ce8879
Updated copyright date.
2012-02-23 15:24:20 -05:00
b357b80054
CC-3174 : showbuilder
...
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.
starting to use new cursor arrows.
2012-02-23 12:13:00 +01:00
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
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
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
5dcb033c84
CC-3297: Depend on zendframework and php-pear as external packages
...
-Remove dependency on included Zend files.
-Remove included Zend files
-Zend is now external dependency
2012-02-06 20:28:38 -05:00
51e181b445
CC-3297: Depend on zendframework and php-pear as external packages
...
-removed pear files
2012-02-06 15:16:57 -05:00
c229097470
CC-3297: Depend on zendframework and php-pear as external packages
...
-DB dependency should now be externalized
2012-02-06 15:10:03 -05:00
42452b8ea9
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Playlist.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
6c2475bf1f
CC-3174 : showbuilder
...
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
3f3117cf0e
CC-3174 : Show builder
...
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -05:00
3a8ba36e0d
SAAS-155: Add possibility to show additional information on
...
login page (for demo site)
- username and password are auto filled on demo site
- added informative msg on demo site about username and password
2012-01-17 14:47:26 -05:00
54ee177f7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-16 13:58:45 -05:00
859213b760
CC-3174 Show Builder
...
experimenting
2012-01-16 09:56:57 +01:00
67ddda4a2d
-Remove phing path from conf.php
2012-01-12 12:16:10 -05:00
c3430e5411
-various optimizations
2012-01-09 17:47:58 -05:00
drigato
Duncan Sommerville
Albert Santoni
Daniel James
Naomi
denise
Martin Konecny
James
Rudi Grinberg
Rudi Grinberg
denise
root
paul.baranowski
Daniel
Martin Konecny