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

1802 commits

Author SHA1 Message Date
Albert Santoni
fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04:00
Duncan Sommerville
275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -04:00
Duncan Sommerville
d467714f84 Fixed bug where timezone wasn't adjusting correctly when adding or editing a show 2014-10-27 15:42:30 -04:00
Robert Elder
e1b2c51130 Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st September 2014) to resolve playback issues. 2014-10-21 20:15:05 +00:00
drigato
f775bedb49 Stopped returning filesize in delete functions. 
Created an Amazon S3 wrapper class around Zend_Service_Amazon_S3 to add more functionality.
 2014-10-21 16:05:50 -04:00
Robert Elder
9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas. 2014-10-10 19:57:22 +00:00
drigato
2423ea6787 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-08 11:46:30 -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
dpsommer
159ab47857 Merge pull request #69 from RobertElder/tokens 
Add form tokens to several forms.
 2014-10-07 10:05:59 -04:00
Robert Elder
feff7f4343 tokens for multipart data upload. 2014-10-02 02:04:03 +00:00
Robert Elder
2be4a5f9d0 Add form tokens to several forms. 2014-09-30 23:09:27 +00:00
Robert Elder
f0397bbc59 PHP ini settings for cookies. 2014-09-29 18:22:10 +00:00
Duncan Sommerville
365184c2b1 Merging upstream pull 2014-09-19 13:15:53 -04:00
Duncan Sommerville
3a1efa39eb Added instance description field 2014-09-19 12:55:02 -04:00
Duncan Sommerville
26d875ed66 Added confirmation prompt when deleting current logo 2014-09-19 12:54:03 -04:00
Duncan Sommerville
1d658867f7 Updated front-end validation to work in FireFox 2014-09-18 17:11:56 -04:00
Duncan Sommerville
ee92f41a8d Updated look and feel and added front-end validation for image elements in add-show 2014-09-18 16:28:52 -04:00
Duncan Sommerville
096556fa74 Added show_logo_name field to data object to avoid deleting current logo when none is being uploaded 2014-09-18 10:32:56 -04:00
Duncan Sommerville
b89a764442 Updated to include show image functionality 2014-09-17 19:41:17 -04:00
Duncan Sommerville
f73432931c Updated js functionality for adding shows to POST show image to ShowController on success 2014-09-16 18:22:30 -04:00
Duncan Sommerville
1f52c6e093 Removed unnecessary test directory 2014-09-16 18:15:31 -04:00
Duncan Sommerville
5434311f7d More work on show image uploads 2014-09-16 18:03:14 -04:00
drigato
563fcf0342 Japanese Plupload i18n file 2014-09-16 16:54:20 -04:00
drigato
afa9a27bb9 Japanese Plupload i18n file 2014-09-16 16:51:53 -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
drigato
20a5649dbe Removed unused code. 
Changed linked show warning message in the edit show form.
 2014-08-25 18:33:29 -04:00
drigato
10cb5484fe Removed unused function. 
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
 2014-08-25 18:33:15 -04:00
drigato
bc63669853 Removed unused code. 
Changed linked show warning message in the edit show form.
 2014-08-21 17:12:54 -04:00
drigato
6249deb1ac Removed unused function. 
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
 2014-08-21 16:40:01 -04:00
drigato
b38f3d7e03 CC-5895: Upgrade Propel to 1.7 
Add vendor directory to include path
 2014-07-23 16:13:55 -04:00
Albert Santoni
db9d4e3327 htaccess changes to make the saas branch run locally 2014-07-07 15:13:27 -04:00
Albert Santoni
14113f7e60 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-03 12:26:45 -04:00
Albert Santoni
a5822aa07a CORS refactoring 2014-07-03 12:26:09 -04:00
Albert Santoni
2794ca1355 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/models/Cache.php
 2014-07-02 12:34:33 -04:00
Albert Santoni
9de92a87a4 Refactored the upgrade process for Airtime Pro 2014-07-01 13:36:09 -04:00
Albert Santoni
f1610485c3 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-26 17:45:48 -04:00
Albert Santoni
18c828defd Finished up VAT validation for Plans page 2014-06-26 17:31:34 -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
fce6116d60 Made the invoices view nice! 2014-06-25 20:01:14 -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
f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
Albert Santoni
18e7707d8f Trying to fix my commit again 2014-06-20 18:10:59 -04:00
Albert Santoni
faa12c8065 Super Admin edit page points to billing now 
* Also prevent super admin from being deleted
 2014-06-20 13:36:06 -04:00
Albert Santoni
7f6fc7770a Added Super Admin role and WHMCS login 2014-06-17 17:40:55 -04:00
Albert Santoni
51d930cd84 Make Live Chat not block the Add Media pagination buttons 2014-06-04 13:47:27 -04:00