4d7d48d6fb
Player - fix height
2015-04-10 10:55:39 -04:00
f238faa937
SAAS-712: UI Improvements
2015-04-09 14:22:50 -04:00
84231f811a
SAAS-720: Player can't be accessed unless a user has a valid session
2015-04-09 12:25:27 -04:00
4429117f6a
SAAS-712: UI Improvements
2015-04-09 09:43:15 -04:00
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
f6d5b34cca
Embed player - code review fixes
2015-04-07 17:49:21 -04:00
369a59c564
Changed mobile option text on streams page
2015-04-02 15:13:34 -04:00
17358a761f
SAAS-663: Integrate player design
2015-03-25 11:44:28 -04:00
e32744668f
SAAS-661: Add mobile stream identifier on Stream Settings page
2015-03-23 16:06:35 -04:00
2ae4d6c1c3
Embed Player
...
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
ed891fb145
Committing lots of trial and error embed player code changes
2015-03-18 14:23:38 -04:00
1f2f8a27a5
SAAS-650: Fix up player page UI in Airtime
2015-03-16 13:24:58 -04:00
dc0855de18
SAAS-643: Embed Player -> Restrict the setting of an OPUS stream
2015-03-16 11:29:24 -04:00
694430f542
SAAS-637: Un-hardcode all player variables
2015-03-12 15:45:53 -04:00
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
8198d89095
small change to player form
2015-03-10 16:47:08 -04:00
6c46f0a156
Added player preview to view
...
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
6082738439
Merge branch 'saas' into saas-media-refactor
2015-03-02 16:02:34 -05:00
17d51eb0f9
Added csrf verification to show image upload and deletion
2015-03-02 16:00:11 -05:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
6dcc7ee2fc
SAAS-587: Add stream urls to station-metadata API
2015-02-20 15:50:40 -05:00
a931e282e1
SAAS-585: Create Embeddable Player form
...
Fixed up the stream urls options
2015-02-20 15:44:25 -05:00
40d6249229
Merge branch 'saas' into saas-embed-player
2015-02-20 14:47:57 -05:00
964d7d1326
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 16:42:04 -05:00
c1086842d3
Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-17 16:19:58 -05:00
4fd7b4c622
SAAS-585: Create Embeddable Player form
...
Added stream urls - hardcoded for now
2015-02-17 11:48:43 -05:00
eb40379152
SAAS-595 - Changed Zend validation and added sanitization in file import process to throw out bad track number metadata
2015-02-17 11:44:31 -05:00
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -05:00
8d4f94a41f
Merge branch '2.5.x' into saas
2015-01-26 17:50:18 -05:00
e3165a12c3
Regex tweak
2015-01-26 17:49:58 -05:00
b569e9a294
Merge branch '2.5.x' into saas
2015-01-26 17:44:41 -05:00
322d85931b
CC-5988 - Better error message & regex for Transition Fade field on stream settings page
2015-01-26 17:41:10 -05:00
dbba5a7427
Decouple Billing and S3 cloud storage stuff from Zend
2015-01-26 13:10:10 -05:00
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
2fadc8f8f1
Merge branch '2.5.x' into saas
...
Conflicts:
CREDITS
2015-01-20 11:44:53 -05:00
6ac5a2950f
SAAS-551: Cannot schedule shows due to overlapping show check bug
2015-01-20 11:32:15 -05:00
0c3395289d
Merge pull request #78 from Robbt/realtime-smart-blocks
...
Added sort tracks by upload time to smart blocks criteria
2015-01-19 15:36:28 -05:00
7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
609a46dfa3
Comment Airtime_Decorator_SuperAdmin_Only
2015-01-14 15:12:20 -05:00
c24a040689
Fixed my SuperAdmin_Only decorator
2015-01-14 14:34:14 -05:00
d5b969f94f
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
c4d3a8fa62
Massive simplification of the GeneralPreferences dialog
...
* The purpose of this was so that we can use Zend_Form_Element
decorators, which I need.
2015-01-13 20:51:46 -05:00
caf37e1b87
CC-5975: Default fade-in/out, and crossfade time validators don't work
...
* Fixed the number formatting and validation in the preferences and streaming preferences
(the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
2015-01-13 12:18:57 -05:00
9cfcaf2ffd
SAAS-537: Fixed the week view of the schedule widgets
...
* Also improved the instructions inline for how to use them...
(this is a stop-gap measure until we get a real iframe widget)
* ALSO renamed the field HTML Code since it's not JS! (it was
misleading before)
2015-01-12 22:29:21 -05:00
f08535cc10
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
a62e98beb4
Fix logins from WHMCS by disabling CSRF token on login page for trusted
...
origins
2014-11-20 19:33:11 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
795e239ff3
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
2014-11-06 18:39:48 -05:00
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
eecd3fa188
Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field
2014-11-05 17:24:08 -05:00
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -04:00
c4692cc0d7
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/PluploadController.php
airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
29b05343bd
Tokens for add User.
2014-10-01 19:36:36 +00:00
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
66b97158b7
Make API on by default - fix
2014-09-19 15:30:06 -04:00
28399b70cc
Make API on by default
2014-09-19 14:57:43 -04:00
abc9481a58
Updated to conform to naming conventions
2014-09-19 12:55:47 -04:00
3a1efa39eb
Added instance description field
2014-09-19 12:55:02 -04:00
c65fa8ce37
Added button to remove current show logo
2014-09-18 16:38:18 -04:00
5e18e1881f
Removed unnecessary validator override functions
2014-09-18 16:30:47 -04:00
45939138cd
Added previews of uploaded and current show images
2014-09-17 19:48:17 -04:00
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
9fe0830dfd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
c55a3a4d74
Use SSL with Recaptcha to fix it
2014-08-25 18:19:00 -04:00
80b9bcdfc6
Use SSL with Recaptcha to fix it
2014-08-25 14:45:04 -04:00
1c676dee6d
Fix user settings again for Super Admins, also Zend routing tweak
...
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
2014-08-01 12:50:02 -04:00
d320651735
SAAS-461: Re-enable timezone and language settings for Super Admins
2014-07-28 12:37:40 -04:00
0ab1eaa08c
Fix account upgrade invoicing issue
...
* Don't generate upgrade orders if the plan and the billing cycle didn't
change. WHMCS freaks out otherwise.
* Clean up some deadcode in BillingUpgradeDowngrade.php
* Squash an error in the invoice view if there's no invoices
2014-07-09 13:49:25 -04:00
a831fbe5b7
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:49:28 -04:00
c551097d57
Default to monthly billing for invalid values
2014-07-03 16:46:25 -04:00
523bb8e7b6
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-02 12:45:44 -04:00
b0cab62e80
More syntax fixes for PHP 5.3
2014-07-02 12:45:17 -04:00
368ac19d52
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-02 12:43:20 -04:00
4b7f8abc3d
Same thing again
2014-07-02 12:43:06 -04:00
96f370e071
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-02 12:41:07 -04:00
cd26671627
Weird syntax fix for PHP 5.3
2014-07-02 12:40:32 -04:00
e9cca4c441
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-27 15:50:51 -04:00
3357c1f032
Select current plan and show that correctly
2014-06-27 15:50:05 -04:00
51b7fe9adf
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-25 20:33:10 -04:00
b36967a690
Nicer auto-styling for the Billing Details form
2014-06-25 20:32:41 -04:00
338fd06f81
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
2014-06-25 19:03:13 -04:00
d92e5197e1
Design and overhaul of Account Plans screen
...
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
73724bdd04
Custom fields were not saving
2014-06-24 12:46:11 -04:00
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
497841225b
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 16:54:41 -04:00
40f2796972
Created an invoice view
...
Some refactoring
Some validation
2014-06-19 16:55:01 -04:00
7f6fc7770a
Added Super Admin role and WHMCS login
2014-06-17 17:40:55 -04:00
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
1f4c8b755d
Created a separate view for upgrades and client info
2014-06-17 12:47:08 -04:00
81ceafbfbd
whmcs client form
2014-06-12 17:54:20 -04:00
01fc9e6ffc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-26 19:11:47 -04:00
9eb0f2f3b3
CC-5859: Airtime Analyzer: format fields before writing to db
2014-05-26 17:13:45 -04:00
ed78625fce
Merge branch '2.5.x' into 2.5.x-saas
2014-01-27 12:01:11 -05:00
2cdad4932a
CC-5660: Unable to create shows with a rebroadcast
...
Used wrong formating for minutes
2014-01-06 14:04:18 -05:00
11284d0d41
CC-5660: Unable to create shows with a rebroadcast
...
Two variables that are needed for the rebroadcast validation were deleted
before the 2.5.1 release. Just had to add them back in.
2014-01-06 13:51:06 -05:00
49474ab5c4
Merge branch '2.5.x' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
2013-12-17 17:20:38 -05:00
15370702a4
Use the user timezone, not the station timezone in the Add Show form (by
...
default)
* Fixes really annoying problem where you click on the calendar, and it
adds your show in the wrong spot.
2013-12-13 18:27:36 -05:00
e8a8aeaf00
CC-5636: Php 5.5: Cannot update repeating show's name if that instance is updated
...
Made all show fields readonly when editing a repeating instance
2013-12-13 12:13:58 -05:00
e6c971387b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 17:35:47 -05:00
e6d28b250e
CC-5629 : Smart Block timestamps aren't saved in UTC time
2013-12-11 17:35:31 -05:00
4d77d14d33
CC-5627: Check all Application_Common_DateHelper calculations that use
...
timezone.
* Removed strtotime usage from AddShowRepeats.php
2013-12-11 15:54:13 -05:00
c732b44903
CC-5594 : Remove all date_default_timezone_get()
...
must allow 24 hours, but nothing greater to match old usage.
2013-12-05 13:11:36 -05:00
eb4cefa3ff
CC-5594 : Remove all date_default_timezone_get()
...
DateTime here was relying on a timezone that wasn't what the user selects in the timezone drop down on the form.
2013-12-05 13:04:02 -05:00
6ea0cb5918
CC-5571: Overlapping show check in wrong sometimes
...
The incorrect number of days we're getting added to create repeat instances
because we were checking the start week day in UTC instead of local time
2013-11-22 10:51:16 -05:00
4abdbfae1f
CC-5401: Stream settings -> Can't save show source info
...
Typo in sprintf formatting
2013-10-11 13:22:02 -04:00
c687b6ad24
Merge branch 'master' of https://github.com/jamieconnor/Airtime
...
Conflicts:
airtime_mvc/application/services/ShowService.php
2013-10-08 11:16:25 -04:00
55254e88a5
UI text improvements for setting the station/user timezones
...
Added info icon in the add-show form for timezone setting
2013-10-07 14:49:52 -04:00
37a0c271f6
CC-5359: Update show fails sometimes with overlapping check
...
Some DateTime objects were not getting created in correct timezone
Used format() to get the day of week value instead of getTimestamp()
getTimestamp() sometimes returns the wrong value
2013-10-03 18:02:15 -04:00
1e59ab836d
CC-5277: Selecting weekly repeat without selecting days fails silently
...
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
2013-10-01 14:19:02 -04:00
3d9bc85fa0
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-01 08:49:10 -04:00
0dd5458269
Merge branch '2.5.x' into CC-5293-calendar-pref
2013-09-30 13:57:23 -04:00
7d739a0f66
CC-5316 : Playout History: Doesn't support webstream
...
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
11ae76beb8
Fix SAAS-349 by preventing password changes in demo mode.
...
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
2013-09-26 16:23:22 -04:00
28a032388b
Start of bugfixing for SAAS-349.
...
* Also identity verification for erry on Freenode.
2013-09-26 15:18:41 -04:00
2114383519
CC-5323: User's Timezone Can Improperly Edit Show
...
-overlapping show check was using the user's local timezone to compare new
shows instead of the show's timezone
2013-09-25 16:22:30 -04:00
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
f7f2cdc51c
Follow up changes relating to adding in new show repeat options
2013-09-07 14:54:03 +12:00
03f383f764
added more options for show repeats
2013-09-03 12:25:22 +12:00
682a37894b
Merge branch 'ryerson-history' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/views/scripts/menu.phtml
2013-09-02 15:52:43 -04:00
9c0bee3877
adding show instance to the create form if it's already set.
2013-08-31 23:34:37 -04:00
d50cdd16c2
starting association of a show instance.
2013-08-29 17:40:08 -04:00
9b45b9dc72
converting to a jquery UI based datepicker.
2013-08-16 15:12:00 -04:00
b65007868a
crlf fix
2013-08-12 15:08:09 -04:00
d83c004fb9
subclassing the template types, files summary table is now fully configurable form wise.
2013-08-12 15:06:26 -04:00
27b079ace9
adding a label to the form fields (Datatables column headers)
2013-08-07 17:55:18 -04:00
aaf2e5c2f6
better casting on form checkbox, setting populate flag properly based on if id is set (for create/update)
2013-08-05 15:05:26 -04:00
31c604d09c
can update an existing history item entry. Form is pre-populated.
2013-08-02 18:16:23 -04:00
7ca3048f36
can add a new list item using the template.
...
set a default item template
working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
7183396da5
needed to update jquery, fullcalendar needed updating for the new JS.
...
working on configuring a template.
2013-07-29 08:57:31 -04:00
46ecdf393d
dynamic form rendering for template
...
bootstrap datetime widget.
jquery update is needed, testing with hosted jquery first.
2013-07-26 17:33:17 -04:00
69afc715d1
creating templates for validation.
2013-07-22 18:11:44 -04:00
19ba788bae
CLRF
2013-07-22 10:47:11 -04:00
634eb40a0c
creating an entry.
2013-07-22 10:45:39 -04:00
ec44b81f6a
clrf
2013-07-18 01:37:39 -04:00
29c8570ade
editing in progress
2013-07-18 01:31:20 -04:00
c744d88f23
IM-784 : Create Editing Abilities For History
2013-07-08 18:00:02 -04:00
f2d5fa96da
Merge branch '2.4.x' into 2.4.x-saas
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
6b0ab535e5
CC-5244 : Exception when creating Smartblock
2013-06-20 14:03:13 -04:00
440163f199
CC-5225 : Library: Fail to open Metadata Editor
2013-06-12 13:05:58 -04:00
6498f43dad
CC-5211:
...
Php Exception: Set large number as year in tracks Metadata
fixed
2013-06-06 17:02:01 -04:00
drigato
Duncan Sommerville
Albert Santoni
Albert Santoni
Robbt
Robert Elder
Naomi Aro
denise
Jamie Connor
Martin Konecny