Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,062 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

736 Commits

Author SHA1 Message Date
drigato 2272451e08 Added placeholders for player embed code and preview 2015-02-25 17:10:41 -05:00
Duncan Sommerville 69d588d2f6 Merge branch '2.5.x' into 2.5.x-albertenhancements 2015-02-24 10:45:52 -05:00
drigato 6dcc7ee2fc SAAS-587: Add stream urls to station-metadata API 2015-02-20 15:50:40 -05:00
drigato a931e282e1 SAAS-585: Create Embeddable Player form 
Fixed up the stream urls options
 2015-02-20 15:44:25 -05:00
drigato 40d6249229 Merge branch 'saas' into saas-embed-player 2015-02-20 14:47:57 -05:00
Albert Santoni 964d7d1326 Merge branch 'cc-5709-airtime-analyzer' into saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-18 16:42:04 -05:00
drigato c1086842d3 Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db 
Conflicts:
	airtime_mvc/application/Bootstrap.php

airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-17 16:19:58 -05:00
drigato 4fd7b4c622 SAAS-585: Create Embeddable Player form 
Added stream urls - hardcoded for now
 2015-02-17 11:48:43 -05:00
Duncan Sommerville eb40379152 SAAS-595 - Changed Zend validation and added sanitization in file import process to throw out bad track number metadata 2015-02-17 11:44:31 -05:00
drigato c261182c8f Skeleton player form/view/controller 2015-02-12 14:08:06 -05:00
Duncan Sommerville 8d4f94a41f Merge branch '2.5.x' into saas 2015-01-26 17:50:18 -05:00
Duncan Sommerville e3165a12c3 Regex tweak 2015-01-26 17:49:58 -05:00
Duncan Sommerville b569e9a294 Merge branch '2.5.x' into saas 2015-01-26 17:44:41 -05:00
Duncan Sommerville 322d85931b CC-5988 - Better error message & regex for Transition Fade field on stream settings page 2015-01-26 17:41:10 -05:00
Albert Santoni dbba5a7427 Decouple Billing and S3 cloud storage stuff from Zend 2015-01-26 13:10:10 -05:00
Albert Santoni 230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	CREDITS
 2015-01-22 11:29:38 -05:00
Albert Santoni fd42c67b0b Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-01-21 18:08:05 -05:00
drigato 2fadc8f8f1 Merge branch '2.5.x' into saas 
Conflicts:
	CREDITS
 2015-01-20 11:44:53 -05:00
drigato 6ac5a2950f SAAS-551: Cannot schedule shows due to overlapping show check bug 2015-01-20 11:32:15 -05:00
Albert Santoni 0c3395289d Merge pull request #78 from Robbt/realtime-smart-blocks 
Added sort tracks by upload time to smart blocks criteria
 2015-01-19 15:36:28 -05:00
Albert Santoni 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
Albert Santoni 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
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 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
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 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
Albert Santoni a62e98beb4 Fix logins from WHMCS by disabling CSRF token on login page for trusted 
origins
 2014-11-20 19:33:11 -05:00
Duncan Sommerville af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
Duncan Sommerville 795e239ff3 Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. 2014-11-06 18:39:48 -05:00
Duncan Sommerville 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville eecd3fa188 Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field 2014-11-05 17:24:08 -05:00
Duncan Sommerville 275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -04:00
Robbt fe291cdc8c Added sort tracks by upload time to smart blocks criteria 2014-10-19 23:02:40 -04:00
drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
 2014-10-08 11:46:08 -04:00
dpsommer 9a21b99fdf Merge pull request #70 from RobertElder/more-tokens 
More tokens
 2014-10-07 10:10:14 -04:00
Robert Elder 29b05343bd Tokens for add User. 2014-10-01 19:36:36 +00:00
Robert Elder dbed915469 Tokens for preferences form. 2014-10-01 19:36:17 +00:00
Robert Elder 2be4a5f9d0 Add form tokens to several forms. 2014-09-30 23:09:27 +00:00
drigato 66b97158b7 Make API on by default - fix 2014-09-19 15:30:06 -04:00
drigato 28399b70cc Make API on by default 2014-09-19 14:57:43 -04:00
Duncan Sommerville abc9481a58 Updated to conform to naming conventions 2014-09-19 12:55:47 -04:00
Duncan Sommerville 3a1efa39eb Added instance description field 2014-09-19 12:55:02 -04:00
Duncan Sommerville c65fa8ce37 Added button to remove current show logo 2014-09-18 16:38:18 -04:00
Duncan Sommerville 5e18e1881f Removed unnecessary validator override functions 2014-09-18 16:30:47 -04:00
Duncan Sommerville 45939138cd Added previews of uploaded and current show images 2014-09-17 19:48:17 -04:00
Duncan Sommerville 5434311f7d More work on show image uploads 2014-09-16 18:03:14 -04:00
Duncan Sommerville cb80423fdd Work on adding image upload to add-show form 2014-09-12 18:05:24 -04:00
drigato 9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 11:59:41 -04:00
Albert Santoni c55a3a4d74 Use SSL with Recaptcha to fix it 2014-08-25 18:19:00 -04:00
Albert Santoni 80b9bcdfc6 Use SSL with Recaptcha to fix it 2014-08-25 14:45:04 -04:00
Albert Santoni 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
Albert Santoni d320651735 SAAS-461: Re-enable timezone and language settings for Super Admins 2014-07-28 12:37:40 -04:00
Albert Santoni 0ab1eaa08c Fix account upgrade invoicing issue 
* Don't generate upgrade orders if the plan and the billing cycle didn't
  change. WHMCS freaks out otherwise.
* Clean up some deadcode in BillingUpgradeDowngrade.php
* Squash an error in the invoice view if there's no invoices
 2014-07-09 13:49:25 -04:00
Albert Santoni a831fbe5b7 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-03 16:49:28 -04:00
Albert Santoni c551097d57 Default to monthly billing for invalid values 2014-07-03 16:46:25 -04:00
Albert Santoni 523bb8e7b6 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-02 12:45:44 -04:00
Albert Santoni b0cab62e80 More syntax fixes for PHP 5.3 2014-07-02 12:45:17 -04:00
Albert Santoni 368ac19d52 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-02 12:43:20 -04:00
Albert Santoni 4b7f8abc3d Same thing again 2014-07-02 12:43:06 -04:00
Albert Santoni 96f370e071 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-02 12:41:07 -04:00
Albert Santoni cd26671627 Weird syntax fix for PHP 5.3 2014-07-02 12:40:32 -04:00
Albert Santoni e9cca4c441 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-27 15:50:51 -04:00
Albert Santoni 3357c1f032 Select current plan and show that correctly 2014-06-27 15:50:05 -04:00
Albert Santoni 51b7fe9adf Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-25 20:33:10 -04:00
Albert Santoni b36967a690 Nicer auto-styling for the Billing Details form 2014-06-25 20:32:41 -04:00
Albert Santoni 338fd06f81 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 
Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
 2014-06-25 19:03:13 -04:00
Albert Santoni 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
Albert Santoni 8c20592423 Start of form customization for billing 2014-06-24 15:52:43 -04:00
drigato 73724bdd04 Custom fields were not saving 2014-06-24 12:46:11 -04:00
drigato f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
drigato 497841225b Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now 2014-06-20 16:54:41 -04:00
drigato 40f2796972 Created an invoice view 
Some refactoring
Some validation
 2014-06-19 16:55:01 -04:00
Albert Santoni 7f6fc7770a Added Super Admin role and WHMCS login 2014-06-17 17:40:55 -04:00
drigato dc583a6e41 Messing around with AutoAuth for whmcs 
Client form wasn't getting populated with new values after a save - fixed
 2014-06-17 17:07:33 -04:00
drigato 1f4c8b755d Created a separate view for upgrades and client info 2014-06-17 12:47:08 -04:00
drigato 81ceafbfbd whmcs client form 2014-06-12 17:54:20 -04:00
Albert Santoni 01fc9e6ffc Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-26 19:11:47 -04:00
drigato 9eb0f2f3b3 CC-5859: Airtime Analyzer: format fields before writing to db 2014-05-26 17:13:45 -04:00
Albert Santoni ed78625fce Merge branch '2.5.x' into 2.5.x-saas 2014-01-27 12:01:11 -05:00
drigato 2cdad4932a CC-5660: Unable to create shows with a rebroadcast 
Used wrong formating for minutes
 2014-01-06 14:04:18 -05:00
drigato 11284d0d41 CC-5660: Unable to create shows with a rebroadcast 
Two variables that are needed for the rebroadcast validation were deleted
before the 2.5.1 release. Just had to add them back in.
 2014-01-06 13:51:06 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
Albert Santoni 15370702a4 Use the user timezone, not the station timezone in the Add Show form (by 
default)

* Fixes really annoying problem where you click on the calendar, and it
  adds your show in the wrong spot.
 2013-12-13 18:27:36 -05:00
drigato e8a8aeaf00 CC-5636: Php 5.5: Cannot update repeating show's name if that instance is updated 
Made all show fields readonly when editing a repeating instance
 2013-12-13 12:13:58 -05:00
Naomi e6c971387b Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-11 17:35:47 -05:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
Albert Santoni 4d77d14d33 CC-5627: Check all Application_Common_DateHelper calculations that use 
timezone.

* Removed strtotime usage from AddShowRepeats.php
 2013-12-11 15:54:13 -05:00
Naomi c732b44903 CC-5594 : Remove all date_default_timezone_get() 
must allow 24 hours, but nothing greater to match old usage.
 2013-12-05 13:11:36 -05:00
Naomi eb4cefa3ff CC-5594 : Remove all date_default_timezone_get() 
DateTime here was relying on a timezone that wasn't what the user selects in the timezone drop down on the form.
 2013-12-05 13:04:02 -05:00
drigato 6ea0cb5918 CC-5571: Overlapping show check in wrong sometimes 
The incorrect number of days we're getting added to create repeat instances
because we were checking the start week day in UTC instead of local time
 2013-11-22 10:51:16 -05:00
denise 4abdbfae1f CC-5401: Stream settings -> Can't save show source info 
Typo in sprintf formatting
 2013-10-11 13:22:02 -04:00
denise c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime 
Conflicts:
	airtime_mvc/application/services/ShowService.php
 2013-10-08 11:16:25 -04:00
denise 55254e88a5 UI text improvements for setting the station/user timezones 
Added info icon in the add-show form for timezone setting
 2013-10-07 14:49:52 -04:00
drigato 37a0c271f6 CC-5359: Update show fails sometimes with overlapping check 
Some DateTime objects were not getting created in correct timezone
Used format() to get the day of week value instead of getTimestamp()
getTimestamp() sometimes returns the wrong value
 2013-10-03 18:02:15 -04:00
denise 1e59ab836d CC-5277: Selecting weekly repeat without selecting days fails silently 
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
 2013-10-01 14:19:02 -04:00
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi 0dd5458269 Merge branch '2.5.x' into CC-5293-calendar-pref 2013-09-30 13:57:23 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream 
adding the webstream metadata to the history table.
 2013-09-30 13:56:27 -04:00
Albert Santoni 11ae76beb8 Fix SAAS-349 by preventing password changes in demo mode. 
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
 2013-09-26 16:23:22 -04:00
Albert Santoni 28a032388b Start of bugfixing for SAAS-349. 
* Also identity verification for erry on Freenode.
 2013-09-26 15:18:41 -04:00
denise 2114383519 CC-5323: User's Timezone Can Improperly Edit Show 
-overlapping show check was using the user's local timezone to compare new
 shows instead of the show's timezone
 2013-09-25 16:22:30 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Jamie Connor f7f2cdc51c Follow up changes relating to adding in new show repeat options 2013-09-07 14:54:03 +12:00
Jamie Connor 03f383f764 added more options for show repeats 2013-09-03 12:25:22 +12:00
Naomi Aro 682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi Aro 9c0bee3877 adding show instance to the create form if it's already set. 2013-08-31 23:34:37 -04:00
Naomi d50cdd16c2 starting association of a show instance. 2013-08-29 17:40:08 -04:00
Naomi Aro 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
Naomi b65007868a crlf fix 2013-08-12 15:08:09 -04:00
Naomi d83c004fb9 subclassing the template types, files summary table is now fully configurable form wise. 2013-08-12 15:06:26 -04:00
Naomi 27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi aaf2e5c2f6 better casting on form checkbox, setting populate flag properly based on if id is set (for create/update) 2013-08-05 15:05:26 -04:00
Naomi 31c604d09c can update an existing history item entry. Form is pre-populated. 2013-08-02 18:16:23 -04:00
Naomi 7ca3048f36 can add a new list item using the template. 
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
 2013-07-30 19:24:05 -04:00
Naomi Aro 7183396da5 needed to update jquery, fullcalendar needed updating for the new JS. 
working on configuring a template.
 2013-07-29 08:57:31 -04:00
Naomi 46ecdf393d dynamic form rendering for template 
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
 2013-07-26 17:33:17 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro 19ba788bae CLRF 2013-07-22 10:47:11 -04:00
Naomi Aro 634eb40a0c creating an entry. 2013-07-22 10:45:39 -04:00
Naomi Aro ec44b81f6a clrf 2013-07-18 01:37:39 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi c744d88f23 IM-784 : Create Editing Abilities For History 2013-07-08 18:00:02 -04:00
Naomi Aro f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
 2013-06-26 01:25:26 -04:00
Naomi Aro 6b0ab535e5 CC-5244 : Exception when creating Smartblock 2013-06-20 14:03:13 -04:00
Naomi 440163f199 CC-5225 : Library: Fail to open Metadata Editor 2013-06-12 13:05:58 -04:00
Martin Konecny 6498f43dad CC-5211: 
Php Exception: Set large number as year in tracks Metadata

fixed
 2013-06-06 17:02:01 -04:00
Martin Konecny 254d3b8950 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 16:09:02 -04:00
Daniel James 2e970bfc8a Fixes date format in Smart Block tooltip (CC-5618) 2013-05-22 10:25:43 +01:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
Naomi 435bb83588 CC-2301 : dos2unix being run 2013-05-02 16:52:30 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Naomi 58957cc919 CC-2301 : running dos2unix on 3 files. 2013-04-29 17:01:08 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -04:00
denise 327d0dd6c9 CC-4961: Show linking 
Add front-end for creating a show with monthly repeats on same day of week
 2013-03-22 15:57:15 -04:00
denise 6766d208aa CC-4961: Show linking 
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
 2013-03-21 16:31:05 -04:00
denise 7347be35b1 Created a new service for show days 
Created a new user service
Started refactoring edit show action
 2013-03-11 16:18:40 -04:00
denise 99c07272fd - Moved all form validation to it's own function in schedule service 
- Moved show creation to it's own function in schedule service
 2013-03-06 09:58:35 -05:00
Martin Konecny 3f7ccf6967 fix missing closing parentheses 2013-03-04 11:41:42 -05:00
Martin Konecny 8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
denise c8d7d23d62 CC-4963: Add cue in and cue out to smart block criteria list 
Done
 2013-02-19 16:38:58 -05:00
denise ad334d9e74 CC-4926: System-> Preference: Please limit the default fade value less than 60 
- added a range validator of 0 - 59.9 on default fade
 2013-02-06 15:44:52 -05:00
Martin Konecny 7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -05:00
denise 0cf8526f87 CC-4878"Send support feedback" button at initial login tries to load "http://showbuilder" and was missing the local host IP. 
-fixed
 2013-01-25 11:51:56 -05:00
Martin Konecny 784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
Martin Konecny 9d8c9149fd remove code that will never be executed on SaaS branch 2013-01-16 14:06:04 -05:00
Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2013-01-14 16:19:51 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
denise 7b4693e5f9 CC-4831: I18N: Error message of background settings when creating a show is not translated 
-fixed
 2013-01-14 14:13:32 -05:00
denise f067b952db CC-4829: Password Verify does not work on Lucid 
-code cleanup
 2013-01-14 12:17:33 -05:00
denise 83a450565e CC-4829: Password Verify does not work on Lucid 
-fixed
 2013-01-14 12:07:17 -05:00
Martin Konecny 89274e43b3 fix spelling mistake 2013-01-11 13:17:08 -05:00
denise a129b0b081 CC-4472: User password verify or clear text display. 
-done with password verify
 2013-01-10 17:51:25 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
denise dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -05:00
denise 2797809c74 CC-4786: Refresh page when language setting changes 
-done
 2013-01-10 13:55:52 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise 1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
denise f308305df8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:18:59 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting 
-fixed
 2013-01-07 18:18:40 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
Daniel James 771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00:00
Daniel James a2c1b9c699 Clarify label on default interface language preference 2013-01-07 11:05:38 +00:00
Daniel James 053418d7ac Added missing colon to the end of 'Language' 2013-01-07 10:42:16 +00:00
James 63c847080f CC-4732: Ask for admin username + password in Stream Settings page 
- CRLF
 2013-01-03 18:02:19 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
denise 7ea649e063 CC-4783: Username on the edit user form should be readonly 
-done
 2013-01-03 16:27:05 -05:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
james cf38e2c596 CC-4754: Replay gain modifier 
- done
 2012-12-27 22:58:41 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise adae81bffa CC-4747: Add User page -> Typo on form labels 2012-12-17 16:53:18 -05:00
denise bd18039785 CC-4744: Edit user form needs styling 
-done
 2012-12-17 14:12:27 -05:00
denise f12547dfb4 CC-4736: Let non-admin users update their user info 
new form
 2012-12-10 16:56:25 -05:00
denise adb966a734 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-cancel button does not reload the page anymore
 2012-12-05 13:21:18 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-done
 2012-12-05 13:16:25 -05:00
Martin Konecny 3086bde17e -cleanup parsing for form elements that weren't provided by the client in our SaaS implementation 2012-12-04 16:22:03 -05:00
denise 844246df3a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 15:30:56 -05:00
denise ab55bb73bb CC-4683: System -> Preference: Save button is old style 
-support feedback form also had old button style
 2012-12-03 14:51:21 -05:00
denise 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
Martin Konecny 858f03c9ad -remove rebroadcast code 2012-11-29 15:58:29 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
Martin Konecny 4983721565 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/forms/LiveStreamingPreferences.php
 2012-11-28 16:10:33 -05:00
denise 9689c75bed CC-1960: Internationalize Airtime / Support translations 
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
 2012-11-28 11:54:22 -05:00
denise e475c2e99e CC-1960: Internationalize Airtime / Support translations 
-overwrote zend from stringLength validator
 2012-11-27 17:28:27 -05:00
denise 9acfb6c181 CC-1960: Internationalize Airtime / Support translations 
- overwrote default zend form error messages
 2012-11-27 17:11:29 -05:00
denise 42d535a922 CC-1960: Internationalize Airtime / Support translations 
-unlocalized some strings
 2012-11-27 12:33:43 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations 
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
 2012-11-23 16:39:41 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
 2012-11-22 17:32:24 -05:00
denise 7a9f01458c CC-1960: Internationalize Airtime / Support translations 
-fixed langauge label on preferences page
 2012-11-21 12:46:52 -05:00
denise 25ddd083bc CC-1960: Internationalize Airtime / Support translations 
-added language option in preferences
 2012-11-21 12:44:50 -05:00
denise e5f67c8b05 CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper functions for all strings in view/scripts, and forms
 2012-11-20 11:33:37 -05:00
denise 33e4d6154d CC-4693: Preferences: Bottom save button is not aligned 
-fixed
 2012-11-12 14:43:44 -05:00
denise a727f2bb1e CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on 
-fixed
 2012-11-12 14:28:50 -05:00
Martin Konecny 4b09b289ce SAAS-290: Hosted SaaS widgets + javascript code generation 
Slight improvements to description as well as element
positioning
 2012-11-07 15:44:22 -05:00
Martin Konecny 1b0b124247 SAAS-290: Hosted SaaS widgets + javascript code generation 
-working code
 2012-11-07 12:49:17 -05:00
denise b817684972 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
 2012-11-07 11:21:36 -05:00
Martin Konecny 27d40ef4df SAAS-290: Hosted SaaS widgets + javascript code generation 2012-11-06 18:10:53 -05:00
Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/EmailServerPreferences.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/menu.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
 2012-11-06 17:23:32 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
Martin Konecny 38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
Martin Konecny 3f7d8a0c7f Merge branch '2.2.x' into 2.2.x-saas 2012-11-06 16:11:51 -05:00
denise 41cb6b2b0b Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-11-05 17:08:49 -05:00
denise 3b58ee1f48 CC-4651: Apache log errors part 1 
-fixed
-saas doesn't have rebroadcast shows so we don't need to check if they overlap
 2012-11-05 17:08:41 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
Martin Konecny 9609a4e220 Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 20:16:54 -04:00
denise 796274e4ef CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths 
-fixed
 2012-11-02 15:51:36 -04:00
James 1899d588ee - CRLF fix 2012-10-30 18:03:03 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit. 
- done
 2012-10-30 17:57:58 -04:00
Rudi Grinberg dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
denise 3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page 
-done
 2012-10-26 18:09:30 -04:00
denise 0ab1353564 CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on 
-fixed
 2012-10-26 18:00:48 -04:00
James b8d6132b52 - saas patch #1 2012-10-23 18:47:15 -04:00
denise 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
James 3ecde35b7c Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 14:28:14 -04:00
James 1146e1f269 CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00 
- fixed
 2012-10-19 14:27:57 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
denise a51c3174e0 SAAS-282: Overlap detection prevents creation of a repeating show 
-fixed
 2012-10-19 12:33:12 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
denise 887a86c6a1 CC-4591: Calendar: Cannot change start time for repeating show 
-fixed
 2012-10-18 10:51:24 -04:00
James 45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00
denise 25c28da761 CC-4550: Track should not be a required field in metadata editor 
-fixed
 2012-10-16 15:29:05 -04:00
denise 846af50543 CC-4567: Calendar: Exception in zendphp.log when setting a wrong rebroadcast time from repeating show 
-fixed
 2012-10-16 14:33:45 -04:00
denise 5ff89eeba2 CC-4561: Can create overlapping shows when rebroadcasting a repeating show 
-fixed
 2012-10-15 14:19:52 -04:00
denise b79e190d3c -small comment change 2012-10-12 15:42:51 -04:00
denise e60a23aab4 CC-4555: Can create overlapping shows with a repeating show if another show is on the last repeating day 
-fixed
 2012-10-12 15:34:42 -04:00
denise 8f5830757f CC-4553: Calendar: Can create overlapping show by repeat show's instances 
-fixed
 2012-10-12 14:26:54 -04:00
denise 2fbd8e868b CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error" 
-fixed
 2012-10-10 14:22:09 -04:00
denise 317bb7de69 CC-4479: Buttons in dialog windows are not styled 
-done
 2012-10-03 11:40:40 -04:00
denise 0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
Martin Konecny e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-initial commit
 2012-09-14 12:09:40 -04:00
Rudi Grinberg 55993352bf Removed unused variables. 2012-09-13 10:35:24 -04:00
denise 9c8f4fe404 CC-4414: Unused local variables in forms 
-done
 2012-09-12 17:09:00 -04:00
denise 54d18b7bcd CC-4382: Editing the color of a repeating show gives error message 
-fixed
 2012-09-12 14:27:17 -04:00
denise 58d39d74d4 CC-4355: Smart block criteria do not match library columns or metadata editor 
-fixed
 2012-09-11 17:18:17 -04:00
Martin Konecny 7f8b5ab92e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 17:40:07 -04:00
Martin Konecny 859445c766 CC-3301: Add ability to switch stereo/mono stream in stream settings 
-fixed
 2012-08-29 17:39:24 -04:00
denise a7427645d5 CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception 
-fixed
 2012-08-29 17:01:55 -04:00
Rudi Grinberg 5e180f0ce2 sexified code 2012-08-29 12:57:56 -04:00
Rudi Grinberg ca66073fb5 did some reformatting. 2012-08-29 12:31:59 -04:00
Martin Konecny b2327472e8 CC-4090: Make code style PSR compliant - part 4 
-forms directory
 2012-08-28 23:04:55 -04:00
denise 9d90e8c531 CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication 
-done
 2012-08-28 16:17:37 -04:00
denise 69b61c4cfe CC-4285: Playlists-> Smart Block - displays that certain amount meets the criteria while no criteria is specified 
-fixed
 2012-08-28 12:13:58 -04:00