Albert Santoni
|
2c443bd27a
|
Some navbar and page title fixes
|
2015-08-18 17:52:23 -04:00 |
Duncan Sommerville
|
0ad51dae09
|
Fix add/remove content dialog, try to increase speed of selection/deselection
|
2015-08-18 17:46:16 -04:00 |
|
Albert Santoni
|
a84c33f0ed
|
Cleanup and fix media type selector highlight in calendar page
|
2015-08-18 17:29:23 -04:00 |
|
Albert Santoni
|
a04f5afcbd
|
More navbar and submenu layout fixes
|
2015-08-18 17:13:17 -04:00 |
|
Duncan Sommerville
|
13a60c39b9
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
|
2015-08-18 15:30:31 -04:00 |
|
Duncan Sommerville
|
3f25ab2647
|
CC-6079 - merge and remove underscore files
|
2015-08-18 15:23:42 -04:00 |
|
Albert Santoni
|
ac974e56a9
|
Fixed ColReorder includes in ScheduleController.php
|
2015-08-18 15:08:03 -04:00 |
|
Albert Santoni
|
a271b53c2e
|
CC-6077: Implement actions menu for library view
|
2015-08-18 14:55:32 -04:00 |
|
Duncan Sommerville
|
4bfb8fa0cb
|
CC-6067 - deselect when adding library items
|
2015-08-18 12:01:23 -04:00 |
drigato
|
d30e32c2d3
|
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
|
2015-08-18 07:46:39 -04:00 |
|
Duncan Sommerville
|
4adb9cc55a
|
CC-6070 - standardize editor buttons
|
2015-08-17 18:34:39 -04:00 |
|
drigato
|
38022f4ff0
|
SAAS-1019: Re-work Navigation Menu
Added user settings to the Settings sub-menu
|
2015-08-17 16:22:55 -04:00 |
|
drigato
|
e5f5ff4c88
|
SAAS-1019: Re-work Navigation Menu
Created Widget sub menu and moved widgets into separate controller
actions
|
2015-08-17 16:15:26 -04:00 |
|
Albert Santoni
|
74a1e0929d
|
Fixed styling on Listener Stats page
|
2015-08-17 16:08:58 -04:00 |
|
drigato
|
3aee9a49bc
|
SAAS-1019: Re-work Navigation Menu
|
2015-08-17 12:46:32 -04:00 |
|
Albert Santoni
|
8aa39ae28d
|
Moved datatables translation stuff to PHP for consistency
|
2015-08-14 20:00:05 -04:00 |
Duncan Sommerville
|
7ce9dfa1b3
|
SAAS-948 - add title to library pane
|
2015-08-14 15:33:45 -04:00 |
|
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
|
8dd580e623
|
Applied context menu restyling globally
|
2015-08-12 17:47:55 -04:00 |
|
Albert Santoni
|
0c83b62545
|
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
|
2015-08-12 17:37:01 -04:00 |
|
Albert Santoni
|
9d30a26968
|
Text for show schedule toolbar buttons, Embedded Widgets page styling
|
2015-08-12 17:36:54 -04:00 |
|
Duncan Sommerville
|
32100e2d9b
|
SAAS-948 - frontend tweaks
|
2015-08-12 16:54:45 -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
|
2a1d09bc08
|
Factor out default show background colour and fix some style issues
|
2015-08-12 12:55:39 -04:00 |
|
Albert Santoni
|
f63ce23c9f
|
Flatten datatable headers and restyled Manage Users screen
|
2015-08-12 10:53:14 -04:00 |
|
Albert Santoni
|
e5f70e7ec3
|
Re-enable the task manager, it made no difference
|
2015-08-11 17:32:40 -04:00 |
|
Albert Santoni
|
60a02cfdee
|
Temporarily disable the task manager to test lock contention
|
2015-08-11 16:34:28 -04:00 |
|
Albert Santoni
|
249d3b1d2d
|
SAAS-1011: Files stored locally with incorrect file extensions won't play out
|
2015-08-11 09:33:29 -04:00 |
|
Duncan Sommerville
|
c9f9bed2d6
|
SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox
|
2015-08-10 18:46:12 -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 |
|
Duncan Sommerville
|
c2d1556cfd
|
Showbuilder css changes
|
2015-08-10 12:37:21 -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 |
|
Albert Santoni
|
fc5d20f4d6
|
Safen up getUsingCustomStreamSettings()
|
2015-08-10 08:57:21 -04:00 |
|
Duncan Sommerville
|
bf6244c835
|
SAAS-948
|
2015-08-07 19:20:29 -04:00 |
|
Albert Santoni
|
cdc9f88c1c
|
Big style update for the new show builder screen
* Restyled the tables
* Blue currently playing track
* Labels for library view buttons
|
2015-08-07 19:08:17 -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
|
a82b75743f
|
Fix error messages being swapped on the password reset page
|
2015-08-07 14:41:10 -04:00 |
|
Albert Santoni
|
e760df0e5e
|
Added missing newline to password reset email
|
2015-08-07 14:29:10 -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 |
|
drigato
|
f833ab9690
|
SAAS-838: Undefined variable previousMediaName
|
2015-08-06 17:09:54 -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
|
9c5a634754
|
Fix default Icecast hostname
|
2015-08-05 15:30:14 -04:00 |
|
Albert Santoni
|
1093e7085a
|
Re-enable hiding the first run popup after first run
|
2015-08-05 15:00:28 -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 |
|
Albert Santoni
|
2aaba99b9a
|
Merge remote-tracking branch 'origin/saas-dev-lang-tz-setup' into saas-dev
|
2015-08-05 12:32:33 -04:00 |
|
drigato
|
23fe12651f
|
SAAS-838: Undefined variable previousMediaName
|
2015-08-05 09:48:31 -04:00 |
|
Duncan Sommerville
|
33d2fe0900
|
SAAS-989 - Move file metadata editor to right-hand showbuilder pane
|
2015-08-04 19:56:12 -04:00 |
|
Albert Santoni
|
c934866063
|
Two small code improvements
|
2015-08-04 17:42:53 -04:00 |
|
Duncan Sommerville
|
57c1d74286
|
SAAS-985 - Port sandwich menu to showbuilder branch
|
2015-08-04 16:37:45 -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 |
|
Albert Santoni
|
d0d6efd508
|
Fix m4a uploads in Airtime
|
2015-07-31 15:02:53 -04:00 |
Denise Rigato
|
f19b6b4bf2
|
Merge pull request #123 from sourcefabric/saas-aug-promo
Airtime Billing page - Add support for August promotion plans
|
2015-07-31 13:55:20 -04:00 |
|
drigato
|
8a52178765
|
Fix for billing downgrade with no new invoice created
|
2015-07-31 13:42:47 -04:00 |
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Duncan Sommerville
|
d7d9a994d5
|
SAAS-948 - ShowBuilder redesign initial commit
|
2015-07-15 18:53:19 -04:00 |
|
Albert Santoni
|
ffaa076767
|
Second fix for SAAS-922, file extension improvements for S3
|
2015-07-15 17:51:37 -04:00 |
|
Albert Santoni
|
064e1bd4e0
|
Fix SAAS-922 for files on S3 too
|
2015-07-15 17:33:33 -04:00 |
|
drigato
|
fd09941223
|
Merge branch 'saas-dev' into saas-dev-usability-hints
|
2015-07-15 13:59:43 -04:00 |
|
drigato
|
8276b1762e
|
Updated outdated public airtime api setting message on preferences page
|
2015-07-15 13:47:54 -04:00 |
|
Albert Santoni
|
7ecabffbe8
|
Avoid double dot in extension for SAAS-922
|
2015-07-15 13:41:03 -04:00 |
|
Albert Santoni
|
ffb55de566
|
SAAS-922 take 2
|
2015-07-15 13:12:56 -04:00 |
|
Duncan Sommerville
|
27fe32a3b4
|
Use mime-type array when checking for acceptable extensions
|
2015-07-15 12:58:05 -04:00 |
|
Duncan Sommerville
|
7ce3082fa2
|
Fix upgrade being run from unit tests
|
2015-07-15 11:46:52 -04:00 |
|
drigato
|
6a01205034
|
SAAS-940: Provide usability hints to user
Fixed bug where sometimes the hint would not show up
|
2015-07-15 11:35:59 -04:00 |
|
drigato
|
e07d62b020
|
Small comments fix
|
2015-07-15 10:41:01 -04:00 |
|
drigato
|
7b237a2e65
|
SAAS-940: Provide usability hints to user
Changed some hint wording
|
2015-07-14 12:14:00 -04:00 |
|
drigato
|
8309289356
|
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 11:52:10 -04:00 |
|
drigato
|
2de831a37f
|
SAAS-940: Provide usability hints to user
Made hints more specific
|
2015-07-14 11:45:37 -04:00 |
|
Albert Santoni
|
2693c9f02c
|
Small bugfix for CC-6064
|
2015-07-14 11:25:11 -04:00 |
|
Albert Santoni
|
5a2ef8d3db
|
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
|
2015-07-14 10:35:47 -04:00 |
|
Albert Santoni
|
66caf2574a
|
CC-6064: Allow shows to be started "now"
|
2015-07-14 10:35:21 -04:00 |
|
drigato
|
71e8909365
|
SAAS-940: Provide usability hints to user
Fixed bug where hints were not showing up sometimes
|
2015-07-14 10:08:56 -04:00 |
|
drigato
|
25ef70767b
|
SAAS-940: Provide usability hints to user
Customized hints depending on what page the user is on and what action
they just completed.
|
2015-07-13 17:02:31 -04:00 |
|
Duncan Sommerville
|
683c1a4641
|
SAAS-876 - use baseurl for default host value
|
2015-07-13 15:52:04 -04:00 |
|
Albert Santoni
|
8e15dd5e99
|
Merge branch 'saas-dev' into saas-dev-usability-hints
|
2015-07-13 15:34:06 -04:00 |
|
Duncan Sommerville
|
755ec79e7d
|
SAAS-876 - frontend tweaks
|
2015-07-13 15:17:47 -04:00 |
|
Duncan Sommerville
|
56585fb01c
|
Add default icecast pass to settable params in ProvisioningController
|
2015-07-13 13:28:27 -04:00 |
|
Duncan Sommerville
|
c05d4bac2f
|
Merge branch 'saas-dev' into saas-stream-settings
|
2015-07-13 13:27:34 -04:00 |
|
Duncan Sommerville
|
9fdc08f88a
|
SAAS-876 - reset to default settings when using Airtime Pro streaming
|
2015-07-13 12:28:58 -04:00 |
|
drigato
|
33bd1ec605
|
Merge branch 'saas-dev-saas-924-show-edit-problem' into saas-dev
|
2015-07-13 11:19:42 -04:00 |
|
drigato
|
48547ee347
|
SAAS-940: Provide usability hints to user
Refactored some code
|
2015-07-13 11:19:04 -04:00 |
|
drigato
|
721cd5a31b
|
SAAS-924: Cannot edit repeating show if first instance has ended
Added safeguard in case we don't find a future show instance
|
2015-07-13 09:04:49 -04:00 |
|
drigato
|
55999a07ec
|
SAAS-940: Provide usability hints to user
|
2015-07-13 08:06:41 -04:00 |
|
Duncan Sommerville
|
c99165a8dd
|
SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options
|
2015-07-10 13:17:20 -04:00 |
|
Duncan Sommerville
|
37ed35f5b2
|
Merge branch 'saas-dev' into saas-stream-settings
Conflicts:
airtime_mvc/application/models/Preference.php
|
2015-07-10 10:29:38 -04:00 |
|
Duncan Sommerville
|
e4720b5992
|
Remove incorrect sql in 2.5.14 upgrade
|
2015-07-10 10:27:28 -04:00 |
|
drigato
|
670395bb2e
|
SAAS-939: Add option to preferences to display login button on radio page
Change option to ON by default
|
2015-07-09 15:16:54 -04:00 |
|
drigato
|
0601bd675e
|
SAAS-939: Add option to preferences to display login button on radio page
|
2015-07-09 14:38:44 -04:00 |
|
Albert Santoni
|
1efa591d67
|
Fixed double HTML encoding on embedded schedule widget
|
2015-07-09 12:49:49 -04:00 |
|
drigato
|
1b3a9f6e6a
|
SAAS-924: Cannot edit repeating show if first instance has ended
Reverted old behaviour where we set the show start and end date/time to
the next repeating instance start and end.
|
2015-07-09 12:18:21 -04:00 |