drigato
|
5530142174
|
Un-doing last 2 committs about invoices
|
2015-07-31 12:01:26 -04:00 |
|
drigato
|
aab4b634bf
|
Show form on billing page if no invoice was generated after downgrade
|
2015-07-31 11:56:00 -04:00 |
|
drigato
|
278ca264eb
|
Fix for bringing customer to view invoice that doesn't exist after downgrade
|
2015-07-31 11:48:20 -04:00 |
Albert Santoni
|
78327c4f68
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2015-07-31 11:44:29 -04:00 |
|
Albert Santoni
|
84c21de578
|
Fix error logic if no API key passed to provisioning/create API
|
2015-07-31 11:43:58 -04:00 |
|
drigato
|
7de507c99a
|
Forgot to commit promo banner
|
2015-07-31 10:49:24 -04:00 |
|
drigato
|
ff61fab62a
|
SAAS-973: Airtime Billing page - Add support for August promotion plans
Fix to not allow current promo plans to downgrade to another promo plan
Added promo banner to billing page
|
2015-07-31 10:46:02 -04:00 |
|
drigato
|
5998d765fe
|
Merge branch 'saas' into saas-aug-promo
|
2015-07-30 14:28:07 -04:00 |
|
drigato
|
48d745bf77
|
Hide Awesome August 2015 promo plans from billing page
|
2015-07-30 13:37:15 -04:00 |
|
drigato
|
b2fbb27801
|
SAAS-973: Airtime Billing page - Add support for August promotion plans
Made WHMCS Airtime group id a constant
Check for CSRF token on promo eligibilty ajax check
|
2015-07-30 13:27:32 -04:00 |
|
drigato
|
bccba2f9d5
|
SAAS-973: Airtime Billing page - Add support for August promotion plans
Front-end changes to price grid, and plan title
|
2015-07-30 12:53:37 -04:00 |
|
drigato
|
d9e2ba0ed3
|
SAAS-973: Airtime Billing page - Add support for August promotion plans
Un-hardcode product ids
|
2015-07-30 09:39:50 -04:00 |
|
drigato
|
4ed87de183
|
SAAS-973: Airtime Billing page - Add support for August promotion plans
Backend side pretty much done
|
2015-07-29 22:24:17 -04:00 |
Duncan Sommerville
|
0b430a894b
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-07-29 20:29:30 -04:00 |
|
Duncan Sommerville
|
da4186ce25
|
Merge branch 'saas' into saas-dev
|
2015-07-29 20:29:14 -04:00 |
|
Duncan Sommerville
|
8f5f0eb5fe
|
SAAS-948 - CSS overhaul for new show builder page
|
2015-07-29 20:28:54 -04:00 |
|
Duncan Sommerville
|
661a87dfbc
|
SAAS-948 - Frontend tweaks and fixes
|
2015-07-29 13:35:01 -04:00 |
|
drigato
|
7839a712e6
|
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
|
2015-07-29 08:10:58 -04:00 |
|
drigato
|
4d9fb27554
|
SAAS-973: Airtime Billing page - Add support for August promotion plans
created promo-eligibility-check endpoint
|
2015-07-29 08:10:05 -04:00 |
|
Albert Santoni
|
bda6a4585c
|
Updated raven-php to fix Sentry
|
2015-07-28 14:48:41 -04:00 |
|
Duncan Sommerville
|
75aef986ea
|
SAAS-781 - Code review fixes
|
2015-07-28 11:47:53 -04:00 |
|
Duncan Sommerville
|
fcbc37977f
|
SAAS-948 - Frontend tweaks
|
2015-07-28 11:42:04 -04:00 |
|
Duncan Sommerville
|
5e58403c7f
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-07-27 15:38:30 -04:00 |
|
Duncan Sommerville
|
59d89b0b9e
|
SAAS-948 - ShowBuilder redesign editors and fixes
|
2015-07-27 15:37:55 -04:00 |
|
drigato
|
989b4994aa
|
SAAS-945: Language + Timezone Setup Popup
forgot to auto detect user's timezone
|
2015-07-27 14:38:42 -04:00 |
|
drigato
|
ee2bfe7664
|
SAAS-945: Language + Timezone Setup Popup
|
2015-07-27 07:06:22 -04:00 |
Duncan Sommerville
|
ce0cc946ab
|
Disable password reset in saas-dev (moved to saas-email branch)
|
2015-07-23 13:00:34 -04:00 |
|
Duncan Sommerville
|
5c4803ddf2
|
SAAS-781 - password reset
|
2015-07-22 13:48:47 -04:00 |
|
Duncan Sommerville
|
abdc94ccc3
|
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
|
2015-07-22 11:19:41 -04:00 |
|
Duncan Sommerville
|
a1a2bf9368
|
Test out existing email functionality
|
2015-07-22 11:19:37 -04:00 |
|
drigato
|
ce7765a8cb
|
Merge branch 'saas' into saas-dev
|
2015-07-21 11:03:31 -04:00 |
|
drigato
|
6f09ef4af1
|
Change usability hint wording
|
2015-07-21 07:27:26 -04:00 |
|
drigato
|
3e60713590
|
SAAS-962: "Now" option should not be available for linked shows
Also added fix for SAAS-957
|
2015-07-20 15:20:50 -04:00 |
|
Duncan Sommerville
|
ba90b1f1eb
|
Merge branch 'saas-dev' into saas-showbuilder
Conflicts:
airtime_mvc/public/css/styles.css
|
2015-07-20 12:23:11 -04:00 |
|
Duncan Sommerville
|
0324c59100
|
Don't reload datatable when selecting same media type
|
2015-07-18 17:28:17 -04:00 |
|
drigato
|
a6854ea507
|
SAAS-957: Error on "update show"
|
2015-07-17 16:28:33 -04:00 |
|
drigato
|
7f4fbf65e1
|
SAAS-960 Change hint for currently playing linked show
|
2015-07-17 12:48:57 -04:00 |
|
drigato
|
07f02260db
|
Fix undefined index: nextMediaName
|
2015-07-17 09:57:24 -04:00 |
|
drigato
|
ec74e17ebe
|
Merge branch 'saas' into saas-dev-july-16
|
2015-07-17 07:40:15 -04:00 |
|
Duncan Sommerville
|
1816be156f
|
SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types
|
2015-07-16 16:26:52 -04:00 |
|
Duncan Sommerville
|
0dd2958333
|
SAAS-922 - urlencode content headers to ensure compatibility
|
2015-07-16 14:43:22 -04:00 |
|
Duncan Sommerville
|
041053b171
|
SAAS-922 - urlencode content headers to ensure compatibility
|
2015-07-16 14:24:07 -04:00 |
|
Duncan Sommerville
|
901b42c8c7
|
Merge branch 'saas' into saas-dev
|
2015-07-16 13:16:52 -04:00 |
|
Duncan Sommerville
|
452c17650c
|
SAAS-951 - fix SoundCloud capitalization
|
2015-07-16 11:05:39 -04:00 |
|
Duncan Sommerville
|
40d8212c13
|
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
|
2015-07-16 11:03:53 -04:00 |
|
Duncan Sommerville
|
c5e7d6734e
|
SAAS-951 - fix SoundCloud capitalization
|
2015-07-16 11:03:30 -04:00 |
|
drigato
|
dd5d6342a7
|
Merge branch 'saas-dev-usability-hints' into saas-dev
|
2015-07-16 11:00:04 -04:00 |
|
Duncan Sommerville
|
8609934861
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-07-15 18:54:55 -04:00 |
|
Duncan Sommerville
|
ba38618235
|
Merge branch 'saas' into saas-dev
|
2015-07-15 18:54:38 -04:00 |
|
Duncan Sommerville
|
71ca2b0668
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-07-15 18:53:39 -04:00 |