Commit Graph

5256 Commits

Author SHA1 Message Date
Albert Santoni 971e81756c Added ability to login directly with WHMCS credentials (on Airtime login
screen)
2014-06-18 18:27:16 -04:00
drigato b12d88ddf7 Fix a whoopsies 2014-06-18 11:03:26 -04:00
drigato 70a7410b1a Remove key 2014-06-18 10:42:50 -04:00
Albert Santoni 0ba09c2dda Merge branch 'whmcs-login' into whmcs-login-saas 2014-06-17 17:41:46 -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 d81afca7e3 Adding detailed log statements for actions involving show scheduling 2014-06-17 14:17:28 -04:00
drigato 1f4c8b755d Created a separate view for upgrades and client info 2014-06-17 12:47:08 -04:00
drigato d39f7548cd un-hardcoded client id 2014-06-12 17:58:02 -04:00
drigato 81ceafbfbd whmcs client form 2014-06-12 17:54:20 -04:00
drigato 267cc78699 'My Account' link on free trial box was broken 2014-06-12 09:37:16 -04:00
Albert Santoni 782a746a36 Merge branch 'gtm-saas' into saas 2014-06-11 14:13:50 -04:00
Albert Santoni e3850f79da Fix for detecting account duration 2014-06-11 14:09:40 -04:00
Albert Santoni 994dbddac2 Use document ready() event to fire data layer 2014-06-11 13:52:42 -04:00
Albert Santoni d984ec9b43 Don't use NumberFormatter because of PECL intl dependency 2014-06-11 13:45:23 -04:00
Albert Santoni a731f94f70 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-11 13:35:34 -04:00
Albert Santoni e5a74e7285 Fix error due to bad exception throwing 2014-06-11 13:35:10 -04:00
Albert Santoni 5df522f226 Added GTM code and data layer 2014-06-11 13:24:03 -04:00
Albert Santoni fa3c7bd67a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-09 11:37:06 -04:00
Albert Santoni 560d1a9b14 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
2014-06-09 11:36:51 -04:00
Albert Santoni 345c782eb9 Fixed the unit tests and changed ops->zu 2014-06-09 11:34:25 -04:00
Albert Santoni a07121787f CC-5833: Update airtime demo w/o o.p.s. 2014-06-06 17:12:55 -04:00
drigato ee489b39f9 CC-5869: Changing a repeating show to non-repeating and changing start time does not work 2014-06-06 14:51:01 -04:00
drigato e4bb97bcc4 CC-5867: Can't edit show instance 2014-06-06 12:22:59 -04:00
Albert Santoni cc19b18d7f CC-5588: Specific user can't see Library because ColReorder is null for
their account
2014-06-05 18:04:42 -04:00
Albert Santoni a12ebf2cb1 CC-5836: Status page still reports media-monitor even AA enabled 2014-06-04 18:23:18 -04:00
Albert Santoni 6e5d99b828 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-04 14:16:06 -04:00
Albert Santoni e3c2ae03b3 Fixed upload file count being wrong in Add Media page (lemma to CC-5863) 2014-06-04 14:15:36 -04:00
Albert Santoni 51d930cd84 Make Live Chat not block the Add Media pagination buttons 2014-06-04 13:47:27 -04:00
Albert Santoni 65ea0e6d6f Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-03 12:44:35 -04:00
Albert Santoni a969f8fc44 CC-5856: Analyzer metadata exception
* Fixed parsing of metadata when there's empty lists returned (mutagen's
  API is awful)
* Return HTTP 422 if there's any exception in validating the metadata
2014-06-03 12:43:01 -04:00
localizer 3873e510f1 updated translation resources 2014-06-03 09:53:10 +00:00
Albert Santoni e8de3b5750 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-02 14:15:06 -04:00
Albert Santoni 2e6d3821ae CC-5863: Deleted files still shown in Recent Uploads view
* Fixed
2014-06-02 14:14:09 -04:00
Albert Santoni 1624aa4007 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-30 17:13:00 -04:00
Albert Santoni 9f9c32aec3 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-05-30 17:12:42 -04:00
Albert Santoni 61be4875fb CC-5343: Missing files can be scheduled via playlists
* Fixed it by adding a check for this.
2014-05-30 17:11:12 -04:00
Albert Santoni 8ae1be265b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-30 13:04:08 -04:00
Albert Santoni 1373d4984f CC-5862: Invalid UTF-8 chars cause DB error
* Strip and validate UTF-8 strings in the Media API
* Also properly parse track numbers containing "-"
2014-05-30 13:02:19 -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 f8b7accc4a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-22 19:17:15 -04:00
Albert Santoni e1a0429939 Handle error case that could cause invalid disk usage reading 2014-05-22 19:16:42 -04:00
Albert Santoni 1db308330b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-22 18:47:21 -04:00
Albert Santoni 091be8cea3 SAAS-439: Genres longer than 64 characters cause Media API exception
* Truncate the genre field in the Media API
2014-05-22 18:40:05 -04:00
drigato 8432799b9a CC-5853: Tracks marked as 'hidden' won't be marked as unavailable in Now Playing page 2014-05-22 14:47:14 -04:00
Albert Santoni 397dfb6525 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 17:43:54 -04:00
Albert Santoni 08badfb421 SAAS-436: Fix widgets 2014-05-20 17:43:06 -04:00
drigato fb12ee7e54 CC-5855: Output to zendlog when files are deleted from library
Added host name to log message
2014-05-20 14:21:41 -04:00
drigato f684ce4ab9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 14:16:24 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
drigato d312c844bc Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-12 11:30:26 -04:00
drigato 691841eba4 CC-5844: Airtime Analyzer: Auto format the 'year' tag. 2014-05-12 11:29:58 -04:00
drigato c9ddcc28e0 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-08 13:02:22 -04:00
drigato 0040965222 CC-5840: Add Media -> Endless retries if there is a validation error
Fixed by not adding message to retry queue if request returns a
validation specific error code (422)
2014-05-08 13:01:49 -04:00
drigato fe8226e549 Removing logging statements 2014-05-08 11:02:50 -04:00
drigato 9cfdb04c89 Logging statements 2014-05-08 10:57:35 -04:00
drigato 8ea8226299 Removed some logging statements 2014-05-08 10:55:47 -04:00
drigato f5e7c7e796 Logging statements 2014-05-08 10:51:55 -04:00
drigato 4c0d3a9d04 More logging statements for debugging 2014-05-08 10:50:49 -04:00
drigato 82ef08ad1e Logging statements 2014-05-08 10:45:22 -04:00
drigato c291439483 Adding back analyzer deadlock workaround.
Removing command to delete empty sub folders inside organize.
2014-05-07 15:01:31 -04:00
drigato 83d9ec413d Commenting out where we delete empty sub folders inside organize folder 2014-05-07 13:58:39 -04:00
drigato be69d956aa Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
2014-05-06 14:52:50 -04:00
drigato bc080a26f7 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
2014-05-06 14:50:13 -04:00
drigato eafbd7d5e9 CC-5838: Editing a repeating show yields in error if an instance is in the past
Was not checking if show is repeating properly
2014-05-06 13:01:20 -04:00
Albert Santoni e963157a22 Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:49 -04:00
Albert Santoni f89c66922b Merge branch '2.5.x-saas' into cc-5709-airtime-analyzer-saas 2014-05-05 12:42:42 -04:00
drigato 5762bb9df5 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-05 12:26:01 -04:00
drigato 16fb9d75d3 Changed GetDiskUsage so it will always return 0 if the value has not been set yet 2014-05-05 12:25:42 -04:00
drigato a8c428bfb0 Fix disk quota message 2014-05-05 11:52:13 -04:00
drigato e11afd4e71 Fix for new saas instances getting created with a 'disk quota reached' message 2014-05-05 11:41:43 -04:00
drigato 39db3d4aee Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
2014-05-05 11:21:02 -04:00
drigato 094382c766 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-05-05 11:19:27 -04:00
drigato e4e5590b9f CC-5802: Upgrade application.ini file
Remove this upgrade step from the upgrade controller
2014-05-05 11:19:14 -04:00
Albert Santoni 1c33da948e Removed per-instance application.ini customizations 2014-05-02 16:14:06 -04:00
Albert Santoni 250d5d083e Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-02 16:06:15 -04:00
Albert Santoni 4b4fd5432f Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-05-02 15:52:31 -04:00
Albert Santoni 2d6748457c Remove database credentials from application.ini 2014-05-02 15:50:37 -04:00
drigato 721e4e1a4a CC-5806: Airtime Analyzer: Please implement "remove all files" 2014-05-01 10:58:51 -04:00
drigato cb20c30723 CC-5806: Airtime Analyzer: Please implement "remove all files"
saas-specific changes for updating disk_usage
2014-04-29 16:08:03 -04:00
drigato b0a711d918 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-29 16:06:43 -04:00
drigato a5eb5e9901 CC-5806: Airtime Analyzer: Please implement "remove all files" 2014-04-29 16:06:25 -04:00
drigato 88b6b28c62 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-29 11:09:55 -04:00
drigato 04da9b3d61 CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
Imported file path had album name twice - fixed
2014-04-29 11:09:31 -04:00
drigato f0fdf85524 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-29 10:35:58 -04:00
drigato 94375ee441 CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
Cleaner way of removing empty sub folders after ftp uploads
2014-04-29 10:35:39 -04:00
drigato 6adb7c53ae Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-29 10:05:35 -04:00
drigato 6f1dd7987f CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize 2014-04-29 10:05:17 -04:00
drigato c3c5720dac Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 16:25:13 -04:00
drigato 79687499aa Logging statement. To remove later. 2014-04-28 16:24:59 -04:00
drigato 48742abd6b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 16:20:44 -04:00
drigato f428a2d960 CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
Delete the empty folder after files have been copied into imported
2014-04-28 16:20:26 -04:00
drigato 9a0abb29b3 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 15:52:49 -04:00
drigato c586e3e2b8 CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
Was using wrong position when using substr()
2014-04-28 15:52:08 -04:00
drigato 0c0c65f69b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-04-28 14:46:03 -04:00
drigato fae5b15a9f CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
$_FILES does not store the original file path so we were losing the folder name.
Fixed by explicitly passing the full filepath in via the ftp-upload-hook.sh script
2014-04-28 14:44:52 -04:00
Albert Santoni 325310f681 CC-5818: Fix Live Chat on Airtime Pro (2.5.3) 2014-04-28 11:23:59 -04:00
drigato b4a9882e9c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 10:27:07 -04:00
drigato d081ff10b2 CC-5807: Disk Space will be updated when file is not actually deleted 2014-04-28 10:25:36 -04:00