Albert Santoni
7275986158
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 16:42:18 -04:00
Albert Santoni
4179123ce0
Set up CORS for microsite autologin after signup
2014-06-20 16:41:48 -04:00
drigato
1e1dc1dd03
Validation
...
Refactoring
2014-06-20 16:31:26 -04:00
drigato
01bf2883e5
Save client info on upgrade
2014-06-20 15:00:28 -04:00
Albert Santoni
82220a44a3
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 13:36:37 -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
drigato
40f2796972
Created an invoice view
...
Some refactoring
Some validation
2014-06-19 16:55:01 -04:00
drigato
540b9167a1
Invoice action
2014-06-19 07:10:30 -04:00
Albert Santoni
83dbc789af
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 20:22:33 -04:00
Albert Santoni
29e9182fcd
Fixed syntax error... grumble grumble
2014-06-18 20:22:13 -04:00
Albert Santoni
6402e6d2b6
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 20:20:30 -04:00
Albert Santoni
76659c80c4
Fixed bad client ID / subdomain check in WhmcsLoginController
2014-06-18 20:20:08 -04:00
Albert Santoni
20c069fc65
Merge branch 'saas' into whmcs-login-saas
2014-06-18 18:43:15 -04:00
Albert Santoni
ee928a2963
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 18:43:12 -04:00
Albert Santoni
81699b3c65
Fixed missing constant
2014-06-18 18:42:55 -04:00
Albert Santoni
b6ab9fa2c5
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 18:29:14 -04:00
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
drigato
9c4b254bab
CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents
2014-06-09 15:35:50 -04:00
drigato
94f1c95934
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-06-09 12:07:45 -04:00
drigato
66e6c23311
CC-5634: Can add/remove content to a linked show while one instance is currently playing
2014-06-09 12:07:27 -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
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
Albert Santoni
e8de3b5750
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-02 14:15:06 -04:00