Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14623 commits 3 branches 0 tags 405 MiB
Commit graph

640 commits

Author SHA1 Message Date
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