Commit Graph

38 Commits

Author SHA1 Message Date
drigato 23bf866211 SAAS-712: UI Improvements 2015-04-08 14:01:57 -04:00
drigato 57cd2eda13 bad merge 2015-03-31 18:21:25 -04:00
drigato 220f21ab22 Merge branch 'saas' into saas-embed-player
Conflicts:
	airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
Albert Santoni 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
drigato 40d6249229 Merge branch 'saas' into saas-embed-player 2015-02-20 14:47:57 -05:00
Albert Santoni 08c53a9292 Fixed incorrect authorization for ShowImage API 2015-02-18 18:34:52 -05:00
drigato c261182c8f Skeleton player form/view/controller 2015-02-12 14:08:06 -05:00
Albert Santoni 2cf0f7da7a Merge branch 'cc-5709-airtime-analyzer' into saas
Conflicts:
	airtime_mvc/application/configs/ACL.php
2015-02-06 16:06:32 -05:00
Albert Santoni 2a9790adf3 Backport ACL REST permission fix 2015-02-06 16:05:51 -05:00
Duncan Sommerville 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
drigato 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
Duncan Sommerville 2c2f7ebc5f Initial commit for update to ACL for REST module; NEEDS TESTING 2015-01-21 15:34:15 -05:00
drigato bec62ec906 SAAS-496: Create a provisioning controller with a terminate endpoint 2014-11-25 16:04:08 -05:00
drigato 5d0ea2d015 Add billing section to main menu 2014-06-20 17:25:05 -04:00
drigato 497841225b Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now 2014-06-20 16:54:41 -04:00
Albert Santoni 7f6fc7770a Added Super Admin role and WHMCS login 2014-06-17 17:40:55 -04:00
drigato 81ceafbfbd whmcs client form 2014-06-12 17:54:20 -04:00
drigato 5971f51b53 CC-5781: Upgrade script for new storage quota implementation
First draft of an upgrade controller
2014-04-10 07:12:31 -04:00
Naomi 653a6384b9 creating a separate controller for playouthistory templates. 2013-08-28 18:25:46 -04:00
denise dd5882984e CC-4736: Let non-admin users update their user info
-done but needs design
2012-12-10 16:55:44 -05:00
denise 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
James 3af3cd5870 CC-4661: Listener Statistics
- frontend part
2012-11-02 17:00:38 -04:00
Martin Konecny 31176f525e CC-1665: Scheduled stream rebroadcasting and recording
-started working on UI
2012-07-26 14:41:40 -04:00
James 6d823d01ab CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
- fixed
2012-06-29 12:49:59 -04:00
James 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
Naomi Aro 396795e70e CC-3879 : Now Playing-> Guest's clicking on Preview pops up error window 2012-05-28 17:59:26 +02:00
James 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
Naomi Aro 102bcb1d46 CC-3416 : Create password reset form 2012-04-17 18:16:10 +02:00
Naomi Aro 12b23443db CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 16:27:08 +02:00
Naomi Aro d12ef1c7a2 CC-3536 : Work out ACL with library on NowPlaying when it's a guest User 2012-03-28 18:43:44 +02:00
Daniel 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
Naomi Aro 53b8eb2724 CC-733 : export broadcast logs
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
Naomi Aro 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
Naomi Aro 859213b760 CC-3174 Show Builder
experimenting
2012-01-16 09:56:57 +01:00
Naomi Aro 52b0e3c5f9 CC-3110 : Password reset
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
martin 03cb154bd1 CC-2737: Show disk space used/space available/ disk quota enforcement
-modify airtime-check-system to return values instead of printing
 them directly
-add ability to view select airtime-check-system via web interface
2011-08-30 18:00:03 -04:00
james ad3ef3ec30 CC-2255: Separate user types admin and program manager
- New user type 'Program Manager' added
- 'Program Manager' gets same previlage as Admin but doesn't
have access to Configure menu
- Changed user type name 'Host' to 'DJ'
2011-06-07 14:31:39 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00