Duncan Sommerville
|
fb1f22b913
|
SAAS-948 - css tweaks
|
2015-08-14 13:29:26 -04:00 |
|
drigato
|
e90fe728a2
|
SAAS-1017: Move top nav bar to side
|
2015-08-14 08:30:52 -04:00 |
|
Albert Santoni
|
61d1e6bb50
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-12 16:45:07 -04:00 |
|
Albert Santoni
|
409e9e2a78
|
Stream settings, Add Show form CSS revamp, etc.
|
2015-08-12 16:44:45 -04:00 |
|
Duncan Sommerville
|
1957c7827f
|
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
|
2015-08-12 14:35:27 -04:00 |
|
Albert Santoni
|
21250e91c4
|
More calendar tweaks
|
2015-08-12 14:33:34 -04:00 |
|
Albert Santoni
|
f63ce23c9f
|
Flatten datatable headers and restyled Manage Users screen
|
2015-08-12 10:53:14 -04:00 |
|
Albert Santoni
|
849b8038ce
|
Mostly new graphics for the calendar page
|
2015-08-10 17:11:40 -04:00 |
|
Albert Santoni
|
a28df91c56
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-10 14:17:24 -04:00 |
|
Albert Santoni
|
2af5eb3314
|
Add Media page visual refresh, and use dropzone
|
2015-08-10 14:17:16 -04:00 |
|
Duncan Sommerville
|
641486e852
|
SAAS-948 - Showbuilder fixes
|
2015-08-10 13:44:57 -04:00 |
|
Albert Santoni
|
974f979bef
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-10 12:23:30 -04:00 |
|
Albert Santoni
|
fc7a700654
|
Consolidated some CSS
|
2015-08-10 12:23:22 -04:00 |
|
Albert Santoni
|
75914b791c
|
Merge branch 'saas-dev' into saas
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
|
2015-08-10 09:00:54 -04:00 |
|
Duncan Sommerville
|
bf6244c835
|
SAAS-948
|
2015-08-07 19:20:29 -04:00 |
|
Duncan Sommerville
|
133db1c6a6
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-07 16:50:28 -04:00 |
|
Duncan Sommerville
|
e6609896a5
|
SAAS-948 - showbuilder styling
|
2015-08-07 16:49:05 -04:00 |
|
Albert Santoni
|
b5e5fcfc98
|
More tweaks for password reset
|
2015-08-07 14:22:01 -04:00 |
|
Albert Santoni
|
bd83eefefe
|
Cleanup for password reset post-email screen
|
2015-08-07 14:09:01 -04:00 |
|
Albert Santoni
|
ea2a6b3f68
|
Clean up and bugfixes for password reset (SAAS-1009)
|
2015-08-07 13:57:42 -04:00 |
|
Duncan Sommerville
|
0c3d9a8af4
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-06 19:16:31 -04:00 |
|
Duncan Sommerville
|
02d96d7bd0
|
SAAS-991 - initial playlist editor redesign
|
2015-08-06 19:16:04 -04:00 |
|
Duncan Sommerville
|
cc36fcd37b
|
Showbuilder checkboxes and style fixes
|
2015-08-06 16:01:44 -04:00 |
|
drigato
|
ea86675d07
|
SAAS-994: The Scheduled Play switch should not be able to be turned off without a warning message
Hid the element in the dashboard so it can never be turned off.
|
2015-08-06 11:14:43 -04:00 |
|
Duncan Sommerville
|
4cbc49391b
|
Reintroduce checkboxes
|
2015-08-05 18:14:56 -04:00 |
|
Duncan Sommerville
|
36f2e1844f
|
Merge branch 'saas-dev' into saas-showbuilder
|
2015-08-05 15:32:04 -04:00 |
|
Albert Santoni
|
1d39117b21
|
Merge remote-tracking branch 'origin/saas-email' into saas-dev
|
2015-08-05 14:50:58 -04:00 |
|
Albert Santoni
|
e49d337db0
|
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
|
2015-08-05 14:50:31 -04:00 |
|
Albert Santoni
|
eef61a65fc
|
Cleanup and comments for the timezone/language popup
|
2015-08-05 14:49:43 -04:00 |
|
Duncan Sommerville
|
4200f56265
|
SAAS-999 - Change Advanced Search Options to dropdown
|
2015-08-04 15:38:48 -04:00 |
|
Duncan Sommerville
|
f138dc6b47
|
SAAS-948 - tab layout for right-hand pane
|
2015-07-31 18:28:16 -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
|
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
|
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
|
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 |
|
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
|
a1a2bf9368
|
Test out existing email functionality
|
2015-07-22 11:19:37 -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
|
d7d9a994d5
|
SAAS-948 - ShowBuilder redesign initial commit
|
2015-07-15 18:53:19 -04:00 |
|